Commit Graph

  • 6a6b8359e8 Set to 0 for default preset Sarge-117 2022-10-04 21:02:36 -0700
  • ea9be1d0c8
    Fixes some weird formatting in ZRom.c Christopher Leggett 2022-10-04 21:06:04 -0400
  • 0b45bbffe4 Comment Sarge-117 2022-10-04 18:04:53 -0700
  • 2c77787aeb More comments Sarge-117 2022-10-04 17:49:52 -0700
  • 90506ba5dc
    Removes unneeded code from the last commit. Christopher Leggett 2022-10-04 20:22:49 -0400
  • fd837bec14 Move cvar checkbox into "Items" submenu Sarge-117 2022-10-04 17:10:38 -0700
  • a705c080b1
    Changes OTR Extraction to have specific mq and nonmq paths. Christopher Leggett 2022-10-04 18:28:55 -0400
  • bf6f3d0d10 More comments Sarge-117 2022-10-04 14:59:49 -0700
  • 210584ddf8 Comments Sarge-117 2022-10-04 14:49:59 -0700
  • b32ca22e19 Using trade items, selling big poes Sarge-117 2022-10-04 14:40:42 -0700
  • d32a348637 Clarified Adult 1 -> Child 1 edge case; flipped age enum on 3d rando side; cleaned up ImGui stuff Ralphie Morell 2022-10-04 16:48:15 -0400
  • 12505e9a04 Zero out equips from adult -> child if no child equips Ralphie Morell 2022-10-04 14:34:49 -0400
  • 28043c7596 Fix skipping "get item" cutscene logic aMannus 2022-10-04 18:52:39 +0200
  • 61533341d5 Function names Sarge-117 2022-10-04 09:12:36 -0700
  • ed8c2ea30e Merge remote-tracking branch 'upstream/develop' into single_use_items_from_inventory Sarge-117 2022-10-03 22:37:27 -0700
  • 560504924c Bottles, trade items, cleanup Sarge-117 2022-10-03 22:37:16 -0700
  • 5a80994564
    Merge branch 'develop' into slowwalk Josh Bodner 2022-10-03 21:13:32 -0700
  • ef134bb493 Merge branch 'develop' into mouse RaelCappra 2022-10-04 00:26:24 -0300
  • 753be36d05 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into develop RaelCappra 2022-10-04 00:25:53 -0300
  • 1588ab1ae7 Merge branch 'mouse' into experimental RaelCappra 2022-10-03 23:32:02 -0300
  • f8bb6ddf0d fix mac x86 Louis 2022-10-03 22:10:50 -0400
  • ce2112fbe4 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into mouse RaelCappra 2022-10-03 22:47:54 -0300
  • 404078ae78 no more iffy includes, using OTRGlobas instead RaelCappra 2022-10-03 22:34:28 -0300
  • 236cb0bfb0
    Merge pull request #1690 from HarbourMasters/develop-zhora briaguya 2022-10-03 21:12:58 -0400
  • f82e833b5e fix typo Louis 2022-10-03 21:00:21 -0400
  • 7e961891c3 couple formatting changes Adam Bird 2022-10-03 20:59:44 -0400
  • 06e8a5af41
    Fix navi colors in cosmetics editor (#1684) aMannus 2022-10-04 02:50:05 +0200
  • 7ea23342db fixed zora river decoupling Ryanoberlein 2022-09-05 23:07:43 -0400
  • bfc92a20df fixed epona cutscene issues Ryanoberlein 2022-09-03 23:50:12 -0400
  • ef338e24a7 made gerudo fortress accessible from desert entrance Ryanoberlein 2022-09-03 18:27:59 -0400
  • 39eecdc77c small fix Ryanoberlein 2022-08-31 11:00:59 -0400
  • 770714135a Entrance rando UI cleanup aMannus 2022-08-25 22:49:09 +0200
  • bd0dc5c9d9 starting to work on horse cutscene issue Ryanoberlein 2022-08-25 16:08:27 -0400
  • 20917d138f mostly fixed boss warp Ryanoberlein 2022-08-24 16:07:33 -0400
  • 3689ef3337 fixed hyrule market bridge visual bug Ryanoberlein 2022-08-23 15:18:53 -0400
  • 7bb166d80d 3drando parity botw logic Ryanoberlein 2022-08-23 12:40:17 -0400
  • 4a0ca76aa4 fixed botw access Ryanoberlein 2022-08-23 10:45:30 -0400
  • 1ee8efaa26 fixed farrores wind Ryanoberlein 2022-08-22 22:33:45 -0400
  • 60de3936de made firetemple and deku accesible for all ages Ryanoberlein 2022-08-22 16:38:14 -0400
  • 824ec3755f fixed minor github comment suggested changes Ryanoberlein 2022-08-16 23:02:13 -0400
  • 73335de5ba fixed sun song Ryanoberlein 2022-08-16 21:59:52 -0400
  • 7c034d7b9c forgot a change Ryanoberlein 2022-08-16 21:08:29 -0400
  • 3b317ba10b fixed debug warping Ryanoberlein 2022-08-16 21:08:03 -0400
  • 69717cf76e fixed lon lon Ryanoberlein 2022-08-16 19:17:37 -0400
  • 618c139e1d fixed voidout/death/save&quit issue Ryanoberlein 2022-08-15 23:37:17 -0400
  • ad3c4d604d fairy fountain fix Ryanoberlein 2022-08-15 19:30:40 -0400
  • a3067a18f3 actually actually actually fixed grottos Ryanoberlein 2022-08-14 19:48:11 -0400
  • 49046d8024 actually actually fixed grotto issue Ryanoberlein 2022-08-14 18:25:42 -0400
  • ea5d46210f actually fixed grotto bug (i hope) Ryanoberlein 2022-08-14 18:11:35 -0400
  • 5f912bf6f7 fixed grotto breaking bug Ryanoberlein 2022-08-14 17:34:44 -0400
  • db9be5dce3 human readable spoiler Ryanoberlein 2022-08-13 20:28:51 -0400
  • 95d33bf76e Merge pull request #3 from garrettjoecox/entrance-rando-fixes Ryanoberlein 2022-08-13 14:12:30 -0400
  • cf124645fe Entirely replace gSaveContext.entranceIndex, and near the top of Gameplay_Init Garrett Cox 2022-08-13 12:10:12 -0500
  • 804d1abf94 working entrance rando Ryanoberlein 2022-08-11 21:21:33 -0400
  • e33d558d52 Merge branch 'ryan-test' into entrance-rando-small-fix, add note briaguya 2022-08-10 10:13:37 -0400
  • 66a29f626c still not fully working but it seems at least some of the entrance replacements are being loaded briaguya 2022-08-10 00:17:47 -0400
  • 0720c37656
    Randomized Ice trap models (#1648) Christopher Leggett 2022-10-03 19:15:36 -0400
  • ed3070070f added more stuff to parse json Ryanoberlein 2022-08-07 23:05:22 -0400
  • f1070a2e74
    set version in build.c from CmakeLists.txt version info (#1678) th-2021 2022-10-04 01:13:29 +0200
  • ecf7e53255 small logic fix Ryanoberlein 2022-08-06 18:20:20 -0400
  • d6b21acac4 z_play integration Ryanoberlein 2022-08-06 17:55:54 -0400
  • 09c3fc1b6e ci(Mergify): configuration update David Chavez 2022-10-04 00:46:35 +0200
  • 50e4392adc fixed py file issue Ryanoberlein 2022-08-05 20:36:25 -0400
  • 22bed713e3 fixed vcxproj files Ryanoberlein 2022-08-04 23:35:58 -0400
  • 954ba2673a entrance category added Ryanoberlein 2022-08-04 20:40:24 -0400
  • 904a41d48a fixed a build bug Ryanoberlein 2022-08-04 19:19:23 -0400
  • 2795fdf252 entrance rando seed gen Ryanoberlein 2022-08-04 17:37:57 -0400
  • f7fb385a0b Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into mouse RaelCappra 2022-10-03 17:33:10 -0300
  • 9aa467d076 Add grottos Garrett Cox 2022-10-03 12:56:35 -0500
  • 8ac67c1e8a whoops Ralphie Morell 2022-10-03 13:23:43 -0400
  • 28be0809ff Reset initial adult spawn to temple of time; enforced age restriction if forest is set to "closed" in rando menu Ralphie Morell 2022-10-03 13:20:33 -0400
  • adff928698 Persist scene selection to cvar & correctly wrap entrance selection Garrett Cox 2022-10-03 09:48:33 -0500
  • f059a39f16 Rename and reorganize some warps Garrett Cox 2022-09-16 14:41:26 -0500
  • b9450e38b3 Better debug warp screen Garrett Cox 2022-09-14 21:27:41 -0500
  • db2e6164cb
    Add silver/golden gauntlets to Cosmetics Editor (#1683) aMannus 2022-10-03 11:15:19 +0200
  • 6bdca84b90
    Add heart line length adjustment and modified magic meter anchoring (#965) Andrew Van Caem 2022-10-03 18:05:29 +1100
  • 8ad6b4cd56 set version in build.c from CmakeLists.txt version info Thomas Hiller 2022-10-02 12:41:43 +0200
  • 02c0caff4f
    [#1567] Fix merchant message table being generated before items were loaded from save (#1674) Garrett Cox 2022-10-03 01:50:19 -0500
  • 2ad0b37fa5
    [#1675] Fix for business scrubs crashing on expensive scrub shuffle (#1676) Garrett Cox 2022-10-03 01:49:53 -0500
  • 3616f60f79
    defines the maximum trick name string length. Christopher Leggett 2022-10-02 22:58:35 -0400
  • 2776100c2e
    Addresses feedback on PR. Christopher Leggett 2022-10-02 22:46:37 -0400
  • 8e4c52f5ff Rando: added option to randomize starting age Ralphie Morell 2022-10-02 21:06:35 -0400
  • a5aa26310c Add enhancement checkbox Sarge-117 2022-10-02 16:07:52 -0700
  • 21e31a9910 Merge remote-tracking branch 'upstream/develop' into single_use_items_from_inventory Sarge-117 2022-10-02 16:07:24 -0700
  • b52875abf4 Single-use-items Sarge-117 2022-10-02 16:07:17 -0700
  • 38a1f8e5b5 Fix navi description for props aMannus 2022-10-02 23:29:41 +0200
  • f8c4d49527 Fix navi colors in cosmetics editor aMannus 2022-10-02 23:06:47 +0200
  • bef2210f0b Changed comment again (helps if you save the file before committing) aMannus 2022-10-02 22:32:04 +0200
  • 3e10de12ab Fixed comment aMannus 2022-10-02 22:31:22 +0200
  • fd6072111d Removed extra space aMannus 2022-10-02 22:09:28 +0200
  • e39d49f1da Add golden gauntlets to Cosmetics Editor aMannus 2022-10-02 22:06:52 +0200
  • 6b6a352205
    Rando: Fix "Scrubsanity Off" using mysterious text (#1679) aMannus 2022-10-02 20:32:05 +0200
  • 11b0a972dd uint32_t -> uint8_t aMannus 2022-10-02 19:35:41 +0200
  • 1e75cedc75
    Fixes spoiler_log language error. Christopher Leggett 2022-10-02 10:53:13 -0400
  • 62da290aa4
    Merge branch 'develop' into ice-trap-models Christopher Leggett 2022-10-02 09:50:42 -0400
  • 17baad546d Fix scrubshuffle using bool in C code aMannus 2022-10-02 13:32:20 +0200
  • 75d0402525
    Update randomizer save format (#1635) Garrett Cox 2022-10-02 05:11:12 -0500
  • 612955ac9f Move changes to LoadRandomizerVersion2 Garrett Cox 2022-10-02 04:01:41 -0500
  • 5395b9a351 [#1675] Fix for business scrubs crashing on expensive scrub shuffle Garrett Cox 2022-10-02 03:49:03 -0500
  • 384a3e5027 [#1567] Fix merchant message table being generated before items were loaded from save Garrett Cox 2022-10-02 01:34:26 -0500