Commit Graph

  • 280b9f5e08
    Fixes for the English text in option_descriptions.cpp Extloga 2024-12-02 16:40:40 +0000
  • caf0dc40c7
    update check tracker when actor tells what they reward (#4568) Philip Dubé 2024-12-02 16:04:21 +0000
  • 19d1fd5545
    Boomerang Reticle and First-Person Aiming (#3374) Eric Hoey 2024-12-02 11:03:47 -0500
  • 60a70bc795
    Ornament Exchange (#4582) Caladius 2024-12-02 10:44:35 -0500
  • 759b48cced Adjust Actor_GetProjectileActor to behave more like hardware, fixing an issue with Dark Link Garrett Cox 2024-12-02 09:08:11 -0600
  • 9603358776
    Fixes for the English text in static_data.cpp Extloga 2024-12-02 03:50:07 +0100
  • a8b09ab515
    Fixes for the English text in option_descriptions.cpp Extloga 2024-12-02 03:05:40 +0100
  • c286e14660
    Merge f7e0dac140 into 9b74a09955 Lars-Christian Selland 2024-12-01 13:18:21 -0500
  • 9b74a09955
    Zora's River waterfall always open, take two (#4459) Jordan Longstaff 2024-11-30 20:59:38 -0500
  • ee628059d8
    Fix Lab Man actor breaking and the invisible UI glitch (#4599) Pepper0ni 2024-12-01 01:59:13 +0000
  • e62d19550f Updates Caladius 2024-11-30 20:02:23 -0500
  • 50fe3ad94b Undo z_param change Caladius 2024-11-30 19:35:11 -0500
  • 0737a66857 more cleanup Pepper0ni 2024-11-30 22:25:07 +0000
  • d3a35d15bf cleanup Pepper0ni 2024-11-30 22:24:35 +0000
  • 8185dbdd61 rewrite vanilla jabu logic Pepper0ni 2024-11-30 22:17:20 +0000
  • dc74e76a89 Fix build errors JordanLongstaff 2024-11-29 22:59:26 -0500
  • 617e7c613d Merge branch 'develop' into waterfall-always-open JordanLongstaff 2024-11-29 22:54:38 -0500
  • 573d846cd7
    Add saved status setting to StartingItemGive (#4600) Malkierian 2024-11-29 20:35:38 -0700
  • 310f540da8 Fix? rando entrance logic for OI JordanLongstaff 2024-11-29 22:21:55 -0500
  • 9e5e860c57 Fix rando condition in hook JordanLongstaff 2024-11-29 21:35:07 -0500
  • 2a271a8270 Add saved status setting to StartingItemGive Malkierian 2024-11-29 18:36:13 -0700
  • a1ecee9569 Updated to split index options format. Malkierian 2024-11-29 18:03:31 -0700
  • f9b7506464 address review Pepper0ni 2024-11-30 01:02:12 +0000
  • 71c5061697 Split "Starting Consumables" to Sticks and Nuts. Setup disabling for them based on status of bag shuffles. Malkierian 2024-11-25 19:00:44 -0700
  • 55960da402
    Separate option values into context and menu indexes. (#4581) Malkierian 2024-11-29 17:58:30 -0700
  • a5a168a02a fix Lab Man actor breaking and the invisible UI glitch Pepper0ni 2024-11-30 00:49:18 +0000
  • 1c96d4c692 fix text Poeverflow on Poes hint Pepper0ni 2024-11-29 23:15:20 +0000
  • e9ab86d587 Final consts; rename `SetCVar` to `SaveCVar`. Malkierian 2024-11-29 16:04:26 -0700
  • a055d8ff1a Restore a couple more `const`s; cleanup header. Malkierian 2024-11-29 15:57:29 -0700
  • bf682fe310 Restore `const` classification to getter functions. Malkierian 2024-11-29 15:52:18 -0700
  • 364ed5bedb Restore `const` classification to functions returning `string&`. Malkierian 2024-11-29 15:33:12 -0700
  • ea25142e63 One moooooore thing Caladius 2024-11-29 17:10:11 -0500
  • b0ecd4963b Small fixes Pepe20129 2024-11-29 21:57:48 +0100
  • bd00918163 Update magic numbers, correct indentations hopefully Caladius 2024-11-29 15:20:34 -0500
  • f7378a9f76
    Cosmetics cleanup (#4587) Malkierian 2024-11-29 11:38:40 -0700
  • b56550a08f Undo most randomizerInf changes for now Pepe20129 2024-11-29 19:27:47 +0100
  • 6da2bdd209
    Update soh/soh/Enhancements/randomizer/3drando/location_access.cpp Malkierian 2024-11-29 10:44:02 -0700
  • 963ecd6d67 Fix option index reference in `CleanCheckConditionString`. Malkierian 2024-11-29 10:35:29 -0700
  • e3b80fcd58 Remove default color conversion, reference default colors directly in CosmeticOption initialization. Malkierian 2024-11-29 10:30:52 -0700
  • a300d8143b GTG MQ Pots Caladius 2024-11-29 10:47:28 -0500
  • 6f8544273e Update from Suggestions Caladius 2024-11-29 08:55:34 -0500
  • cfe14a1f3d feedback Philip Dubé 2024-11-29 01:34:57 +0000
  • 804664b5e0 update check tracker when actor tells you what they reward Demur Rumed 2024-11-21 14:11:01 +0000
  • 158ac71120
    fix Louis 2024-11-28 13:52:50 -0500
  • 746f329786
    Use torch sample xml format Louis 2024-11-28 11:39:42 -0500
  • 6c8c63f11e
    fix underscore logic in audio collection Louis 2024-11-28 11:38:46 -0500
  • ecb8429d28 Finish dungeon pots in item pool aMannus 2024-11-28 12:25:13 +0100
  • 70325c84dc Merge branch 'develop' into potsanity aMannus 2024-11-28 11:51:41 +0100
  • 6cc0ba6750 Start of handling dungeon pots in item pool aMannus 2024-11-28 11:50:10 +0100
  • df6f988965 Cleanup, more work on locationlist aMannus 2024-11-28 10:23:34 +0100
  • a965d4a088
    stdio for sprintf Louis 2024-11-27 23:20:50 -0500
  • 9d642a1b79
    submodules Louis 2024-11-27 22:14:13 -0500
  • ec7eb5d727
    Fix cmake lists Louis 2024-11-27 21:01:17 -0500
  • 92ac982b82
    fix deps Louis 2024-11-27 20:50:41 -0500
  • fe6320c856 Rename resourcemgr helpers louist103 2024-11-27 20:39:00 -0500
  • 3d90888bdc Backport 2ship streamed audio Louis 2024-11-27 20:25:08 -0500
  • c2df8c44fe Code clean up and double check. Ready for Review Caladius 2024-11-27 20:18:15 -0500
  • 20cd8dc132 Merge remote-tracking branch 'origin/develop' into develop-add-timers Caladius 2024-11-27 18:52:07 -0500
  • 4b06052570 Clean up unused Defines. Caladius 2024-11-27 18:51:15 -0500
  • 9daa9246ba Merge branch 'develop' into waterfall-always-open JordanLongstaff 2024-11-27 15:59:56 -0500
  • 5a74a68907 Re-align some stuff aMannus 2024-11-27 21:48:06 +0100
  • 51885c6ab4
    Merge pull request #42 from Pepper0ni/Potsanity aMannus 2024-11-27 21:39:10 +0100
  • 8a51d2241c Basic restructure Pepe20129 2024-11-27 21:29:04 +0100
  • a92c08dea1
    Fix some situations where trade items spoiled (#4569) Pepe20129 2024-11-27 18:33:50 +0100
  • 4fc4dae388 Hopefully fix mac Pepe20129 2024-11-27 18:24:02 +0100
  • a8229ff6ca Merge branch 'develop' into game_speed_multiplier Pepe20129 2024-11-27 18:00:53 +0100
  • 4cee5e2e6a Update z_game_over.c Pepe20129 2024-11-27 17:53:35 +0100
  • 21ec1634a3 Function name clarification. Malkierian 2024-11-26 19:00:35 -0700
  • a14b6acb4d Make Color_RGBA8 constructing function because... platform differences... Malkierian 2024-11-26 18:57:23 -0700
  • 5b7b38f198
    Add some +/- buttons and clean up timesavers menu (#4571) Pepper0ni 2024-11-27 01:29:27 +0000
  • f3c04366e2
    Merge 7865a8a944 into c960433832 Guilherme Fernandez 2024-11-27 01:28:53 +0000
  • c960433832
    Setup AdvancePond to run in OnItemReceive. (#4585) Malkierian 2024-11-26 18:28:50 -0700
  • 13789a1dfb
    Prevent void and teleport traps from being added to the shuffle pool while fishing in the pond. (#4586) Malkierian 2024-11-26 18:28:24 -0700
  • 164893a306 Resolve warnings and cleanup whitespace/formatting. Malkierian 2024-11-26 18:11:16 -0700
  • 51026cc3a8 Address previous cleanup comments. Surround `Message` tab in an advanced check. Malkierian 2024-11-26 16:33:18 -0700
  • 73fac6021b Convert defaultColor from ImVec4 to Color_RGBA8. Convert defaultColor's ints to floats when being applied to currentColor in the macro. Malkierian 2024-11-26 16:28:59 -0700
  • ec6e9002d3 Prevent void and teleport traps from being added to the shuffle pool while fishing in the pond. Malkierian 2024-11-26 16:04:16 -0700
  • 7ccb3ac7c3
    Cosmetics Changes (#4275) Pepe20129 2024-11-26 23:48:58 +0100
  • 2d61d05437 Better implement Image Button Style Pepper0ni 2024-11-26 20:54:02 +0000
  • d0f7d30c16
    Fix OnePoint cutscenes, make Skip Glitch cutscenes into Exclude Glitch Cutscenes (#4575) Pepper0ni 2024-11-26 19:43:20 +0000
  • a396b6e082 address comments Pepper0ni 2024-11-26 19:13:29 +0000
  • 4d5901a18f
    Merge branch 'develop' into cosmetics Malkierian 2024-11-26 11:13:50 -0700
  • b89f250fcf Apply MQ pot logic Pepper0ni 2024-11-26 14:58:03 +0000
  • 7a8d2a7c27 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into mouse lilacLunatic 2024-11-18 07:57:13 -0300
  • df074d0cf5 Setup AdvancePond to run in OnItemReceive. Malkierian 2024-11-25 22:50:27 -0700
  • 31120b7188
    Add master sword to ItemIDtoRandomizerGetMap to prevent assert crash in Return_Item after custom GIE was removed for MS. (#4584) Malkierian 2024-11-25 20:36:35 -0700
  • fb7d59b750 Add master sword to ItemIDtoRandomizerGetMap to prevent assert crash in Return_Item after custom GIE was removed for MS. Malkierian 2024-11-25 20:09:25 -0700
  • 6f4efa33ee Ornament Exchange Caladius 2024-11-25 20:29:35 -0500
  • 7662fa4c3c
    fix readme link formatting (#4576) briaguya 2024-11-25 13:21:45 -0500
  • 6df0f70162 Separate option values into context and menu indexes. Malkierian 2024-11-25 09:54:32 -0700
  • 92513c9747
    Update README.md briaguya 2024-11-25 03:20:08 -0500
  • 6042328133
    Merge pull request #4578 from garrettjoecox/let-it-snow Garrett Cox 2024-11-24 10:13:19 -0600
  • e6db2e5d37 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into let-it-snow Garrett Cox 2024-11-24 09:23:42 -0600
  • 7d3b9e8211
    Rocs Feather - LetItSnow Edition - No Save Edition - Limited Edition (#4577) aMannus 2024-11-24 15:18:01 +0100
  • adb3e6a46d Post merge fixes round 2 aMannus 2024-11-24 13:12:45 +0100
  • b5c6497c04 After merge fixes round 1 aMannus 2024-11-24 11:52:02 +0100
  • 369ef20865 Merge branch 'develop' into potsanity aMannus 2024-11-24 10:19:10 +0100
  • 14787e7a60
    Update README.md briaguya 2024-11-24 02:54:00 -0500
  • bac1ec05f4 Tooltip aMannus 2024-11-24 07:09:26 +0100
  • e3ce162e7e Rocs Feather Take 2 aMannus 2024-11-24 07:04:53 +0100