mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-13 11:42:19 -05:00
Code Issues Projects Releases Wiki Activity
2,612 Commits 3 Branches 37 Tags 142 MiB
bbe3bb72b6
Commit Graph

2612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
416ed84bc6 Migrate great fairy checks 2024-02-24 09:17:48 -06:00
Garrett Cox
09c967249f More 1PC skips 2024-02-23 14:06:27 -06:00
Garrett Cox
13a113c362 Various adjustments to goron related vanilla behavior hooks 2024-02-23 12:43:27 -06:00
Garrett Cox
b293cac51c Enable timesaver enhancements by default on rando 2024-02-21 15:26:11 -06:00
Garrett Cox
2203f902a3 Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes 2024-02-21 14:43:37 -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
Garrett Cox
7bebe7a573 Migrate okarina_tag changes 2024-02-21 14:01:49 -06: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 738a9b80f3.

* Revert "we crash if we try to SPDLOG in the destructors"

This reverts commit 327d305e00.
 2024-02-21 00:21:26 -05:00
Archez
cd25f1d3c1
Fix performance of dlist viewer (#3961) 2024-02-21 00:20:25 -05:00
Garrett Cox
37e89c0c7c Migrate song of storms check 2024-02-20 21:49:07 -06:00
Garrett Cox
72581f7482 Re-add some UI I accidentally removed 2024-02-20 21:04:16 -06:00
Garrett Cox
0dda3a6c29 More boss intro skips 2024-02-20 21:00:10 -06:00
Ted Newman
00b3581151
Skull Kid (#86) 
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-02-20 20:15:10 -06:00
Garrett Cox
d28257088b
Merge pull request #85 from Tawling/vbo-man-on-roof 
GI VB for Man On Roof
 2024-02-21 02:12:53 +00:00
Garrett Cox
4c56583215
Merge pull request #90 from briaguya-ai/fix-the-torch 
fix the torch
 2024-02-21 02:11:07 +00: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
briaguya
30ff3e9585 fix the torch 2024-02-16 02:03:22 -05: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
Garrett Cox
a8d3724a53
Add missing cvars mostly that patrick forgot because he likes ranch dressing but also some that I missed oops (#3944) 2024-02-15 21:28:06 -06:00
Garrett Cox
10b6f8cf80
Merge pull request #3945 from HarbourMasters/develop-macready 
macready -> develop
 2024-02-15 21:21:18 -06:00