2478 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lywx	f3b948226b	Bump lus and fixed PatchGfx (#4125) ... * Bump lus and fixed PatchGfx * Bump libultraship to main	2024-05-06 19:19:15 -04:00
Malkierian	438dede792	Change "AnubixFix" back to "AnubisFix". (#4124)	2024-05-06 17:10:06 -05:00
Eric Hoey	27dd303a57	Limit crawl speed to modifier to 4 (#4113)	2024-05-06 19:10:22 +00:00
Pepper0ni	d0627dc737	fix a V2 compatibility crash (#4119) ... * Attempt to fix ambiguity issues and a V2 compatibility crash * oops * remove explicit call as it is fixed elsewhere	2024-05-06 19:10:00 +00:00
Garrett Cox	a96fe678f8	Merge pull request #4118 from Malkierian/dev-to-rando-5-5 ... develop -> develop-rando 5-5	2024-05-06 14:09:41 -05:00
Archez	a860a7ea39	Merge pull request #4122 from Archez/merge-macready-may6 ... Merge macready -> develop	2024-05-06 14:51:24 -04:00
Malkierian	89f119c566	Fix ambiguity.	2024-05-06 11:13:30 -07:00
Adam Bird	439574d0d9	Merge remote-tracking branch 'origin/develop' into merge-macready-may6	2024-05-06 12:22:48 -04:00
Malkierian	f354460d04	Make it build.	2024-05-05 22:43:11 -07:00
Malkierian	69eebf0984	CVar cleanup.	2024-05-05 22:27:33 -07:00
Malkierian	e2b0ea5692	Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-5	2024-05-05 22:05:10 -07:00
Garrett Cox	4bd0f2d2c1	Port new hook filtering patterns from 2ship (#4117)	2024-05-05 16:55:56 -05:00
Garrett Cox	b4a30f708f	Change GI_VB_ to VB_ (#4116)	2024-05-05 16:29:02 -05:00
Garrett Cox	04f9ec1b78	Merge pull request #3755 from garrettjoecox/develop-rando-changes ... Vanilla Behavior Overhaul	2024-05-05 15:12:43 -05:00
Garrett Cox	0c69ff17c2	Fix two minor issues from merge	2024-05-05 14:46:23 -05:00
Garrett Cox	0aad8d4491	Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes	2024-05-05 14:38:39 -05:00
Malkierian	6443a986d9	Final Step of CVar macro/sectionalizing (#4107) ... * p * Missed the prefix renames. * More missed ones. * Mostly finished cleanup. Removed a few CVars and some related functionality. * Bit more (prepping non-existent title card color editing). * Resolve gCrowdControl. * Final cleanup. * Universal constant, not acceleration... * Preset CVars.	2024-05-05 14:14:55 -05:00
Christopher Leggett	e71839ed8f	Conversion of Nabooru Quick Death to VB hook (#120) ... * Nabooru quick death conversion * Fix brackets, not sure exactly how this was working before.	2024-05-04 16:50:19 -05:00
Archez	de715da184	explicitly include unordered_map header (#122)	2024-05-04 16:49:36 -05:00
briaguya	b6fc54ad8b	support lus dr_libs removal (#4108)	2024-05-03 12:55:38 -04:00
briaguya	e02e4ead02	support lus fetching stb (#4105)	2024-05-03 11:07:07 -04:00
briaguya	725670d998	support lus strhash64 change (#4102)	2024-05-02 14:43:52 -04:00
briaguya	bcf5a0c307	support lus factories no longer being registered in RegisterGlobalResourceFactories (#4099)	2024-05-02 00:14:36 -04:00
briaguya	345cef9b78	detangle zapdutils (#4096)	2024-05-01 22:47:40 -04:00
Archez	fd9cd9c5eb	Fix: add workaround for boost versions >=1.84.0 (#4098)	2024-05-01 16:41:17 -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	7da6a5b604	vb deku stick cheat (#115) ... * vb deku stick cheat * it's the 21st now --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>	2024-04-30 22:36:26 -05:00
Christopher Leggett	baaa00569d	Adds Quick Boss Death checkbox and implements Phantom Ganon's quick death (#119) ... * Adds Quick Boss Death checkbox and implements Phantom Ganon's quick death. * Clarifies relocation comment.	2024-04-30 22:31:08 -05: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
Pepper0ni	d69814ed95	Real time Hint Assembly, Hint object refactor, and expansion of CustomMessage (#4078) ... * Hint text refactor WIP DOES NOT BUILD * Update to show people DOES NOT BUILD * stuck on wierd errors * forgot to add * expression error does not name a type * commit in case anyone looks * static assertion failed: T must be an integral type or an enum. * fail without error, complaining about unrefernced things * fix some issues, still linker bs * restructure some trials, conditionalAlwaysHints and hint_list stuff * builds and does not crash, but there's text issues * fix text issues * commit to push, halfway through trimming down log * finish trimming spoiler logging * post merge clean up * plando mode seems to work, looking into song text wierdness * push for debugging crash on HBA sign * fix num and anju issues * fix the damn sign * Fix Windows build Renames GetMessage to GetHintMessage (a different name could be chosen, but GetMessage conflicts with a macro in winuser.h) Changes uint to size_t, uint does not seem to exist on Windows. * fix biggoron * remove some manual formatting that autoformat doesn't like * fix some altar text * fix more altar text * last cleanup --------- Co-authored-by: Christopher Leggett <chris@leggett.dev>	2024-04-29 09:41:33 -05: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
Garrett Cox	7e7445ebcc	Merge pull request #118 from briaguya-ai/chu-bowling-dont-skip ... don't skip item give animation in chu bowling	2024-04-24 20:53:23 -05:00
briaguya	1fff8fd6d5	don't skip item give animation in chu bowling	2024-04-24 21:48:31 -04:00
Garrett Cox	ae3b21f45b	Merge pull request #117 from briaguya-ai/latest-lus-main ... latest lus main	2024-04-24 20:28:38 -05:00
briaguya	b2041df311	latest lus main	2024-04-24 21:21:22 -04:00
briaguya	d22dbd6933	move RawJson to LUS (#4063)	2024-04-24 21:21:01 -04:00
Christopher Leggett	65c5806333	Better fix for blank hint issue. (#4070)	2024-04-24 17:09:49 -04:00
Garrett Cox	7bde0f5289	Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes	2024-04-23 11:31:39 -05:00
Garrett Cox	c67d8f4baa	Add missing RHT entries	2024-04-23 11:31:34 -05:00
Christopher Leggett	99fbecd951	Fix issue with item name replacement at runtime. (#4068)	2024-04-23 11:30:30 -05:00
Garrett Cox	ee6e941681	Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes	2024-04-23 09:53:08 -05:00
Christopher Leggett	39e6269731	Fixes bugs with spoiler file parsing (#4066) ... * Fix bugs with spoiler file parsing * Hopefully fix mac build issue * fix typo	2024-04-23 10:26:59 -04:00