Commit Graph

  • 8fa223b368 Merge remote-tracking branch 'upstream/develop' into NTSC inspectredc 2024-07-18 23:17:56 +0100
  • 4df4e61eb3
    Fix return of Item_Give for stricter compilers (#4244) Pepper0ni 2024-07-18 22:42:48 +0100
  • fd15b120ea change to just item Pepper0ni 2024-07-18 18:33:36 +0100
  • d4199119ff fix return of Item_Give for stricter compilers Pepper0ni 2024-07-18 18:14:37 +0100
  • fcda0c7dae Merge branch 'DevRando' into BombchuLogic Pepper0ni 2024-07-18 16:05:39 +0100
  • 2b04b5822f Merge branch 'develop' of https://github.com/Caladius/Shipwright into develop Caladius 2024-07-18 09:26:10 -0400
  • 95e9d8234c Tooltips and renaming a variable to be more descriptive Caladius 2024-07-18 09:22:55 -0400
  • c8136cd4bf Ice Trap Fever Caladius 2024-07-17 21:31:07 -0400
  • 2dc62926a6 Timer Formatting moved to GameplayStats, checkbox also moved from menubar to GamePlayStats Options menu. Caladius 2024-07-17 18:42:02 -0400
  • 95ff59d5a5 Merge branch 'Documentation-Update' of https://github.com/Yomitht/Shipwright into Documentation-Update Yomitht 2024-07-17 15:42:25 -0600
  • 783c1835ad
    Fix ice trap models Christopher Leggett 2024-07-17 17:41:36 -0400
  • 9d9f0a7268
    Merge branch 'HarbourMasters:develop' into Documentation-Update Yomitht 2024-07-17 15:41:11 -0600
  • 6618619bb8 Added "Further Reading" section Yomitht 2024-07-17 15:40:31 -0600
  • 3d73faa9a0
    Port Graphics Menu lag fix from 2ship. (#4238) Malkierian 2024-07-17 12:57:11 -0700
  • 134aba4aa0
    Fixes crashes on asan related to audio. (#4049) Kenix3 2024-07-17 14:35:13 -0400
  • 9f0b0f21f4 tweak Adam Bird 2024-07-17 14:33:23 -0400
  • 26ffc4e703 LUS ref update. Malkierian 2024-07-17 10:21:50 -0700
  • 86f3cb51a8 Update settings.cpp Pepe20129 2024-07-17 19:19:54 +0200
  • 90e80500e6 Merge branch 'develop-rando' into infinite_upgrades_develop-rando Pepe20129 2024-07-17 19:00:03 +0200
  • 8b6c183776
    Rando: Skeleton key (#3997) Pepe20129 2024-07-17 18:55:05 +0200
  • 0b4c41b9f0 Merge branch 'develop-rando' into skeleton_key Pepe20129 2024-07-17 18:54:30 +0200
  • 7595a5a65e
    fix selection only and make MQ dungeon settings set themselves more smartley (#4232) Pepper0ni 2024-07-17 17:45:29 +0100
  • a5c0cede12
    Rando: Shuffle consumable bags (#3959) Pepe20129 2024-07-17 18:42:56 +0200
  • 3bea65c01c Update hook_handlers.cpp Pepe20129 2024-07-17 14:38:21 +0200
  • f2958aea1c
    Improved rando settings (#3980) Pepe20129 2024-07-17 05:25:28 +0200
  • 8eb6304999
    Rando: Keyring tristate (#3960) Pepe20129 2024-07-17 05:25:06 +0200
  • 8c7a0440f9 LUS bump and implement alt assets performance changes. Malkierian 2024-07-16 18:42:58 -0700
  • 5086145b1a Update variable for macOS/Linux Caladius 2024-07-16 20:22:02 -0400
  • 97150bf798 saveeditor test Caladius 2024-07-16 20:20:52 -0400
  • b28dcb6e6b for loop for Menu Bar cvars, added enemyNameList table to get actor names Caladius 2024-07-16 18:32:36 -0400
  • 96b363a368 Merge branch 'develop-rando' into improved_rando_settings Pepe20129 2024-07-16 23:44:49 +0200
  • 42a88dcb10 Merge branch 'develop-rando' into skeleton_key Pepe20129 2024-07-16 23:44:13 +0200
  • 7105e2380f Merge branch 'develop-rando' into shuffle_consumable_bags Pepe20129 2024-07-16 23:43:50 +0200
  • 5f8ef75673 Merge branch 'develop-rando' into infinite_upgrades_develop-rando Pepe20129 2024-07-16 23:42:54 +0200
  • ab112ac0e3 Update option_descriptions.cpp Pepe20129 2024-07-16 22:55:18 +0200
  • 2ff795e227
    Fix MQ Checks (#4234) Angelo Bulfone 2024-07-16 14:39:18 -0600
  • d973e3ccc6 Add GameSpeedMultiplier Pepe20129 2024-07-16 20:10:02 +0200
  • fd739ef31b Couple review changes. Malkierian 2024-07-16 09:14:30 -0700
  • e6c3f5dcef Port Graphics Menu lag fix from 2ship. Malkierian 2024-07-15 19:40:09 -0700
  • abc271d9bc
    Fix MQ Checks Angel Bulfone 2024-07-15 00:02:53 -0700
  • 73be4e5559
    Bump LUS for 2cyc color combiner fix (#4221) Archez 2024-07-15 22:24:38 -0400
  • 3463c6ecc7 Populate List if empty and if menu selection changes for Enemy Randomizer/Enemy List Caladius 2024-07-15 20:13:31 -0400
  • 5a556fa2eb GetSelectedEnemies Cvar Update Caladius 2024-07-15 19:37:45 -0400
  • 10e80664d3 ImGui Cvar Updates Caladius 2024-07-15 19:36:58 -0400
  • bf4abf9b2c Updated CVar Entry List Caladius 2024-07-15 19:23:59 -0400
  • 5e56877d6f
    Fix text issue with silver rupee text Christopher Leggett 2024-07-15 19:03:19 -0400
  • 41bfc00461 Allow for User Selected Enemies for Enemizer Caladius 2024-07-15 18:58:27 -0400
  • b8e3c01cd4 Bit more formatting. Malkierian 2024-07-15 09:54:02 -0700
  • 063ebf7443 Added Project Overview to README Yomitht 2024-07-15 10:48:13 -0600
  • 448f19d9a0
    Merge branch 'HarbourMasters:develop' into King-Zora-Slowness Yomitht 2024-07-15 10:19:20 -0600
  • a9c31bf662 Some formatting Malkierian 2024-07-14 22:52:46 -0700
  • 039f4fe627
    Fix post-merge-conflict-resolution build errors. Christopher Leggett 2024-07-14 21:55:31 -0400
  • e247739ed0
    Merge branch 'develop-rando' of https://github.com/HarbourMasters/Shipwright into rando-silver-rupee-shuffle Christopher Leggett 2024-07-14 20:36:27 -0400
  • d8737c31bb Merge branch 'actor-accessibility-experiments' of https://www.github.com/caturria/shipwright into actor-accessibility-experiments Ryanoberlein 2024-07-14 02:33:30 -0400
  • 59ba890085 improvements for audio glossary and compass. Ryanoberlein 2024-07-14 02:32:33 -0400
  • 1dd3ead8b3 Fix merge conflicts with develop. Caturria 2024-07-14 02:17:11 -0400
  • bb0085f288 item_list *actually* divorced from logicVar pointers. Several missed options for ApplyItemEffect, HasItem, and UpdateHelpers added in. Changed HasItem to a switch block for more performance. Seeds generate within 10-20 seconds in release mode. Further optimization is assumed possible. Malkierian 2024-07-13 17:22:16 -0700
  • 6a7b67a48d revert hint gen bypass Malkierian 2024-07-09 15:34:32 -0700
  • d4dfa19982 Added a bit of logging. Add Double Defense to item effects. Malkierian 2024-07-09 11:57:31 -0700
  • 4aa1b5d17e Resolve major logic issue with SetInventory flow in ApplyItemEffect. Other small logic issues in ApplyItemEffect. Malkierian 2024-07-09 10:24:35 -0700
  • 68ed369378 more diagnostics Malkierian 2024-07-03 19:54:33 -0700
  • 379045e5b6 start of some diagnostics. caught some reverse logic with ApplyItemEffect. Malkierian 2024-07-03 15:16:25 -0700
  • df741f852d Removed individual Context retrievals in favor of single local variable in Logic to reference. Malkierian 2024-06-30 23:01:02 -0700
  • f02ca59b61 Most other item variables ported to SaveContext in UpdateHelpers. Malkierian 2024-06-28 15:43:35 -0700
  • ae776353a1 Port initial framework up to latest dev-rando. Includes about 15 items using the SCL structure for tracking. Malkierian 2024-06-27 19:45:16 -0700
  • 9f0875a72d fix selection only and make MQ dungeon settings set themselves more smartley Pepper0ni 2024-07-13 22:27:23 +0100
  • ba82bfbba6
    Fix spawn shuffle when starting age is adult/random. (#4230) Christopher Leggett 2024-07-13 16:51:54 -0400
  • 3eeaea31bd Remove unused SpoilerCollectionCheckTypes Pepe20129 2024-07-13 22:27:52 +0200
  • 7e2a2e5c0c Remove LocationType Pepe20129 2024-07-13 22:04:47 +0200
  • a9217b1bd1 Remove unused Location constructors Pepe20129 2024-07-13 22:00:32 +0200
  • ff033d5902 Remove SpoilerCollectionCheckGroup Pepe20129 2024-07-13 21:52:45 +0200
  • 5b2f40f52a Remove categories Pepe20129 2024-07-13 18:53:35 +0200
  • 38e8a0650d
    Fix an issue with randomized starting age. Christopher Leggett 2024-07-12 20:14:05 -0400
  • af21f1eeb2
    Fix grotto spawn cutscene skips. Christopher Leggett 2024-07-12 19:51:28 -0400
  • c9bd2cb263 Address review Pepe20129 2024-07-12 13:33:26 +0200
  • 2e4fad8e8e Merge branch 'develop-rando' into skeleton_key Pepe20129 2024-07-12 11:21:56 +0200
  • 0346531239 Update settings.cpp Pepe20129 2024-07-12 10:12:58 +0200
  • c46826155c Restrict loach hint to "Shuffle only Hyrule Loach" Pepe20129 2024-07-11 18:55:03 +0200
  • 386cc428b0 Merge branch 'develop-rando' into shuffle_hyrule_loach_develop-rando Pepe20129 2024-07-11 18:44:40 +0200
  • 70ab778524
    Handle correct entrance for adult start + spawn shuffle and add comments. Christopher Leggett 2024-07-11 12:26:53 -0400
  • 027ebb19a0 RSK_MQ_DUNGEON_COUNT changed to MAX_MQ_DUNGEON_COUNT = 2024-07-11 21:46:53 +0530
  • 75e60a9c6f
    Handle adult start without spawn shuffle Christopher Leggett 2024-07-11 11:59:59 -0400
  • 41f2498f12
    Fix spawn shuffle when starting age is adult. Christopher Leggett 2024-07-11 11:52:01 -0400
  • a0fda39a75
    Force Warp Song Hints off when Warp Songs are not shuffled (#4229) Pepper0ni 2024-07-11 15:38:52 +0100
  • a357b78c40 Force Warp Song Hints off when Warp Songs are not shuffled Pepper0ni 2024-07-11 14:17:28 +0100
  • 3a880ee632
    Fixes for the German translation in item_list.cpp Extloga 2024-07-10 19:53:45 +0200
  • f7e55d3c90
    Fixes for the German translation in randomizer.cpp Extloga 2024-07-10 19:49:11 +0200
  • c02a4d5e34
    Fixes for the German translation in item_list.cpp Extloga 2024-07-10 18:57:07 +0200
  • fff61aeaa2
    Fixes for the German translation in hint_list_item.cpp Extloga 2024-07-10 18:49:42 +0200
  • 1f2fc10e08
    Fixes for the German translation in item_list.cpp Extloga 2024-07-10 18:44:20 +0200
  • 52d422bc0d
    Fixes for the German translation in item_list.cpp Extloga 2024-07-10 17:27:44 +0200
  • 67eb9d0d2d
    Fixes for the German translation in hint_list_item.cpp Extloga 2024-07-10 17:24:47 +0200
  • 4b476932bd
    Fixes for the German translation in hint_list_item.cpp Extloga 2024-07-10 17:13:14 +0200
  • eaaa2d1815
    Fixes for the German translation in hint_list_item.cpp Extloga 2024-07-10 16:57:13 +0200
  • d47e506279
    Fixes for the German translation in item_list.cpp Extloga 2024-07-10 16:46:34 +0200
  • 6fe2627236
    Fixes for the German translation in item_list.cpp Extloga 2024-07-10 16:42:24 +0200
  • 77770ba3b2
    fix hint crash on windows (#4227) Pepper0ni 2024-07-09 23:57:28 +0100
  • 4f5c187285 fix hint crash on windows Pepper0ni 2024-07-09 23:21:06 +0100
  • 95af932ca7 Fix hint spacing Pepe20129 2024-07-09 21:51:25 +0200
  • 64f8f29663 Fix static data Pepe20129 2024-07-09 21:08:48 +0200