Patrick12115
4f6375b458
Fix function call
2024-11-11 16:30:18 -05:00
Patrick12115
f15ebe1e1f
Merge branch 'NoMS' of https://github.com/Patrick12115/Shipwright into NoMS
2024-11-11 15:44:35 -05:00
Malkierian
0f49676a26
Merge branch 'develop' into NoMS
2024-11-10 23:46:24 -07:00
Archez
f12a2bbbb7
Port over decomp updates for vis* and reimplement vismono fb ( #4533 )
...
* Port over decomp updates for vis*
* move vismono framebuffer handling to file
2024-11-09 12:51:31 -05:00
Pepper0ni
2603b97366
Rewrite MQ spirit logic ( #4534 )
...
* rewrite MQ spirit logic
* fix oversights
2024-11-09 09:40:00 -07:00
Pepe20129
c8815a26f7
Improve ganon tower logic ( #4526 )
...
* Improve ganon tower logic
* Fix build and address review
* Update locacc_ganons_castle.cpp
* Update locacc_ganons_castle.cpp
* Update locacc_ganons_castle.cpp
* Update logic.cpp
* Update randomizerTypes.h
---------
Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Malkierian <malkierian@live.com>
2024-11-09 09:34:05 -07:00
Jordan Longstaff
068cceff36
Update SFX symbols from decomp ( #4531 )
2024-11-08 20:36:57 -07:00
Archez
4eeb01905d
pull in decomp updates for z_play ( #4522 )
2024-11-07 09:52:21 -07:00
Pepper0ni
1d9d273a57
Rewrite MQ Water Temple Logic ( #4520 )
...
* Rewrite Storage Temple Logic
* fix a boss room oversight
* Fix some random errors
* cleanups
2024-11-07 09:51:29 -07:00
Garrett Cox
d07cbe8395
Adjustments to change age cheat and time travel enhancement ( #4512 )
2024-11-06 19:38:57 -07:00
Jordan Longstaff
a919b6a5a0
Fix skipping Adult Ruto one-point cutscene ( #4519 )
...
* Fix skipping Adult Ruto one-point cutscene
* Kill Ruto's actor instead of leaving her to swim up
* Change to Story cutscene
* Change to extern function
2024-11-06 19:38:44 -07:00
Archez
dabd0c25bd
Move collision viewer draw to hook and fix empty nametags ( #4523 )
2024-11-05 21:50:59 -05:00
Malkierian
894d3c00d3
Change ENTR_BOMBCHU_SHOP_0 to ENTR_BOMBCHU_SHOP_1 in entrance.cpp to fix interior shuffle crash. ( #4521 )
2024-11-04 20:16:27 -07:00
Archez
d8f8b6e6b9
Fix Bluewarp handling with entrance rando ( #4517 )
...
* force bluewarp skips on when entrance rando is enabled
* Fix second visits and other issues with lingering bluewarp state
2024-11-04 20:07:21 -07:00
Patrick12115
6d16b34655
Merge branch 'develop' into NoMS
2024-11-03 20:41:12 -05:00
Garrett Cox
20ac33d380
Fix #4506 , Mido crash in intro cutscene with Open Forest ( #4511 )
2024-11-02 10:50:48 -07:00
Pepper0ni
0d17e72dca
Rewrite MQ Shadow Temple logic ( #4502 )
2024-11-01 08:15:27 -07:00
Archez
ec1f03e8a2
Pass for some warning fixes ( #4501 )
2024-10-31 07:42:27 -07:00
Archez
98fa5663b4
Hookify more Entrance Rando handling ( #4500 )
...
* Hookify more entrance rando handling
* fix bad enums
2024-10-31 00:27:20 -04:00
Malkierian
6e024ed15d
Entrance Enum and Name Refactor ( #4484 )
...
* Rename entrance enums for clearer location by name.
Change entrance name strings to be clearer for single-entrance tracking.
* Rename grotto macros to remove "RANDO", and move them to `randomizerTypes.h` for use elsewhere.
* Add entrance enums to rando's entrance.cpp.
Rename a couple RandomizerRegions for consistency.
* Swap entrance ids to enum values in rando's entrance.cpp.
Few more renames for clarity and consistency.
* Adapt entrance tracker to utilize new names and only display original source and substituted destination.
Few more renames for consistency.
* Missed a space in the tracker output.
* Restore pre-digit names of some enums, name great fairies more consistently.
2024-10-30 19:44:34 -07:00
Jordan Longstaff
705bbea144
"Skip forced dialog" no longer skips optional Navi hints ( #4450 )
2024-10-30 19:14:22 -07:00
Archez
c232e13fff
Fix getItemEntry macros ( #4499 )
2024-10-30 16:15:39 -07:00
Pepper0ni
71e9e616b6
Rewrite MQ Jabu Logic ( #4493 )
...
* rewrite MQ Jabu Logic
* Add swim requirement to the rang jump trick as link hints the water first
2024-10-29 14:05:09 -07:00
Pepe20129
6bd3b1d160
Move & refactor Randomizer_Item_Give ( #4492 )
2024-10-29 09:24:56 -07:00
Pepper0ni
b706532754
Attempt to find area problems ( #4494 )
...
* Better insulate the code against no areas and fix misc issues
* remove a stray reminder comment
2024-10-28 17:35:36 -07:00
Malkierian
108d5061d4
Small Warnings Refactor ( #4477 )
...
* Disable all warnings, even in release, on the `src` directory.
Resolve math macro duplication warnings.
* Suppress LUS warnings.
* Modify it to utilize a variable that defaults on but can be specified in command line to disable it.
Prevet total compile option overwrite for LUS.
* Remove unnecessary unset and cache parameters.
* Document warnings flag in BUILDING.md
2024-10-28 17:30:11 -07:00
Patrick12115
619c579005
Much Less OnGameUpdating
2024-10-28 18:12:09 -04:00
Patrick12115
9b8835117c
Merge branch 'develop' into NoMS
2024-10-28 12:56:58 -04:00
Malkierian
fd8e98ed12
Fix rando presets ( #4491 )
...
* Fix application of preset values to sliders.
* Add new rando CVars to preset list, and alphabetize.
2024-10-28 08:25:26 -07:00
Garrett Cox
2c08fca46c
Add faster rupee accumulator ( #4490 )
2024-10-28 08:25:15 -07:00
Malkierian
1df91890fe
Windows Build Assets Tweak ( #4486 )
...
* Change CMake process to copy assets necessary for OTR creation to VS run directory.
Remove reference to ExtractAssets target from Windows build instructions.
* Unify build instructions where appropriate across PC platforms.
Clarify commented parts of some commands.
* PR feedback.
2024-10-28 00:02:04 -07:00
Pepper0ni
d6ebed59dc
Fix oversight in Static Hints, add some asserts ( #4488 )
2024-10-27 22:24:14 -07:00
Malkierian
e5f4c091f8
Add condition to disabling Generate Randomizer button if file is loaded to prevent rando context confusion. ( #4487 )
2024-10-27 14:40:30 -07:00
Pepper0ni
438a8bff79
Rewrite MQ GTG and Ice Cavern logic ( #4483 )
...
* rewrite GTG logic
* Rewrite MQ Ice Cavern Logic
2024-10-27 14:16:51 -07:00
Malkierian
169e39ebad
Adds item names to filtered parameters. ( #4485 )
2024-10-27 09:02:51 -07:00
Garrett Cox
804584e79d
Fix rainbow bridge sound spam
2024-10-26 00:12:27 -05:00
Garrett Cox
20ddc7a536
Redo frog VB
2024-10-25 22:40:35 -05:00
Pepper0ni
7f4bd3e98c
Fix any dungeon location pool and fire boss door logic ( #4480 )
...
* fix any dungeon location pool and fire boss door logic
* Make GetDungeonLocations consistent
* add All to name
2024-10-25 17:51:50 -07:00
Pepper0ni
6ca55aadbd
Rewrite MQ Ganon's castle logic ( #4469 )
...
* rewrite ganon MQ logic
* typo fix
* remove excess brackets to avoid compiler errors
2024-10-25 17:51:07 -07:00
Pepe20129
a91243ec01
Fix msvc internal compiler errors on mq logic ( #4478 )
2024-10-25 20:19:01 +09:00
Malkierian
89fe9c1ccb
Fix Phantom Ganon fast death time saver crash. ( #4476 )
2024-10-24 21:55:17 -07:00
Pepper0ni
8638810b9d
Fix bean buy and warp song text crashes ( #4470 )
2024-10-23 17:34:44 -07:00
Malkierian
2ffd62a5b1
Fix scrubs behaving as if shuffled despite not being. ( #4468 )
...
Convert shop tracking to checking for shuffled.
Change "Hide right-side shop item checks" to "Hide unshuffled shop item checks" on the check tracker.
2024-10-23 08:35:25 -07:00
Caladius
75a0979bc7
Built-in Time Splits [v2.1] ( #4455 )
...
* Adds 2 new Hooks, OnTimeStamp and OnPlayerHealthChange.
* Re-add Timesplit code
* Committing custom Assets
* Commit Asset definitions
* Adding Windows
* Fix Modal Window and others
* Time Splits v2 new Hooks etc.
* Fixing Time Displays
* Adding Big Poe split
* Update Options Tab
* List Preview and Removing Split Entries
* Allow Split Table to resize
* Fix Window Color and Adding Non Items to Split List
* Correct Song Image Skew
2024-10-22 10:17:30 -07:00
Malkierian
8c304d54b2
Fix wallet display for More Info with non-rando saves. ( #4467 )
2024-10-22 10:10:50 -07:00
Malkierian
dee885622e
Add InjectItemCounts to the migrator. ( #4466 )
2024-10-22 09:46:50 -07:00
Pepper0ni
a005075bd2
Fix Settings Loading Issues ( #4465 )
2024-10-22 08:50:05 -07:00
Pepper0ni
dd9253808b
Rewrite forest MQ logic, add swim to lake logic ( #4464 )
...
* rewrite forest logic, add swim to lake logic
* fix small oops
* oops
2024-10-21 19:18:50 -07:00
Jordan Longstaff
3a4bd1164a
Add freeze timer hook for Gold Skulltula collection ( #4445 )
...
* Add freeze timer hook for Gold Skulltula collection
* Remove unused player references
* Replace magic number text IDs
* Separate hook for freezing player on token collection
* Revert one unintended change
2024-10-21 19:18:34 -07:00
Malkierian
17d8487730
Modify all (4) instances of Flags_GetRandomizerInf() returns that were u8 to s32 to avoid value overflow. ( #4463 )
2024-10-21 14:55:46 -07:00
