Commit Graph

  • c47f1d6d92 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into let-it-snow Garrett Cox 2024-12-09 21:01:45 -0600
  • 7d80d1c85d
    Fix boss hints and gift from sages hint. (#4634) Pepper0ni 2024-12-10 02:24:51 +0000
  • f852d70767
    Properly replicate NaviTalk kill check (#4647) Jordan Longstaff 2024-12-09 21:24:37 -0500
  • 35dcf93c51
    Adult Ruto function and property names pulled in from decomp (#4654) Jordan Longstaff 2024-12-09 21:23:57 -0500
  • 6823b6990b
    Name alpha-distance update function from decomp (#4658) Jordan Longstaff 2024-12-09 21:23:14 -0500
  • ad23298500
    Automate settings text to enum conversion and remove OptionGroups from the process (#4636) Pepper0ni 2024-12-10 02:18:00 +0000
  • 6470522a02
    Fix temp flags transfering in dungeon chains and various issues with voidouts in mixed entrances (#4637) Archez 2024-12-09 21:17:26 -0500
  • 4162a818b1 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into let-it-snow Garrett Cox 2024-12-09 19:42:34 -0600
  • 7aa6abbedb Nope, missed a couple more JordanLongstaff 2024-12-09 16:29:13 -0500
  • aa509db4e8 Align name changes more with decomp JordanLongstaff 2024-12-09 16:26:24 -0500
  • 4f29624efc Review Comments aMannus 2024-12-09 21:14:21 +0100
  • 8ca4b3b601 Move `*should = false` out of condition JordanLongstaff 2024-12-09 13:56:16 -0500
  • a702531b53 Properly replicate NaviTalk kill check JordanLongstaff 2024-12-09 13:40:47 -0500
  • b5e981dd2e Merge branch 'develop' into fix-jabu-jabu-switch JordanLongstaff 2024-12-09 12:37:42 -0500
  • de6f5d8b65
    Skip Water Temple portcullis opening cutscene (#4641) Jordan Longstaff 2024-12-09 11:14:47 -0500
  • 23dc4257a7
    Skip one-point cutscene of Amy's blocks falling (#4645) Jordan Longstaff 2024-12-09 11:14:01 -0500
  • d0bfa6860b
    Skip the Mweep cutscene (#4646) Jordan Longstaff 2024-12-09 11:13:45 -0500
  • 4010229de5
    Rename bomb flower fuse setting field (decomp) (#4653) Jordan Longstaff 2024-12-09 11:13:28 -0500
  • 2d37098379
    Rename Sleeping Waterfall state machine function (decomp) (#4655) Jordan Longstaff 2024-12-09 11:13:18 -0500
  • d8d9119de9
    Rename Kakariko Well water level function (decomp) (#4656) Jordan Longstaff 2024-12-09 11:13:08 -0500
  • b58519dff4 Name alpha-distance update function from decomp JordanLongstaff 2024-12-09 08:56:27 -0500
  • a6a298faf2 Rename Kakariko Well water level function (decomp) JordanLongstaff 2024-12-08 20:52:30 -0500
  • 0e1e9b6bb4 Rename Sleeping Waterfall state machine function (decomp) JordanLongstaff 2024-12-08 20:50:07 -0500
  • 46f982deb9 Adult Ruto function and property names pulled in from decomp JordanLongstaff 2024-11-04 13:00:30 -0500
  • 6c37d6cc85 Rename bomb flower fuse setting field (decomp) JordanLongstaff 2024-11-10 22:39:50 -0500
  • 71fcfacc59
    Merge e02be77f6b into 732b8c10f7 Jordan Longstaff 2024-12-08 18:09:38 -0500
  • 732b8c10f7
    bump LUS (#4638) briaguya 2024-12-08 13:46:31 -0500
  • 0c5ffd9d28 Add pulsate boss icon enhancement rozlette 2024-12-08 01:10:14 -0600
  • 4ffdc0b2f9 RBA and BA rozlette 2024-12-08 00:22:33 -0600
  • 5041e91e89
    Update macOS development dependency list lemonslut 2024-12-07 17:19:30 -0700
  • bd7b3d48e6 Initial mockup aMannus 2024-12-07 23:54:34 +0100
  • 479b26421e Restrict disabled Navi workaround to Dodongo's Cavern JordanLongstaff 2024-12-07 15:40:29 -0500
  • a829ed0005 Fix bug: Ruto's letter was not removed from bottle JordanLongstaff 2024-12-07 14:58:13 -0500
  • e86cc5bf07 Fix GtG MQ pots, fix water temple pot logic aMannus 2024-12-07 20:39:02 +0100
  • fcdf1b4cb0 Skip the Mweep cutscene JordanLongstaff 2024-12-07 14:30:05 -0500
  • e7f5628db4 Merge branch 'develop' into fix-giant-knife JordanLongstaff 2024-12-07 11:56:18 -0500
  • bd69b0295c Restore Goron walking out animation JordanLongstaff 2024-12-07 11:08:07 -0500
  • 54a8f4600e Skip one-point cutscene of Amy's blocks falling JordanLongstaff 2024-12-07 10:44:01 -0500
  • 1bc4b4688e Skip Water Temple portcullis opening cutscene JordanLongstaff 2024-12-07 02:03:58 -0500
  • 2c63ae3815 SceneDB rozlette 2024-12-04 23:53:07 -0600
  • dc4e9ea564 Revert a change too far JordanLongstaff 2024-12-07 01:14:14 -0500
  • 3bfb6c7e39 Skip walking away cutscene when freeing Gorons JordanLongstaff 2024-12-07 01:10:51 -0500
  • 6cbd1e060f bump OTRExporter briaguya 2024-12-06 23:39:34 -0500
  • 8b0d7d6443 bump LUS briaguya 2024-12-06 23:11:05 -0500
  • cd6a9eed07 Fix temp flags transfering in dungeon chains and various issues with voidouts in mixed entrances Archez 2024-12-06 16:24:44 -0500
  • 7d51773bc9 Fix logic for pots in Fire Temple aMannus 2024-12-06 20:11:23 +0100
  • 2534b8c6a1 rename fortress setting into carpenters Pepper0ni 2024-12-06 19:01:03 +0000
  • 60a133d843 Merge branch 'develop' into potsanity aMannus 2024-12-06 19:57:22 +0100
  • fc350abe28 Automate settings text to enum conversion Pepper0ni 2024-12-06 18:33:40 +0000
  • 3964051420 Force setting on in rando JordanLongstaff 2024-12-06 11:22:28 -0500
  • bccd96966f
    Fix crash when toggling alt assets while paused (#4621) Archez 2024-12-06 10:36:38 -0500
  • 3795bd4261 Fix boss hints and gift from sages hint. Pepper0ni 2024-12-06 11:24:13 +0000
  • 09f297392f
    Fix GetItemObtainabilityFromRandomizerGet check for sticks and nuts not accounting for not shuffling stick or nut bags and also not starting with related ammo. (#4633) Malkierian 2024-12-05 21:35:27 -0700
  • 18171f5a8c Fix GetItemObtainabilityFromRandomizerGet check for sticks and nuts not accounting for not shuffling stick or nut bags and also not starting with related ammo. Malkierian 2024-12-05 20:53:52 -0700
  • 81f8bf9362 Fix crash when toggling alt assets while paused Archez 2024-12-05 14:19:19 -0500
  • 276db580e8
    Fix display list offset values and unhandled opcodes (#4618) Archez 2024-12-05 11:00:39 -0500
  • b8fddc4c3a fix unknown opcodes on custom chest textures Archez 2024-12-05 10:39:58 -0500
  • 3cb6f32ae9 Fix display list offset values and unhandled opcodes Archez 2024-12-04 23:12:23 -0500
  • 2808279f00
    Merge pull request #4615 from garrettjoecox/let-it-snow Garrett Cox 2024-12-04 21:35:44 -0600
  • 05539fee03 Add custom collectible thing Garrett Cox 2024-12-04 20:26:11 -0600
  • fb5a2a093c Merge branch 'develop' into potsanity aMannus 2024-12-04 23:28:09 +0100
  • 61ae3f65e1 Address review comment aMannus 2024-12-04 22:41:14 +0100
  • ba1649e17f
    Update soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c aMannus 2024-12-04 20:51:14 +0100
  • bb61b443de
    Update soh/include/z64actor.h aMannus 2024-12-04 20:51:05 +0100
  • a5c8da7c66 Fix ganon's lair pots being behind GBK in logic aMannus 2024-12-04 20:34:17 +0100
  • d7ad541740
    Merge pull request #43 from Caladius/potsanity-gtg aMannus 2024-12-04 20:16:15 +0100
  • 4a447ec806 Review comments round 1 & code cleanup aMannus 2024-12-04 20:15:34 +0100
  • 796576717f Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into let-it-snow Garrett Cox 2024-12-04 12:24:30 -0600
  • 3e44a3610a Merge branch 'develop' into potsanity aMannus 2024-12-04 19:09:57 +0100
  • c3e4579cba
    Change GetSelectedOptionText to contextSelection and clean up some junk (#4613) Pepper0ni 2024-12-04 18:01:25 +0000
  • 9b169af3f5
    Fix find newline looping to have additional break early cases (#4614) Archez 2024-12-04 13:01:08 -0500
  • 36d580685f Fix find newline looping to have additional break early cases Archez 2024-12-04 12:17:37 -0500
  • 2fbb99d553 post merge cleanup and some small menu changes Pepper0ni 2024-12-04 13:42:35 +0000
  • ff752f95c2 Merge branch 'develop' into DanaModels Pepper0ni 2024-12-04 13:20:28 +0000
  • 8e4493746b readd a fail alert as an assert Pepper0ni 2024-12-03 22:19:48 +0000
  • d904b8101e more cleanup Pepper0ni 2024-12-03 22:07:29 +0000
  • 89dfd5fc17 Change GetSelectedOptionText to contextSelection and clean up some junk Pepper0ni 2024-12-03 21:58:22 +0000
  • b442c15322
    Skip Shadow Statue Cutscene (#4612) Pepper0ni 2024-12-03 19:30:14 +0000
  • 7c9ece8d4f cleanup Pepper0ni 2024-12-03 17:53:16 +0000
  • b1d1852655
    Rewrite vanilla jabu logic (#4603) Pepper0ni 2024-12-03 16:44:36 +0000
  • 291561667b
    Update hook debugger to pull from GameInteractor ptrs rather than cloning the data every frame (#4609) Garrett Cox 2024-12-03 10:44:18 -0600
  • 82d70a2029
    Add Timer Display Window (#4553) Caladius 2024-12-03 11:44:10 -0500
  • 8b60cea1f9
    Split "Starting Consumables" to Sticks and Nuts. (#4583) Malkierian 2024-12-03 09:18:22 -0700
  • f2cc278f8c
    Fixes for the English text in several files (#4605) Extloga 2024-12-03 16:18:07 +0000
  • e704c5592b
    fix text Poeverflow on Poes hint (#4598) Pepper0ni 2024-12-03 16:11:01 +0000
  • da642ea62f Skip Shadow Statue Cutscene Pepper0ni 2024-12-03 15:10:34 +0000
  • b948f1090d Update hook debugger to pull from GameInteractor ptrs rather than cloning the data every frame Garrett Cox 2024-12-02 19:04:01 -0600
  • bbe3bb72b6
    VBify Ruto (#4602) Garrett Cox 2024-12-02 18:56:32 -0600
  • 2581847a8f VBify Ruto Garrett Cox 2024-11-30 11:15:13 -0600
  • 8d6afb0b6a Merge branch 'develop' into fix-giant-knife JordanLongstaff 2024-12-02 16:12:44 -0500
  • 7a04933f8b
    Merge branch 'HarbourMasters:develop' into develop Extloga 2024-12-02 20:53:31 +0000
  • 4edb83e2f3
    Fix errors introduced by actor check reveal PR from references to GetSelectedOptionIndex. (#4607) Malkierian 2024-12-02 13:46:16 -0700
  • 7ff7e98e1d Fix Broken Giant's Knife flag not resetting JordanLongstaff 2024-12-02 14:44:18 -0500
  • 48544e9c12
    Fixes for the German translation in hint_list.cpp Extloga 2024-12-02 20:26:07 +0000
  • e2869c37c5 Fix errors introduced by actor check reveal PR from references to GetSelectedOptionIndex. Malkierian 2024-12-02 13:02:01 -0700
  • ef45874373
    Merge branch 'HarbourMasters:develop' into develop Extloga 2024-12-02 19:53:25 +0000
  • fe9bf7d956
    Adjust Actor_GetProjectileActor to behave more like hardware, fixing an issue with Dark Link (#4606) Garrett Cox 2024-12-02 13:40:29 -0600
  • fca65accfd
    Fixes for the English text in settings.cpp Extloga 2024-12-02 18:08:55 +0000
  • 1e6ffcaeb4
    Merge branch 'HarbourMasters:develop' into develop Extloga 2024-12-02 16:54:32 +0000
  • a87c65c020
    Fixes for the English text in option_descriptions.cpp Extloga 2024-12-02 16:47:45 +0000