Commit Graph

  • c9807ea646
    Merge f00c142fc9 into 1744f1fc18 Philip Dubé 2025-01-30 11:00:03 +0100
  • 4474527b98
    Merge 61051adb24 into 1744f1fc18 Jordan Longstaff 2025-01-30 10:59:42 +0100
  • d682a45966
    Merge 9e57d1c808 into 1744f1fc18 aMannus 2025-01-30 09:58:24 +0000
  • 9e57d1c808 Remove key logic from interiors aMannus 2025-01-30 10:58:19 +0100
  • 30157f8eba
    Merge bc217bac47 into 1744f1fc18 Yomitht 2025-01-30 10:45:01 +0100
  • bceb68df85
    Merge 167601685c into 1744f1fc18 Philip Dubé 2025-01-30 10:37:33 +0100
  • 1744f1fc18
    Set Item Tracker Total Checks window to only scale text if Item Tracker window type is Floating. (#4963) develop Malkierian 2025-01-30 02:37:17 -0700
  • e5e32e03b0
    Merge 62495f4ebe into 7df9641297 Jérémy Lugand 2025-01-29 23:35:14 -0600
  • 61051adb24 Update INFTABLE_193 reference JordanLongstaff 2025-01-29 23:46:48 -0500
  • 019f1516b0 Merge branch 'develop' into fix-nut-upgrade-retro JordanLongstaff 2025-01-29 22:59:25 -0500
  • 32754c4670
    Merge 12e7ea2f9f into 7df9641297 Philip Dubé 2025-01-30 01:16:38 +0000
  • 12e7ea2f9f replace MT RNG with PCG Demur Rumed 2025-01-29 23:57:03 +0000
  • 115333a02c
    Merge e3470a6a0d into 7df9641297 Malkierian 2025-01-29 21:38:52 +0100
  • bd9156d8cf
    Merge 4f6375b458 into 7df9641297 Patrick12115 2025-01-29 18:49:39 +0100
  • abe9e1b205
    Merge 6e43514b22 into 7df9641297 lilacLunatic 2025-01-29 18:49:36 +0100
  • f00c142fc9 neither pocket nor gift should be listed in dungeonRewardLocations Demur Rumed 2025-01-25 15:04:00 +0000
  • d788eed2be missing apostrophe in preset description Demur Rumed 2025-01-25 14:35:49 +0000
  • 722862ba9a gift from rauru is dungeon location, not pocket Demur Rumed 2025-01-25 14:28:23 +0000
  • ad0912c323 rando: vanilla dungeon rewards Demur Rumed 2025-01-09 19:04:24 +0000
  • 9e4ac5e973
    Merge e0d4a2ecd8 into 7df9641297 Pepe20129 2025-01-29 16:47:18 +0100
  • e0d4a2ecd8 Fix vanilla Pepe20129 2025-01-29 16:45:52 +0100
  • c797edeabb
    Merge 468929e9bd into 7df9641297 Garrett Cox 2025-01-29 15:38:18 +0000
  • 468929e9bd Anchor Beta Garrett Cox 2024-10-20 01:31:29 -0500
  • 48f1629988 Merge branch 'develop' into trade_cleanup Pepe20129 2025-01-29 16:19:43 +0100
  • 24dcd403bb
    Merge f7a8e818d9 into 7df9641297 Philip Dubé 2025-01-30 01:14:36 +1000
  • 0af850eaed
    Merge 10e4b70bc9 into 7df9641297 Varuuna 2025-01-29 16:12:47 +0100
  • fb03c26a13
    Merge 8a46f8e491 into 7df9641297 Xeokn 2025-01-29 08:12:47 -0700
  • 7df9641297
    Exclude locations fix (#4969) Christopher Leggett 2025-01-29 10:12:42 -0500
  • 8a46f8e491 Merge branch 'develop' of https://github.com/Xeokn/Shipwright into develop Xeokn 2025-01-30 00:45:13 +1000
  • f0b596fabd Additional Sail Commands. Xeokn 2025-01-30 00:44:39 +1000
  • 8c1a6bdd26 Move child trade to flags Pepe20129 2025-01-29 15:17:08 +0100
  • 2eb381b2a3
    Remove GetOption overloads, weren't working anyway Christopher Leggett 2025-01-29 09:03:50 -0500
  • cafef39d08
    Properly check for Excluded Location option. Christopher Leggett 2025-01-29 09:02:57 -0500
  • e3477cca96
    Merge ef79455b73 into 1f65bde583 Philip Dubé 2025-01-29 12:43:34 +0000
  • ef79455b73 3 Demur Rumed 2025-01-29 12:43:09 +0000
  • 8dc00155b7 confirmed hammer works vs dodongos Demur Rumed 2025-01-29 05:24:14 +0000
  • b2dad500c2 kokiri does not damage spikes Demur Rumed 2025-01-13 20:31:42 +0000
  • da7636db49 use CanKillEnemy more Demur Rumed 2025-01-12 18:30:54 +0000
  • 1b808365f2
    Merge 38f64e72b6 into 1f65bde583 Philip Dubé 2025-01-29 04:32:49 +0000
  • 167601685c GI text. RHT. Also always require Rauru's Soul Demur Rumed 2025-01-29 03:17:28 +0000
  • 887e3d6ca8 reordering Demur Rumed 2025-01-29 03:02:29 +0000
  • 8294bc5839 fix up logic, split out sage/zelda block as a separate option Demur Rumed 2025-01-29 02:54:59 +0000
  • 16c776a98e zelda's soul Demur Rumed 2025-01-28 14:50:02 +0000
  • f62b0333be prevent GF soft lock Demur Rumed 2025-01-28 13:42:56 +0000
  • 5e0aea6002 gerudo, carpenters Demur Rumed 2025-01-27 16:26:23 +0000
  • 6082de6bf3 4 gorons Demur Rumed 2025-01-27 02:34:57 +0000
  • 92259db876 gifts requiring soul involves poking time saver code Demur Rumed 2025-01-26 20:33:57 +0000
  • 728fa9f285 Logic Demur Rumed 2025-01-26 15:03:19 +0000
  • 53199d03af lint Demur Rumed 2025-01-26 14:12:18 +0000
  • b71b88c57b don't spoil shops without soul Demur Rumed 2025-01-26 14:06:21 +0000
  • 8c24e33900 treasure man Demur Rumed 2025-01-26 13:46:28 +0000
  • 87993c7e0b split up shopkeeper souls Demur Rumed 2025-01-26 13:00:20 +0000
  • eca1470b51 grog as child has different id, fill out debugSaveEditor.h Demur Rumed 2025-01-25 16:16:00 +0000
  • d135106721 sages Demur Rumed 2025-01-25 04:42:04 +0000
  • aa4bab07ee most souls Demur Rumed 2025-01-13 05:10:38 +0000
  • 5983af70d3
    Merge f87f988920 into 1f65bde583 Patrick12115 2025-01-28 20:45:23 -0500
  • 1f65bde583
    Move most ImGui-related files/code to an SohGui subfolder. (#4968) Malkierian 2025-01-28 18:45:21 -0700
  • f87f988920 Prevent Alt Toggle Crash Patrick12115 2025-01-28 20:38:52 -0500
  • 8bef1ba84c Move most ImGui-related files/code to an SohGui subfolder. Malkierian 2025-01-28 17:35:28 -0700
  • f3410ae3ec Merge branch 'develop' into Custom-DLists Patrick12115 2025-01-28 18:13:04 -0500
  • 24699f8ce3 Move adult trade to flags Pepe20129 2025-01-28 22:14:24 +0100
  • 10e4b70bc9 * Changed to ShipInit (might be missing something?) * Corrected Should in z_en_kusa.c to use original draw func when setting is Off Fredrik Andréasson 2025-01-28 20:10:01 +0100
  • e3470a6a0d Fix ResourceManagerHelpers initialization order. Rename LoadDelayedPersistentAltAssets to LoadDelayedPersistentAssets. Remove audio path from LoadDelayedPersistentAssets, as that's already handled in OTRAudio_Init. Exclude textures/buttons from LoadDelayedPersistentAssets (PNGs, don't have a factory). Malkierian 2025-01-28 12:07:33 -0700
  • f66bc8ef53
    Merge 4af61db648 into 668e266ecc Pepe20129 2025-01-28 15:29:04 +0100
  • cdc721d06f
    Merge 89442eddb9 into 668e266ecc Frank Jilek 2025-01-28 13:26:04 +0100
  • 71652d29da
    Merge fccff5ce5e into 668e266ecc Pepe20129 2025-01-28 11:37:42 +0900
  • fbf1b49c3e Merge remote-tracking branch 'hm64/develop' into grassanity Fredrik Andréasson 2025-01-28 03:16:21 +0100
  • 22e1e6c8d4 Merge branch 'develop' of github.com:Malkierian/Shipwright into alt-asset-bulk-preload Malkierian 2025-01-27 19:01:52 -0700
  • 668e266ecc
    clamp addAlpha when skipping spinning logos to prevent softlock (#4964) briaguya 2025-01-27 17:59:46 -0800
  • 20ed9deea9 merge and update options from develop Fredrik Andréasson 2025-01-28 02:59:39 +0100
  • 28b6ba9f08 max is cleaner briaguya 2025-01-27 20:33:40 -0500
  • 8416eb3853
    Fix and bump LUS louist103 2025-01-27 20:31:05 -0500
  • ad0f64bd3e msvc? briaguya 2025-01-27 20:24:05 -0500
  • f7a8e818d9 Prefer EVENTCHKINF constants to hex Demur Rumed 2025-01-28 00:37:54 +0000
  • 39603109d9 msvc plz briaguya 2025-01-27 20:16:31 -0500
  • 8c1eafd680 use clamp briaguya 2025-01-27 20:08:08 -0500
  • 71990222cb maybe this is the fix, not sure if there's a better option i'm overlooking briaguya 2025-01-27 19:39:28 -0500
  • 21e6794753 Merge branch 'develop' of github.com:Malkierian/Shipwright into alt-asset-bulk-preload Malkierian 2025-01-27 17:35:57 -0700
  • 0f8bdba489 debug print logos seen briaguya 2025-01-27 19:15:24 -0500
  • 38f64e72b6 can bypass enemies for central pillar basement Demur Rumed 2025-01-25 02:56:23 +0000
  • b275acfb25 missed some bk checks Demur Rumed 2025-01-21 03:15:55 +0000
  • 699fc7e926 overworld keys Demur Rumed 2025-01-21 00:49:25 +0000
  • 591fa1386b fix rolling goron Demur Rumed 2025-01-12 20:00:02 +0000
  • 8d66cd2ff3 NNL take 2 Demur Rumed 2025-01-12 04:49:58 +0000
  • 50ecf20b98 Set Item Tracker Total Checks window to only scale text if Item Tracker window type is Floating. Increase default width to account for window type title text. Malkierian 2025-01-27 14:15:08 -0700
  • 41cf6b3338
    LUS bump (#4960) Malkierian 2025-01-27 14:13:14 -0700
  • af5a3ecee9
    Merge 1e50f2e0cf into 744fab4b05 louist103 2025-01-27 15:49:26 -0500
  • 94497d9164 Merge branch 'develop' of github.com:Malkierian/Shipwright into lus-bump-listfiles Malkierian 2025-01-27 13:48:49 -0700
  • fccff5ce5e Merge branch 'develop' into mod_menu_2 Pepe20129 2025-01-27 21:44:33 +0100
  • ea4340cab5 Small cleanup Pepe20129 2025-01-27 21:33:41 +0100
  • 744fab4b05
    fix build (#4961) briaguya 2025-01-27 12:21:40 -0800
  • 6277194c48 Remove old mod loading code Pepe20129 2025-01-27 20:45:55 +0100
  • 00d1954636 Merge branch 'develop' into mod_menu_2 Pepe20129 2025-01-27 20:40:45 +0100
  • 8fc49c595d fix build briaguya 2025-01-27 14:33:53 -0500
  • 9e315adb38 LUS bump Malkierian 2025-01-27 12:06:53 -0700
  • 23683d11ad Add vanilla bulk asset preload. Malkierian 2025-01-27 11:36:25 -0700
  • 31cd419d6f
    Update kakariko.cpp (#4959) Pepe20129 2025-01-27 19:31:50 +0100
  • b5e6342bc1
    Rip Settings out of Rando::Context (#4943) Christopher Leggett 2025-01-27 13:30:04 -0500
  • f21bcf862e Update kakariko.cpp Pepe20129 2025-01-27 18:55:47 +0100
  • 6f96b3e429 manual bump back to latest LUS Malkierian 2025-01-03 00:09:01 -0700