Commit Graph

  • e646903691
    Merge pull request #1442 from leggettc18/leggettc18/issue1071 briaguya 2022-09-13 11:02:05 -0400
  • e73e26c54a
    Merge pull request #1465 from garrettjoecox/patch-1 briaguya 2022-09-13 10:31:31 -0400
  • 04a375aa6e
    Merge pull request #1464 from garrettjoecox/tiny-fix-for-tracker-wallet briaguya 2022-09-13 10:31:20 -0400
  • 361660fd61 Linux side done louis 2022-09-13 09:53:49 -0400
  • 420ebf3715
    Fix amount of keys given for BotW Garrett Cox 2022-09-13 01:13:20 -0500
  • 717c639783 Fix adult wallet having its own max capacity Garrett Cox 2022-09-13 00:56:26 -0500
  • 51e203eec0 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-13 00:07:58 -0500
  • 098407487a Fix some issues with ice traps Garrett Cox 2022-09-12 23:45:22 -0500
  • cda28c402a Fix dungeon reward stone rotation and add particles Garrett Cox 2022-09-12 23:10:15 -0500
  • c9359ab3ef Simplify logic around shopsanity and fix some issues Garrett Cox 2022-09-12 22:31:45 -0500
  • 14fbbea39a Fix for custom draw methods overriding sold out sign Garrett Cox 2022-09-12 16:46:54 -0500
  • 457356d74c Allow buying tunics as child when shopsanity is on Garrett Cox 2022-09-12 15:54:24 -0500
  • 09ab2dc24c
    Merge pull request #1335 from Sarge-117/rando-enhanced-magic-arrows briaguya 2022-09-12 16:45:47 -0400
  • 0c6a59682f Removed 3D Seeds/Nuts; Don't work properly MoriyaFaith 2022-09-12 00:32:29 -0400
  • 8df9bf7c0b 3D Seed/Nut Model, Separate Sword Slash Colors MoriyaFaith 2022-09-12 00:06:46 -0400
  • a2d4f4766d
    Fixes crash handler for jenkins builds. (#1445) Kenix3 2022-09-11 23:15:10 -0400
  • ed41d81795 3d Bombs; Bombchu now glow custom trail colors MoriyaFaith 2022-09-11 22:44:49 -0400
  • 4bdb193876 Fix Trails, add more Trail Customization MoriyaFaith 2022-09-11 21:43:10 -0400
  • 8e587c4c12 Merge branch 'develop-zhora' into feature/metal David Chavez 2022-09-12 00:54:42 +0200
  • 4db2f44f7b Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-11 11:32:50 -0700
  • 74dc337117
    Merge pull request #2 from leggettc18/pr/Kenix3/1445 Kenix3 2022-09-11 01:55:33 -0400
  • 3d0a9ee82c more textbox fixes InfoManiac742 2022-09-10 10:45:49 -0700
  • 4c7424f848 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-10 10:16:02 -0500
  • 2caba0a61d xkcd.com/1296 InfoManiac742 2022-09-09 21:02:31 -0700
  • 1eb6235ddc
    Merge pull request #1456 from leggettc18/leggettc18/issue1437 briaguya 2022-09-09 21:46:40 -0400
  • 984b73d3ff Merge branch 'develop-zhora' into consolidate-dpad Josh Bodner 2022-09-09 16:53:05 -0700
  • 19e254db79 Update GameMenuBar.cpp InfoManiac742 2022-09-09 16:51:14 -0700
  • 944d5344dc
    Applies fix to Song from Impa as well. Christopher Leggett 2022-09-09 19:10:43 -0400
  • cfc24b16ca
    crash on pause menu on linux (only in appimage) Fixes #1437 Christopher Leggett 2022-09-09 19:07:37 -0400
  • ffcd5c532b Update z_play.c InfoManiac742 2022-09-09 16:03:27 -0700
  • 8aff9e7d84 redid literally everything InfoManiac742 2022-09-09 15:12:56 -0700
  • 6b5ca616c4 rest of gaBon louis 2022-09-09 17:45:37 -0400
  • a17527d987 object_ganon louis 2022-09-09 16:58:51 -0400
  • c5f7222050 anime 2-3 louis 2022-09-09 16:34:15 -0400
  • adb68a0b23 anime1 louis 2022-09-09 16:25:06 -0400
  • 08b2a18ab7
    Properly selects PDB file path for inclusion Christopher Leggett 2022-09-09 14:07:25 -0400
  • 737d958173
    Adds PDB file to Windows Package. Christopher Leggett 2022-09-09 13:45:47 -0400
  • 16b0b349bd revert ganon for now louis 2022-09-09 13:35:07 -0400
  • 733b604cae
    Merge branch 'HarbourMasters:develop-zhora' into shooting-gallery-difficulty Oliver Schall 2022-09-09 18:39:17 +0200
  • 47714eb419
    Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into develop-zhora Christopher Leggett 2022-09-09 12:11:38 -0400
  • aee6445a45 Fix merge error Sarge-117 2022-09-08 22:22:31 -0700
  • f5677d0ce1 NYOOOOOOOOOOOOOOM InfoManiac742 2022-09-08 22:16:47 -0700
  • 0f0c438b1b Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-08 22:04:30 -0700
  • 19b8e12933
    Merge pull request #1449 from HarbourMasters/develop-zhora briaguya 2022-09-09 00:16:36 -0400
  • 74ec9f6c04
    Add descriptions to save editor flags editor, and added randomizer flags (#1386) Garrett Cox 2022-09-08 22:48:15 -0500
  • 1ef3172bdd
    Update soh/soh/Enhancements/debugger/debugSaveEditor.h Garrett Cox 2022-09-08 22:46:21 -0500
  • 41f0b548bc done? louis 2022-09-08 23:37:38 -0400
  • fc1854dfaa
    Update soh/soh/Enhancements/debugger/debugSaveEditor.h Garrett Cox 2022-09-08 22:09:11 -0500
  • a9f3aedf8e
    Enhanced Magic Arrows (non-rando) (#1376) Sarge-117 2022-09-08 19:58:08 -0700
  • 9686a7ca4c
    Add Items submenu to Enhancements > Gameplay (#1410) lilDavid 2022-09-08 21:57:09 -0500
  • e80e3440e1
    wiiu: package SoH as a homebrew bundle (#1427) GaryOderNichts 2022-09-09 04:55:55 +0200
  • 674bc4cc3e
    Fixes crash handler. (#1446) 3.0.2 Kenix3 2022-09-08 22:51:56 -0400
  • 452d563774 Fixes crash handler. Kenix3 2022-09-08 22:50:38 -0400
  • 37a6855c1e Fixes crash handler for jenkins builds. Kenix3 2022-09-08 22:29:18 -0400
  • 7ee46300f9 Add ability to disable fish randomly escaping Josh Bodner 2022-09-08 17:58:26 -0700
  • 7d2101cf70 Test this build on jenkins Kenix3 2022-09-08 20:50:36 -0400
  • 4cda92462a
    Lowers severity of resource manager logging. Kenix3 2022-09-08 20:25:44 -0400
  • 210ed5e1c6
    Merge branch 'rando-next' into leggettc18/issue1071 Christopher Leggett 2022-09-08 20:07:35 -0400
  • b9c7f74ef9
    Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into rando-next Christopher Leggett 2022-09-08 20:06:24 -0400
  • 6b273c9041
    [Rando] Child Gerudo Fortress 37th Heartpiece randomized Fixes #1071 Christopher Leggett 2022-09-08 20:02:58 -0400
  • 4a0269b3b1
    Increment version Kenix3 2022-09-08 19:10:03 -0400
  • 3223331e76
    Increment version Kenix3 2022-09-08 19:08:22 -0400
  • 4d81c28738
    boxes (#1428) louist103 2022-09-08 19:05:16 -0400
  • b85ac715eb
    Backport crash handler (#1401) louist103 2022-09-08 19:05:09 -0400
  • 392aa216af litle less than half way louis 2022-09-08 12:01:18 -0400
  • 18b3cc0633 Add cheat for easy pause buffering Garrett Cox 2022-09-08 01:32:59 -0500
  • 5e0382384b Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-07 22:12:36 -0700
  • 7b97c58dc4 [579] Add simulated input lag option Garrett Cox 2022-09-07 23:43:50 -0500
  • 2c693d2f22
    Merge pull request #1433 from garrettjoecox/use-3drando-item-names briaguya 2022-09-07 23:41:43 -0400
  • 956c04cfc4
    Merge pull request #1436 from leggettc18/better_icon_hash briaguya 2022-09-07 23:22:21 -0400
  • 32c0af27a8
    Hopefully makes Jenkins happy Christopher Leggett 2022-09-07 22:48:11 -0400
  • f7af306eff
    Hopefully makes Jenkins happy Christopher Leggett 2022-09-07 22:48:11 -0400
  • 90cc2fa361
    Changes filename format to icon indexes separated by dashes Christopher Leggett 2022-09-07 22:22:16 -0400
  • cb0f4ffd97
    Prevents leading 0s added to hash from being in file name Christopher Leggett 2022-09-07 21:30:33 -0400
  • bba59509f3
    Removes some unused functions and variables in `spoiler_log.cpp` Christopher Leggett 2022-09-07 21:23:41 -0400
  • e3d174cc9b
    Uses the hash instead of seed for spoilerfile name and icons. Christopher Leggett 2022-09-07 21:19:16 -0400
  • 1763eda169
    Implements a larger array of Sprites for the Icon Hash. Christopher Leggett 2022-09-07 20:23:22 -0400
  • 14e8503cda Only block keyboard input when typing in textfield David Chavez 2022-09-07 23:04:46 +0200
  • d94be06208 Fix localized item names for shopsanity Garrett Cox 2022-09-07 12:08:29 -0500
  • 558f97741f Merge branch 'use-3drando-item-names' of github.com:garrettjoecox/OOT into shopsanity Garrett Cox 2022-09-07 11:58:07 -0500
  • 248b4d4d75 Fix issues with rendering songs Garrett Cox 2022-09-07 11:11:44 -0500
  • d928335dd2 Respect custom draw functions Garrett Cox 2022-09-07 09:56:30 -0500
  • 9ced03335a Remove unneeded headers Josh Bodner 2022-09-07 01:35:32 -0700
  • 0ac0b4239f Refactor Input Editor code to be used by Game Control Editor in order to remove copied code Josh Bodner 2022-09-07 01:29:34 -0700
  • 5474847509 Merge branch 'develop-zhora' into slowwalk Josh Bodner 2022-09-06 23:44:10 -0700
  • 67e1b3637e Merge branch 'develop-zhora' into autofix-improvements Josh Bodner 2022-09-06 23:13:19 -0700
  • 922c92fa51 Merge branch 'develop-zhora' into credits-fix Josh Bodner 2022-09-06 22:44:24 -0700
  • 090c403d7f Add Dampe winning to Enhanced preset Josh Bodner 2022-09-06 22:01:24 -0700
  • ffc4e252b6 Minor changes for randoSettings Garrett Cox 2022-09-06 23:57:30 -0500
  • 5927675492 Merge branch 'develop-zhora' into consolidate-dpad Josh Bodner 2022-09-06 21:57:19 -0700
  • 8b7ee9c6bb Merge branch 'develop-zhora' into win-dampe Fixes merge conflict due to ImGui code moving to SoH Also disables setting in rando files Josh Bodner 2022-09-06 21:32:57 -0700
  • 13c4e9c49b Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into update-randomizer-save-format Garrett Cox 2022-09-06 21:40:09 -0500
  • 85bb09c70b Remove log Garrett Cox 2022-09-06 21:24:05 -0500
  • f366e1d56e Add missing newline Garrett Cox 2022-09-06 21:19:43 -0500
  • 4dd9c99c11 Use another nested method instead of one at the top level to fetch the table Garrett Cox 2022-09-06 21:17:55 -0500
  • f47f27c19e Use 3drando item table for parsing spoiler names Garrett Cox 2022-09-06 19:42:01 -0500
  • cfc5d1d4e3 Fix merge error Sarge-117 2022-09-06 14:05:29 -0700
  • d96feaf4a4 Tidy up chain platform cutscene check Sarge-117 2022-09-06 14:00:09 -0700
  • 5b4ce49688 Base whats in the bazaar shop on entranceIndex instead of age Garrett Cox 2022-09-06 15:59:09 -0500
  • 21bf25bc7d Clean up chain platform cutscene check Sarge-117 2022-09-06 13:42:17 -0700