mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-20 07:12:19 -05:00
Code Issues Projects Releases Wiki Activity
2,316 Commits 3 Branches 38 Tags 143 MiB
e2b0ea5692
Commit Graph

697 Commits

Author SHA1 Message Date
Malkierian
e2b0ea5692 Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-5 2024-05-05 22:05:10 -07:00
Garrett Cox
b4a30f708f
Change GI_VB_ to VB_ (#4116) 2024-05-05 16:29:02 -05:00
Garrett Cox
0aad8d4491 Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes 2024-05-05 14:38:39 -05: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
Christopher Leggett
e71839ed8f
Conversion of Nabooru Quick Death to VB hook (#120) 
* Nabooru quick death conversion

* Fix brackets, not sure exactly how this was working before.
 2024-05-04 16:50:19 -05:00
briaguya
7da6a5b604
vb deku stick cheat (#115) 
* vb deku stick cheat

* it's the 21st now

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-04-30 22:36:26 -05:00
Christopher Leggett
baaa00569d
Adds Quick Boss Death checkbox and implements Phantom Ganon's quick death (#119) 
* Adds Quick Boss Death checkbox and implements Phantom Ganon's quick death.

* Clarifies relocation comment.
 2024-04-30 22:31:08 -05:00
Pepper0ni
d69814ed95
Real time Hint Assembly, Hint object refactor, and expansion of CustomMessage (#4078) 
* Hint text refactor WIP DOES NOT BUILD

* Update to show people DOES NOT BUILD

* stuck on wierd errors

* forgot to add

* expression error does not name a type

* commit in case anyone looks

* static assertion failed: T must be an integral type or an enum.

* fail without error, complaining about unrefernced things

* fix some issues, still linker bs

* restructure some trials, conditionalAlwaysHints and hint_list stuff

* builds and does not crash, but there's text issues

* fix text issues

* commit to push, halfway through trimming down log

* finish trimming spoiler logging

* post merge clean up

* plando mode seems to work, looking into song text wierdness

* push for debugging crash on HBA sign

* fix num and anju issues

* fix the damn sign

* Fix Windows build

Renames GetMessage to GetHintMessage (a different name could be chosen, but GetMessage conflicts with a macro in winuser.h)
Changes uint to size_t, uint does not seem to exist on Windows.

* fix biggoron

* remove some manual formatting that autoformat doesn't like

* fix some altar text

* fix more altar text

* last cleanup

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
 2024-04-29 09:41:33 -05:00
Malkierian
303fe7d906
Swap all cosmetics CVars to macros. (#4065) 
Lots of renames.

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-04-26 02:41:55 +00:00
Malkierian
56d8dd6d8b
All MenuBar enhancement CVars done. (#4064) 2024-04-26 00:31:28 +00:00
Garrett Cox
a554c1550d Fix shadow & spirit rewards, remove remaning usage of duplicate dungeon done flags 2024-04-21 18:53:15 -05:00
Malkierian
33aef87907
CVar Macro Cleanup (#4062) 
* Standardized CVar macros to have `CVAR_` at the front instead of the end.
Removed excluded and replaced sequence macros.

* Missed a few developer CVars outside of `SohMenuBar.cpp`

* 1 more.
 2024-04-21 10:25:06 -05:00
Garrett Cox
14c7f0c3e1 More time cutscene skip fixes 2024-04-21 09:14:46 -05:00
Malkierian
e2622af004
Step 3 of CVar macro/sectionalizing: Dev Tools, Cheats, Audio Editor, Remote (#4030) 
* Swapped Audio Editor CVars.

* Swapped Cheat CVars.

* Swapped Developer Tools CVars. Also a couple General CVars.

* Added REMOTE_CVAR.
Swapped Remote CVars.

* Missed an include.
 2024-04-20 18:56:32 +00:00
Malkierian
b045689df1
Step 1 of CVar macro/sectionalizing: Randomizer Settings (#3206) 
* Add all macros.

Replace all randomizer seed setting CVars with appropriate macro.

Cleaned up non-gameplay-critical things that are part of Spock Race rando presets (like RTA timing, displaying timer, displaying the glitch lineup tick, or Fast File Select).

* Wrong slash...

* Forgot "gManualSeedEntry".

* Renamed CVars from "Mq..." to "MQ...".
 2024-04-20 09:29:19 -05:00
briaguya
3b0548f585 vb tower escape 2024-04-19 18:05:38 -04:00
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
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
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
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