Commit Graph

2133 Commits

Author SHA1 Message Date
briaguya
345cef9b78
detangle zapdutils (#4096) 2024-05-01 22:47:40 -04:00
Malkierian
715bf39d43
Incorporate LUS CMake CVar system (#4093)
* Incorporate LUS CMake CVar system.
Customize all LUS CMake CVars to align with plans for preset system.
Swap "gOverlayFont" usage back to LUS CVar macro.

* Change CMake sets to use the cache to allow for including LUS's file for the add_compile_defines and remove the duplication on SoH's side.

* Move SoH CMake CVars to `soh-cvars.cmake` for clarity.
2024-05-01 14:48:51 -04:00
briaguya
56fe449689
fetchcontent stormlib (#4095) 2024-05-01 12:53:33 -04:00
briaguya
8480f37f77
fetch imgui (#4094) 2024-04-30 22:49:54 -04:00
briaguya
c70e6d280a
spdlog from package managers (#4088) 2024-04-30 18:50:06 -04:00
briaguya
4ecb76b117
tinyxml from package manager (#4073) 2024-04-30 01:19:02 -04:00
briaguya
8b3f1f1868
bump LUS, remove switch and wii u from CI (#4087) 2024-04-29 20:26:03 -04:00
briaguya
552bb2886f
support lus renamespacing (#4075) 2024-04-28 21:36:44 -04:00
Pepe20129
92467b87b5
Add scene command XML parsers (#4054)
* Add scene command parsers

* Move logging & add logging cvar

* Use new CVAR_DEVELOPER_TOOLS macro

* Update soh/soh/resource/logging/SceneCommandLoggers.h

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-04-28 20:58:12 -04:00
Malkierian
303fe7d906
Swap all cosmetics CVars to macros. (#4065)
Lots of renames.

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-04-26 02:41:55 +00:00
Malkierian
56d8dd6d8b
All MenuBar enhancement CVars done. (#4064) 2024-04-26 00:31:28 +00:00
briaguya
a4fb67745a
nlohmann from package managers (#4071) 2024-04-25 13:55:16 -04:00
briaguya
3070fb4746
support lus gameoverlay changes (and bump LUS) (#4067) 2024-04-22 22:57:33 -04:00
briaguya
49f891f2e5
move RawJson to LUS (#4063) 2024-04-21 21:16:59 -04:00
Malkierian
33aef87907
CVar Macro Cleanup (#4062)
* Standardized CVar macros to have `CVAR_` at the front instead of the end.
Removed excluded and replaced sequence macros.

* Missed a few developer CVars outside of `SohMenuBar.cpp`

* 1 more.
2024-04-21 10:25:06 -05:00
Malkierian
e2622af004
Step 3 of CVar macro/sectionalizing: Dev Tools, Cheats, Audio Editor, Remote (#4030)
* Swapped Audio Editor CVars.

* Swapped Cheat CVars.

* Swapped Developer Tools CVars. Also a couple General CVars.

* Added REMOTE_CVAR.
Swapped Remote CVars.

* Missed an include.
2024-04-20 18:56:32 +00:00
Malkierian
694a876a70
Step 2 of CVar macro/sectionalizing: Trackers/Windows (#3238)
* Add all macros.

Replace all randomizer seed setting CVars with appropriate macro.

Cleaned up non-gameplay-critical things that are part of Spock Race rando presets (like RTA timing, displaying timer, displaying the glitch lineup tick, or Fast File Select).

* Wrong slash...

* Fix DEVELOPER_CVAR macro.
Add GENERAL_CVAR macro.

* Change Item Tracker CVars, including open window CVar.

* Swapped open window CVars.

* Swapped Entrance Tracker CVars.

* Swapped Check Tracker CVars.
Changed Item Tracker "HudEditMode" to "Draggable".

* Renamed `RANDOMIZER_CVAR` to `RANDO_ENHANCEMENT_CVAR`.
Swapped rando enhancement CVars.

* Mirroring last commit from part 1 in randomizer.cpp

* Another mirror from pt 1
2024-04-20 18:34:02 +00:00
Ted Newman
16bf03a9bd
Add console commands for randomizing sfx and cosmetic groups (#3962)
* Add console commands for randomizing sfx and cosmetic groups

* Update naming and use constexpr

* Update soh/soh/Enhancements/debugconsole.cpp

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-04-20 12:33:59 -04:00
briaguya
2accfc3c9b
ci: bump macports version (#4039) 2024-04-20 11:31:05 -04:00
Archez
e6798d9861
bump lus and create fb call (#4060) 2024-04-20 11:04:11 -04:00
Archez
067782fa91
clean up cmake configure files (#4002) 2024-04-20 11:03:41 -04:00
inspectredc
d08d5a54c9
Fix Pause Warp Enhancement (#4036) 2024-04-20 11:01:16 -04:00
Malkierian
b045689df1
Step 1 of CVar macro/sectionalizing: Randomizer Settings (#3206)
* Add all macros.

Replace all randomizer seed setting CVars with appropriate macro.

Cleaned up non-gameplay-critical things that are part of Spock Race rando presets (like RTA timing, displaying timer, displaying the glitch lineup tick, or Fast File Select).

* Wrong slash...

* Forgot "gManualSeedEntry".

* Renamed CVars from "Mq..." to "MQ...".
2024-04-20 09:29:19 -05:00
Jamie Klassen
2aa2092c27
filter randomizer checks in tracker (#4021)
* filter randomizer checks in tracker

Co-authored-by: Michael Stergianis <michael.stergianis@gmail.com>

* Adds an option to hide empty areas

Co-authored-by: Jamie Klassen <jamie@tenkeylabs.com>
Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>

* Removes extra whitespace

Co-authored-by: Jamie Klassen <jamie@tenkeylabs.com>
Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>

* Changes gCheckTrackerHideFilteredAreas to default to true

Refactors the for loop in shouldHideArea

Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>

* Addresses PR feedback

* https://github.com/HarbourMasters/Shipwright/pull/4021#discussion_r1538377614
* https://github.com/HarbourMasters/Shipwright/pull/4021#discussion_r1538381310

Co-authored-by: Jamie Klassen <jamie@tenkeylabs.com>
Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>

* Updates config variable to gTrackers.CheckTracker.HideFilteredAreas

Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>

* Adds check visibility guard to shouldHideArea

Refactors rcObject to check in passesTextFilter

Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>

---------

Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>
Co-authored-by: Michael Stergianis <michael.stergianis@gmail.com>
2024-04-20 10:27:13 -04:00
briaguya
3e32d05173
macready -> dev 2024-04-19 11:27:05 -04:00
briaguya
2216b68111 fix: add include missed in merge conflict resolution 2024-04-19 11:06:52 -04:00
briaguya
9696f74b5c Merge branch 'develop-macready' into macready-to-dev 2024-04-19 09:57:29 -04:00
briaguya
32bf8cc53c
fix wii u ci (#4056) 2024-04-19 09:42:41 -04:00
Malkierian
02f7310c16
Add keyring to check for placing Gerudo Fortess Keys in Any Dungeon or Overworld. (#4055) 2024-04-19 09:42:26 -04:00
inspectredc
bfe13906e9
Make equip swap work on pause any cursor (#4052) 2024-04-19 09:42:12 -04:00
Amaro Martínez
32288be744
Save in-game language setting (#4026) 2024-04-19 09:41:55 -04:00
Malkierian
19be6e9b99
Trackers MQ Cleanup (#4009)
* Clean up grayed out items in file select.
Tie personal notes saving to `OnExitGame()` to account for save scum resets.
Hide text input box (but not window) for personal notes when a save isn't loaded to prevent saving over a save's notes while in file select.

* Allow check tracker window to be visible and show the "Waiting for file load..." text in file select (ease of positioning).

* Fix key label text placement.

* Persist `areasSpoiled`, change trigger to `OnSceneTransition`.
Add `IsAreaSpoiled` for tie-in to Item Tracker.
Add `SetAreaSpoiled` to unify bitmagic.

* Add proper spoiling evaluation based on specific entrance IDs, or first check collection.
Add light yellow color for vanilla dungeon abbreviations to match the purple for MQ.

* Initialize `areasSpoiled` to 0, so 0 gets saved on file create.

* All new conditional statements around `GameInteractor::IsSaveLoaded()` were inverted. Fixed that.

* Change some c-style casts to `static_cast`.

* Few more cleanups, plus clarifying comment.
2024-04-19 09:41:46 -04:00
Archez
0b8cc71d0d
fix actor init flow with object loading (#3987) 2024-04-19 09:41:04 -04:00
inspectredc
ced34ab68a
[Fix] Disable Lod Applies To Everything (Macready) (#4034)
* make lod cvar affect everything

* add to more functions

* re-add to player

* only add to necessary funcs
2024-04-15 12:00:04 -04:00
inspectredc
e163d5bc3d
Fix switch puzzle locking issues (#4027) 2024-04-07 17:28:20 -04:00
briaguya
897d3efbd0
rip out unused types (#4041) 2024-04-07 17:02:57 -04:00
briaguya
168323ebc9
bump LUS (#4042) 2024-04-07 14:27:50 -04:00
Archez
fd7dfd8b6f
Support for new ucode loading patterns (#4038) 2024-04-04 12:26:14 -04:00
Archez
86c6013888
Remove macports upgrading (#4035) 2024-04-04 11:23:18 -04:00
briaguya
fb29c827ad
Update BUILDING.md (#4029) 2024-04-03 22:17:32 -04:00
briaguya
0f43d5de2d
bump lus (gfx refactor) (#4031) 2024-04-03 22:16:17 -04:00
Garrett Cox
8b3cfdb84f
Merge pull request #3986 from Archez/merge-macready-805
Merge MacReady 8.0.5 -> Develop
2024-03-06 04:12:02 +00:00
briaguya
ef690e2ceb
support LUS::Archive::LoadFileRaw no longer being exposed (#3999) 2024-03-05 23:09:05 -05:00
briaguya
9fb2f26f1b
tts: use RawJson resource + add SpeechLogger (#3998)
* moved `tts.cpp` away from using `LoadFileRaw` by creating a new `RawJson` resource type
* added `SpeechLogger`
2024-03-05 22:21:15 -05:00
briaguya
402a4db593
Bump LUS (#3996) 2024-03-04 23:56:26 -05:00
briaguya
375349e4f7
Support font as resource LUS changes (#3993) 2024-03-04 23:36:23 -05:00
briaguya
ebde648c59
.o2r support (#3955) 2024-03-02 20:51:32 -05:00
Adam Bird
7bd2a7c3a6 Merge remote-tracking branch 'origin/develop' into merge-macready-805 2024-02-28 23:49:06 -05:00
Garrett Cox
612da023f0
Bump version to MacReady Foxtrot 8.0.5 (#3982) 2024-02-28 22:46:55 -05:00
Malkierian
368a9015ac
Add Unix timestamp to renamed corrupted file to prevent trying to copy over existing file. (#3984) 2024-02-28 22:46:32 -05:00