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

2541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Garrett Cox
6c384c3cb6 Finish glitch aiding cutscenes toggle 2024-04-18 21:52:38 -05:00
Garrett Cox
abdbe25c8a Migrate purple poe faster fight 2024-04-18 21:36:10 -05:00
Garrett Cox
1683617210 Migrate rainbow bridge 2024-04-18 21:13:40 -05:00
Garrett Cox
edf6d9334a Migrate ganon trials 2024-04-18 20:42:25 -05:00
briaguya
54b1505137 vb gerudo (#111) 
* vb gerudo

* clean up
 2024-04-17 20:17:00 -05:00
briaguya
f6a583446b vb bombchu bowling (#110) 
* vb bombchu bowling

* don't need it

* it's drawing the right thing but it's tiny

* scale

* no need to should, don't rescale every draw

* slightly safer
 2024-04-17 19:49:29 -05:00
briaguya
84db4c8ab8 vb beehives (#109) 
* vb beehives

* format
 2024-04-16 20:02:16 -05:00
briaguya
60d74f720a vb richard (#108) 
* Lost Dog + Custom Hook Handler

* vb richard

* fix the merge

---------

Co-authored-by: Taw <Tawling@users.noreply.github.com>
 2024-04-16 19:28:20 -05:00
briaguya
63afaa3cc9 vb ocarina memory (#107) 
* Ocarina Memory Game

* vb memory game

---------

Co-authored-by: Taw <Tawling@users.noreply.github.com>
 2024-04-16 19:18:26 -05: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
briaguya
f3273e7627 vb treasure chest game (#103) 2024-04-09 23:31:45 -05:00
briaguya
bbbd2520b1 vb lh sun (#106) 
* underwater working pre func_80B858B4 replacement

* underwater item update handled by hookhandlers

* vb lh sun

* remove unused should
 2024-04-09 22:57:07 -05:00
briaguya
fe231147d5 vb underwater item (#104) 
* underwater working pre func_80B858B4 replacement

* underwater item update handled by hookhandlers

* remove commented out code

* remove unused should
 2024-04-09 22:46:11 -05:00
Garrett Cox
36a462d667 Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes 2024-04-08 11:03:50 -05:00
Garrett Cox
67ee5f8d0e Merge pull request #4045 from HarbourMasters/develop 
develop -> develop-rando
 2024-04-08 16:02:22 +00:00
briaguya
9c9fc49d32 vb horseback archery (#102) 
* vb horseback archery

* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-04-08 10:59:48 -05:00
briaguya
6d77bbd4a9 vb skull rewards (#101) 2024-04-08 10:55:16 -05: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
briaguya
307e106038 vb talon's chickens (#99) 2024-04-04 10:55:07 -05:00
briaguya
1e9cba1d61 vb diving game (#100) 2024-04-04 10:30:45 -05:00
briaguya
249490909f pull docs: talon function names (#98) 2024-04-04 10:26:48 -05:00
Archez
86c6013888 Remove macports upgrading (#4035) 2024-04-04 11:23:18 -04:00
Garrett Cox
325035e473 Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes 2024-04-04 08:15:34 -05:00
Garrett Cox
01bcc4bb59 Merge pull request #4033 from HarbourMasters/develop 
develop -> develop-rando
 2024-04-04 13:13:58 +00: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
briaguya
2339a729ee vb deku theater (#96) 2024-04-03 21:10:18 -05:00
briaguya
d6c512904b vb target in woods (#95) 
* do some target in woods VB stuff

* skip deku scrub hopping out animation

* replace a couple IS_RANDOs

* cleanup
 2024-04-03 20:11:13 -05:00
briaguya
0334c4e354 pull in docs (#97) 
* rename `func_8002DF54` to `Player_SetCsActionWithHaltedActors`
* rename `func_8002F434` to `Actor_OfferGetItem`
 2024-04-03 20:07:42 -05:00
Christopher Leggett
c162af818d Fix keysanity Any Dungeon setting. (#4020) 
Due to a typo a few months ago, it was accidentally being ignored and
treated as Anywhere. Own Dungeon may have also been doing weird things,
but I'm not entirely sure.
 2024-03-20 18:24:58 -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
Malkierian
ed9cb1dfd2 Fix CVar evaluation for scummed checks being hidden. (#3985) 2024-02-28 22:45:16 -05:00
Archez
fb6ea42560 prevent remember save location in dungeons/boss rooms (#3983) 2024-02-28 22:33:51 -05:00
Malkierian
b26f2b21da [UX Improvement] Catch save loading errors and notify user (#3979) 
* Add `SohModalWindow` and `SohModal`. Runs as window, always "visible", but not drawing if no popups are registered.

Adds error catching for save file corruption (malformed json) that renames the file in question to prevent future loading issues and uses `SohModalWindow` to inform the user of the error.

* Apply suggestions from code review

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
 2024-02-28 21:12:23 -06:00
Archez
358dd47da7 remove zapd extraction from mac launch script (#3981) 2024-02-28 21:03:08 -06:00