Garrett Cox
43e8eec6bd
Replace some printfs with spdlogs ( #4058 )
2024-04-19 12:28:38 -05:00
Garrett Cox
565a62a518
Merge pull request #4059 from Malkierian/dev-to-dev-rando-4-19
...
Dev to dev rando 4 19
2024-04-19 12:27:50 -05:00
Malkierian
f4fc3662b6
dev -> dev-rando
2024-04-19 09:51:00 -07: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
Garrett Cox
67ee5f8d0e
Merge pull request #4045 from HarbourMasters/develop
...
develop -> develop-rando
2024-04-08 16:02:22 +00: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
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
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
Malkierian
ea1ffdd041
Adds messageboxes to no_ui handling so they don't show if you have it on. ( #3977 )
2024-02-28 20:04:44 -06:00
Garrett Cox
854fb67797
Merge pull request #3964 from Archez/rando-dev-merge-feb
...
Merge develop -> develop-rando
2024-02-21 20:05:32 +00:00
Adam Bird
b5c601f43e
Merge remote-tracking branch 'origin/develop' into rando-dev-merge-feb
2024-02-21 02:01:25 -05:00
briaguya
bcbe4cb1c3
we crash if we try to SPDLOG in the destructors ( #3951 )
...
* we crash if we try to SPDLOG in the destructors
* rip em out
* newline
* add to destroy
* Revert "rip em out"
This reverts commit 738a9b80f3327d305e00
2024-02-21 00:21:26 -05:00
Archez
cd25f1d3c1
Fix performance of dlist viewer ( #3961 )
2024-02-21 00:20:25 -05:00
Adam Bird
8b178f9386
RandoV3 fixes for mix/decouple boss entrances
2024-02-20 16:52:42 -05:00
Adam Bird
37b960ab0e
Merge commit '13fce8258d92e80ea09900f83d338ccba2e7b1f9' into rando-dev-merge-feb
2024-02-20 16:51:05 -05:00
Adam Bird
1d61ba0b86
Merge commit '3187564f5b4120e159f5e506b4a3db88716b56aa' into rando-dev-merge-feb
2024-02-20 10:57:39 -05:00
Archez
cd5d2589f7
Merge pull request #3958 from HarbourMasters/develop-macready
...
macready -> develop
2024-02-20 10:32:28 -05:00
Archez
ef9fc0a9ec
fix endianess issue with camera setting data ( #3950 )
2024-02-20 08:38:10 -06:00
Archez
19af4481c0
fix object unload using wrong index ( #3949 )
2024-02-20 08:31:24 -06:00
Archez
d0b09743b9
Fix missing ImGui::EndDisabled ( #3946 )
2024-02-15 23:25:16 -05:00
Patrick12115
c484ea227b
[Difficulty Options] Leever Spawn Rate ( #3460 )
...
* Spawn Rate
* Update z_en_reeba.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* gEnhancements
* Merging issues
* Added preset entry and changed timer value math
* Update soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
* this should do it
* Update soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
* move out of loop
---------
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-15 22:12:09 -06:00
Patrick12115
4599212546
[Fixes] Fix Raised Floor Switches ( #3851 )
...
* Lower by 1
* gEnhancements.
* Update z_obj_switch.c
Co-authored-by: Archez <Archez@users.noreply.github.com>
* Moved to Hook
* Properly this time
* Added to presets
* Added a Return;
* Use Hex
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-15 22:02:58 -06:00
