Commit Graph

  • 8e49f0465c
    Merge pull request #1399 from aMannus/rando-bombchu-drops briaguya 2022-09-03 15:03:30 -0400
  • e1da7bf9af Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-03 11:58:38 -0700
  • 6cd8d6ca3a Clean up bool aMannus 2022-09-03 20:48:00 +0200
  • b31b1ef157 Restore checkboxes in menu Sarge-117 2022-09-03 11:43:31 -0700
  • 5a9540585a Simplify mudwall collision check Sarge-117 2022-09-03 11:35:19 -0700
  • 8d033c6766 Update settings.cpp aMannus 2022-09-03 20:29:45 +0200
  • af17958dfe Updated after ImGui merge aMannus 2022-09-03 20:27:09 +0200
  • 0151294648 Simplify mudwall collision check Sarge-117 2022-09-03 11:24:17 -0700
  • 23635dc3d8 Merge branch 'develop-zhora' into slider-fixes-switch-wiiu aMannus 2022-09-03 20:23:50 +0200
  • ae0ccb9cca Missing break aMannus 2022-09-03 20:18:54 +0200
  • 274242e0d7 Implement rando bombchu drops aMannus 2022-09-03 20:17:12 +0200
  • cbc181bc0a
    Merge pull request #1392 from lilDavid/re-add_progressive_chus briaguya 2022-09-03 14:13:17 -0400
  • a397b07ec4 Update location access logic Sarge-117 2022-09-03 10:37:14 -0700
  • 98dbbfda13
    Merge pull request #1395 from leggettc18/starting-bgs briaguya 2022-09-03 13:36:12 -0400
  • 1f7122025f
    Merge pull request #1394 from leggettc18/leggettc18/issue1390 briaguya 2022-09-03 13:33:19 -0400
  • bb04e9d97d Restore checkboxes to enhancements menu Sarge-117 2022-09-03 09:57:35 -0700
  • 43372155f2 Fix mistake from merge Sarge-117 2022-09-03 09:39:42 -0700
  • 92bb55531a Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows Sarge-117 2022-09-03 09:32:00 -0700
  • 05f7b65d28 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-03 09:30:14 -0700
  • ac6843ca57 Fix for overriding deku scrub messages Garrett Cox 2022-09-03 10:34:35 -0500
  • 771d1dfbf5 Fix issues from LUS refactor Garrett Cox 2022-09-03 10:09:51 -0500
  • 5eeda742cd Disable game input when typing into a textfield David Chavez 2022-09-03 17:06:28 +0200
  • c037bfc16b Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-03 09:49:50 -0500
  • 4499c146ab Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into save-editor-flags Garrett Cox 2022-09-03 09:47:16 -0500
  • b92b1eaee6 Use SohImGui::RequestCvarSaveOnNextTick Garrett Cox 2022-09-03 09:33:54 -0500
  • 90bf5988ee Adjust Hooks include Garrett Cox 2022-09-03 09:30:53 -0500
  • 8be6f6e441 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes Garrett Cox 2022-09-03 09:19:14 -0500
  • ed8966054c Persist item tracker notes Garrett Cox 2022-09-03 09:15:05 -0500
  • e079c254f1
    Fixes Link starting with BGS Christopher Leggett 2022-09-03 09:39:03 -0400
  • 5421ad27c9
    Rando-next: Deku Nut and Seed ammo gives a blue rupee Fixes #1390 Christopher Leggett 2022-09-03 09:24:37 -0400
  • f5fae6df32 Reimplement progressive Bombchus lil David 2022-09-03 07:51:28 -0500
  • 8d2f63419f Implement Skip Scarecrow's Song aMannus 2022-09-03 14:40:41 +0200
  • 3aefd4c519 gSaveContext access in GameMenuBar.cpp aMannus 2022-09-03 12:47:32 +0200
  • 431231f2be
    Merge pull request #1388 from briaguya-ai/z-to-rando-next briaguya 2022-09-03 06:10:09 -0400
  • 007540fb39 Merge branch 'develop-zhora' into z-to-rando-next briaguya 2022-09-03 05:55:40 -0400
  • f1dc980de8 Fixed autobreak after ImGui cleanup aMannus 2022-09-03 11:16:43 +0200
  • 9544f7750e Fixed autobreak after ImGui cleanup aMannus 2022-09-03 11:16:43 +0200
  • ea4e0652e7 bring back new rando dropdown briaguya 2022-09-03 04:41:43 -0400
  • 3a6d7fcfd0 and make it build briaguya 2022-09-03 04:23:25 -0400
  • 975a854054 Merge branch 'develop-zhora' into z-to-rando-next briaguya 2022-09-03 03:47:09 -0400
  • db6eeb79ee
    Merge pull request #1387 from leggettc18/leggettc18/issue1366 briaguya 2022-09-03 03:18:50 -0400
  • 350d0b91ed
    Removes unneeded `GiveLinkItem` functions. Christopher Leggett 2022-09-03 02:47:42 -0400
  • 36cc9d562c
    Adds more options for Link's starting item. Christopher Leggett 2022-09-03 02:34:21 -0400
  • 19aeaa8ce3 Add descriptions to save editor flags editor, and added randomizer flags Garrett Cox 2022-09-03 01:29:48 -0500
  • 6daf357fd9
    fix include fix build (#1385) briaguya 2022-09-03 02:13:20 -0400
  • 2ac8debc44 fix include fix build briaguya 2022-09-03 01:53:16 -0400
  • 2015e3a041
    Converts Song from Impa to use `Item_Give` Christopher Leggett 2022-09-03 01:48:07 -0400
  • d2fa0d6485 Rando: Fix Fast File Select seed loading (#1252) Baoulettes 2022-08-22 04:19:02 +0200
  • b14fb37b81 Update libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp Ada 2022-08-17 14:47:43 +0100
  • edb5261b07 Fixes ToT Fog Ada 2022-08-17 13:20:15 +0100
  • a5804ca2b2
    Makes `Item_Give` safe to use with a NULL globalCtx. Christopher Leggett 2022-09-03 01:21:56 -0400
  • 8118947ab0
    Windows crash handler. (#1383) louist103 2022-09-03 01:15:43 -0400
  • 64256cf88a Fix naming convention. louist103 2022-09-03 01:15:27 -0400
  • 8971e7544a Windows crash handler. louist103 2022-09-03 01:11:51 -0400
  • 50daabb794
    Merge pull request #1353 from Sarge-117/update-navi-hints-rando briaguya 2022-09-03 00:53:39 -0400
  • df8f94da70
    Merge pull request #1382 from leggettc18/leggettc18/issue1365 briaguya 2022-09-03 00:43:43 -0400
  • a07ea091f0
    Fixes crash when entering Ganon's Castle lobby on linux. Christopher Leggett 2022-09-03 00:20:50 -0400
  • fba8fc2b74
    Fix Ganons Trials coming from old save files. Fixes #1365 Christopher Leggett 2022-09-03 00:20:07 -0400
  • 0ce0ab1260
    Phase 1: Separate ImGui Drawing From LUS (#1310) David Chavez 2022-09-03 06:00:04 +0200
  • 9441b2ab1d Update logic Cvar names Sarge-117 2022-09-02 19:37:02 -0700
  • 96ccdd6527 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-02 21:15:41 -0500
  • adcb29fc86
    Merge pull request #1379 from garrettjoecox/GetItem-renaming briaguya 2022-09-02 22:14:12 -0400
  • 33779823c8 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-02 19:10:28 -0700
  • 6fe51cdd24 Remove redundancy in KD room Sarge-117 2022-09-02 19:10:16 -0700
  • b9a545fffa Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity Garrett Cox 2022-09-02 20:19:57 -0500
  • f6fd116adb Cast randoGet for ganons boss key Garrett Cox 2022-09-02 20:19:28 -0500
  • 680495ab2b Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity Garrett Cox 2022-09-02 20:08:06 -0500
  • e0b0776e02 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItem-renaming Garrett Cox 2022-09-02 20:07:34 -0500
  • abfeb24ba8 Attempt to fix odd build issue Garrett Cox 2022-09-02 19:29:40 -0500
  • f69d9697e9 Struct instead of ImVec + basic comportment for all case PurpleHato 2022-09-03 01:30:47 +0200
  • b98442cc9f Move shopsanity option in GUI Garrett Cox 2022-09-02 17:28:38 -0500
  • c1894f108f
    Merge pull request #1380 from leggettc18/rando-next-key-fix briaguya 2022-09-02 18:33:47 -0400
  • e53ec33d85 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-02 17:27:07 -0500
  • 25ed66439e Fix repeatable purchases and bottles rendering incorrectly Garrett Cox 2022-09-02 17:23:37 -0500
  • 34d99441d6
    Merge pull request #1321 from aMannus/rando-settings-menu-even-moar-changes briaguya 2022-09-02 17:00:52 -0400
  • 2ead2557f0 combobox title rename + no number tracking PurpleHato 2022-09-02 22:41:05 +0200
  • d1dac2a2ee Add obtainability checks correctly Garrett Cox 2022-09-02 15:22:09 -0500
  • 069f7c98a6 Enum + combo box PurpleHato 2022-09-02 22:07:05 +0200
  • 0cdcc27e53
    Fixes Ganon's Boss Key shuffled while regular boss Keys aren't. Christopher Leggett 2022-09-02 15:45:55 -0400
  • 0277db578f Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity Garrett Cox 2022-09-02 14:33:32 -0500
  • 0c65a05ca8 Revert changes to GetItemFromGet Garrett Cox 2022-09-02 14:28:47 -0500
  • a95edd25de Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming Garrett Cox 2022-09-02 14:18:18 -0500
  • 1aa33a7940 Remove comments in OTRGlobals Garrett Cox 2022-09-02 14:17:45 -0500
  • 1659f1f386 Re-add GetItemObtainabilityFromRandomizerCheck Garrett Cox 2022-09-02 14:00:10 -0500
  • 42858bf15e Add shopsanity condition around shop changes Garrett Cox 2022-09-02 13:27:59 -0500
  • 7a22763e55 Fix an issue with textId and with giving items with fanfare Garrett Cox 2022-09-02 12:39:08 -0500
  • 64aca78450
    Fixes Switch/Wii U crashes with Wonder Rupees and Bottleable Entities (#1360) Christopher Leggett 2022-09-02 13:19:12 -0400
  • 3aa0674c18 Handle bazaar as both child and adult Garrett Cox 2022-09-02 12:07:30 -0500
  • d60a82d67a Use randomizerInf Garrett Cox 2022-09-02 11:47:57 -0500
  • 73606edf4e Use merchantMessageTableID Garrett Cox 2022-09-02 11:08:48 -0500
  • 43d8a11de5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-02 11:07:21 -0500
  • 32ea5ef564 Use randomizerMerchantPrices Garrett Cox 2022-09-02 11:04:45 -0500
  • ee2f38ad91 Renaming of some randomizer item/check/get methods Garrett Cox 2022-09-02 10:34:20 -0500
  • c7a7059db4 Minor adjustments from feedback and rename CanObtain to ItemObtainability Garrett Cox 2022-09-02 09:38:41 -0500
  • 676f8945ab Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes Garrett Cox 2022-09-02 09:15:31 -0500
  • 164a43c9cb Update logic for King Dodongo's room Sarge-117 2022-09-01 22:00:46 -0700
  • 636f3f0703 Update tooltip Sarge-117 2022-09-01 19:10:40 -0700
  • 41256359f2 Update tooltip Sarge-117 2022-09-01 18:44:23 -0700
  • b5a881f9ab Add magic arrow enhancements, non-rando Sarge-117 2022-09-01 18:21:44 -0700
  • 83469f85e7 Move checkboxes to normal enhancement menu Sarge-117 2022-09-01 17:47:25 -0700