Garrett Cox
0bde9f1fca
Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes
2024-04-19 12:29:10 -05:00
Malkierian
f4fc3662b6
dev -> dev-rando
2024-04-19 09:51:00 -07:00
briaguya
9696f74b5c
Merge branch 'develop-macready' into macready-to-dev
2024-04-19 09:57:29 -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
Archez
0b8cc71d0d
fix actor init flow with object loading ( #3987 )
2024-04-19 09:41:04 -04: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
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
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
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
Adam Bird
7bd2a7c3a6
Merge remote-tracking branch 'origin/develop' into merge-macready-805
2024-02-28 23:49:06 -05:00
Archez
fb6ea42560
prevent remember save location in dungeons/boss rooms ( #3983 )
2024-02-28 22:33:51 -05: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
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
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
Garrett Cox
37e89c0c7c
Migrate song of storms check
2024-02-20 21:49:07 -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
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
briaguya
30ff3e9585
fix the torch
2024-02-16 02:03:22 -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