nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
2,180 Commits 8 Branches 0 Tags
651348d2a94f6bfa5f7e7f89800908e9e8a4a3e5
Commit Graph

2180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Archez
651348d2a9 Merge remote-tracking branch 'origin/develop' into macready-golf-merge 2024-08-13 01:09:49 -04:00
Archez
0bc6ca08e0 Bump MacReady Golf (#4279) 2024-08-12 23:26:30 -04:00
Archez
16aaf2f939 Tweak: Implement better extended culling options (#4285) 
* implement better culling

* change draw distance to a slider

* remove testing code

* tweak
 2024-08-12 19:39:44 -04:00
Spodi
3971e3696e Use manifest for windows DPI awareness (#3270) (#4256) 
* Use manifest for windows DPI awareness (#3270)

* Update libultraship

* Update libultraship
 2024-08-05 19:31:20 -04:00
Nicholas Estelami
f11f97e84e Custom Skeleton Fixes for various bosses and enemies (#3436) 
* Skeleton Fixes for various bosses and enemies

* cleanup

* revert breakpart changes

---------

Co-authored-by: Adam Bird <archez39@me.com>
 2024-08-05 15:20:40 -04:00
Archez
7a00658be9 Fix disable lod breaking certain effects (#4245) 2024-07-21 15:30:18 -04:00
Malkierian
7bc2259c82 LUS bump and implement alt assets performance changes. (#4240) 
* LUS bump and implement alt assets performance changes.

* LUS ref update.
 2024-07-21 15:29:45 -04:00
Malkierian
3d73faa9a0 Port Graphics Menu lag fix from 2ship. (#4238) 
* Port Graphics Menu lag fix from 2ship.

* tweak

---------

Co-authored-by: Adam Bird <archez39@me.com>
 2024-07-17 15:57:11 -04:00
Kenix3
134aba4aa0 Fixes crashes on asan related to audio. (#4049) 
Found in MM
 2024-07-17 14:35:13 -04:00
Archez
73be4e5559 Bump LUS for 2cyc color combiner fix (#4221) 2024-07-15 22:24:38 -04:00
Pepe20129
839fcffe17 Add Alternate Headers XML logger (#4207) 2024-06-15 23:47:35 -04:00
inspectredc
79a29a62ef Use correct default value (#4194) 2024-06-15 23:43:09 -04:00
GaryOderNichts
f99993af85 Reduce stack usage during static initialization (#4184) 
* Reduce stack usage during static initialization

* Implement `ABS` macro for `TWO_ACTOR_PARAMS`
 2024-06-15 23:28:42 -04:00
Archez
cd7c5ab316 Clear the framebuffer for the pause menu link texture (#4213) 
* clear pause menu link framebuffer

* cache bust

* Add enums for pause menu link width/height and rename the framebuffer

* revert cache bust
 2024-06-15 23:13:13 -04:00
briaguya
4441304dfd support LUS not providing an array resource type/factory (#4204) 
* support LUS not providing an array resource type/factory

* bump to latest upstream
 2024-06-14 13:40:39 -04:00
briaguya
736dccb00b update to latest LUS main (#4202) 
Includes supporting changes from:
* https://github.com/HarbourMasters/Shipwright/pull/4197 (alt assets variable changes)
* https://github.com/HarbourMasters/Shipwright/pull/4199 (WindowBackend enum changes)
* https://github.com/HarbourMasters/Shipwright/pull/4200 (Extract gMtxClear)

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: inspectredc <inspectredc@gmail.com>
 2024-06-02 15:34:53 -04:00
briaguya
b8c7c71578 allow setting device visibility in controller mapping window (#4165) 2024-06-02 12:13:03 -04:00
Lywx
53efc22a23 Framebuffer clear and bump LUS (#4187) 2024-05-27 18:33:02 -04:00
briaguya
ad0e17383e update nightly links in readme (#4147) 2024-05-16 14:55:04 -04:00
Pepe20129
08ad16e750 Add path XML parser (#4115) 
* Add path XML parser

* Update SetPathwaysFactory.cpp
 2024-05-10 00:17:50 -05:00
Ted Newman
844413b391 Add Modifier buttons to input viewer and support individual button outline modes (#3966) 
* Add Modifier buttons to input viewer and support individual button outline modes

* Clearer naming

* Remove hardcoded indent values

* clean up diff

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
 2024-05-09 23:57:31 -04:00
Eric Hoey
65b18d61cf Fix modifiers crash when obtaining underwater item (#4110) 
* NULL check

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-05-09 22:02:50 -05:00
Eric Hoey
63bc2aff59 Frogs Ocarina Game Difficulty Options (#3373) 
* Frog actor edits, menu, presets

* Block off vanilla code + comments

* fix logic + formatting

* new documentation format

* Update for CVAR changes

* Fix alignment

* Conditions cleanup

* Update soh/soh/SohMenuBar.cpp

Oops, added

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>

---------

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
 2024-05-09 20:55:53 -05:00
briaguya
23f9654940 update BUILDING.md (#4128) 2024-05-09 20:49:32 -05:00
briaguya
5530ce2e61 simplify ci (#4129) 2024-05-09 20:45:21 -05:00
Archez
3f67fed073 Fix some memory leaks with WrappedText and LoadArrayByNameAsVec3s (#4144) 
* avoid memory leaks with WrappedText

* avoid memory leak with LoadArrayByNameAsVec3s
 2024-05-09 20:39:13 -05:00
Archez
47b690fb1e Bump LUS and restore guMtx in collision viewer (#4137) 2024-05-09 01:26:58 -04:00
Archez
cbeec006ec Fix syotes scene path to use shared (#4136) 2024-05-09 00:32:29 -04:00
Lywx
1231b8f9fa Fixed macos/ios errors (#4138) 2024-05-08 19:30:22 -04:00
briaguya
22c9d53985 bump lus (gfx debugger fix, stormlib optimizations) (#4135) 2024-05-08 11:23:43 -04:00
Kenix3
3c87c1ec98 Lus window bump (#4131) 2024-05-08 02:25:50 -04:00
briaguya
0976198f2c get soh working with latest lus (#4132) 2024-05-08 00:13:47 -04:00
briaguya
52fad95a2c support lus thread_pool changes (#4127) 2024-05-06 22:08:11 -04:00
Malkierian
8d3902a256 Remove unnecessary and redundant checks and references. (#4111) 
Stop passing checksByArea to functions in the same namespace.
Only get value of `HideFilteredAreas` once per frame.
Gate area and check evaluations behind checks being visible and search filter size greater than 0.
Proper function capitalization.
 2024-05-06 19:27:35 -05:00
Malkierian
b3d51441eb Rando Enhancement: Mysterious Shuffled Items (#3227) 
* Add rando enhancement "Mysterious Shuffled Items", which obfuscates shuffled freestanding/drawn-in-world items (PoH, tokens, shop items) with a custom question mark model (thanks Hato), and uses the "mysterious item" functionality of `GetMerchantMessage` for everything that supports it, regardless of hint status on generation.

* Reverted back to rando enhancement, but added condition for Mysterious Shuffle not being on for the gem rotation fix to apply.

* First attempt at changing to fake GetItemEntry instead of directly calling the mystery draw function. Needs more work.

* Updated CVar to reflect CVar rework values.

Added `IsCheckShuffled` as preliminary function for checking *only* if a check is shuffled, not necessarily if it is just visible on the tracker. This accounts for the difference between tokensanity and "Always Show GS On Tracker", where you don't want to obfuscate the latter.

* Bit of cleanup.

* Cross-platform building edits. If anyone has a better idea of how to handle this fake GIE, I'm all ears.

* Update to CVar macros.

* Fix freestanding item gives.
Fix mysterious item model colors.

* Fix bombchu bowling mystery.

* Remove bowling bomchus check obfuscation (unused, removed in v3).
 2024-05-06 19:17:08 -05:00
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
Archez
a860a7ea39 Merge pull request #4122 from Archez/merge-macready-may6 
Merge macready -> develop
 2024-05-06 14:51:24 -04:00
Adam Bird
439574d0d9 Merge remote-tracking branch 'origin/develop' into merge-macready-may6 2024-05-06 12:22:48 -04: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
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
8480f37f77 fetch imgui (#4094) 2024-04-30 22:49:54 -04:00