mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-06 11:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,076 Commits 6 Branches 52 Tags
e500db810bef304bde85639cf939366e5110c404
Commit Graph

494 Commits

Author SHA1 Message Date
briaguya 03151647b1 Merge pull request #1227 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-16 23:59:11 -04:00
Kenix3 72981221ad Merge pull request #1226 from HarbourMasters/develop-rachael 
rachael -> zhora
 2022-08-16 23:40:06 -04:00
David Chavez 6b0338a37d [zret] Port some documentation changes (#1164) 
* zret: Documentation pass on scene/room commands #1226

* Update OTR scene

* zret: Document the lens system #1079

* zret: Misc. doc/cleanup 4 #1093

* zret: Fix misc 8 #1150

* zret: Document Distortions from z_camera and z_view #1102
 2022-08-16 21:53:28 -04:00
briaguya 6206cd7db0 add ActorResetFunc for courtyard guards (#1213) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-16 21:50:52 -04:00
briaguya 01b7fedc35 clean up a few epochs that were missed (#1204) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-16 21:50:37 -04:00
briaguya 71b1db1fb6 volvagia interpolation fix (#1203) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-16 21:50:12 -04:00
aMannus cd37a56161 Rando: Fix being able to get Sun's Song check multiple times (#1185) 2022-08-16 22:16:44 +02:00
Josh Bodner eb632ccb50 Adjustable push speed (#1190) 2022-08-16 22:09:11 +02:00
Christopher Leggett 0f2e7db8e0 Fix Ice Traps on Windows and Mac (#1216) 2022-08-16 21:49:52 +02:00
GaryOderNichts a3d0962054 Fix ocarina right stick controls (#1211) 2022-08-16 13:47:41 +02:00
lilDavid 46a421f933 Add window to customize specific controls (#1122) 2022-08-16 09:43:09 +02:00
briaguya 42bce9d33e don't abuse epochs (#1179) 
* don't abuse epochs

* update bongo hand trails

Co-authored-by: briaguya <briaguya@alice>
 2022-08-14 23:18:12 -04:00
aMannus fabe051d3d Fix lost woods leading music in rando (#1155) 2022-08-14 23:04:40 -04:00
aMannus d575a3dda6 Fixed rotation of freestanding key checks in rando (#1135) 2022-08-14 23:01:30 -04:00
aMannus 37dd045bd2 Rando: Fix bomb/bombchu shops (#1134) 
* Fix bomb shops in rando

* Addressed review comments
 2022-08-14 23:01:00 -04:00
GaryOderNichts 68e7f2e6c1 Wii U support (#1097) 
* Wii U support

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* Add Jenkins support

* wiiu: fix scissor clamp

* wiiu: improve button remapping

* wiiu: fix scaling issues

* Update Dockerfile after merge

* Pull assets before build

* Only stop container once

* Adjust logging sinks

* wiiu: Change button mapping to match PC version

* wiiu: Implement controller changes

* wiiu: Update BUILDING.md

Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
 2022-08-14 22:57:24 -04:00
lilDavid 92d0d3e35e Let Cojiro crow in Adult Trade Shuffle 2022-08-12 17:12:52 -05:00
lilDavid e9354cc9a1 Don't spawn Fado and the carpenter's son at once 2022-08-12 17:12:19 -05:00
lilDavid 282192eb5e Properly hatch pocket cucco using Sun's Song 2022-08-12 17:02:03 -05:00
Kenix3 86faa42acf Make libultra OSContPad struct consistent with the one from libultraship 2022-08-11 19:41:53 -04:00
Kenix3 094388187f Cleans up Controllers 
Renames VirtualController to DummyController.
Makes controller axis treated the same as buttons.
Made Controller class members private or protected
Made Controller class treat deadzones, sensitivities, and press thresholds consistently.
 2022-08-11 19:41:53 -04:00
briaguya 388319deac add kak gate check for mask select 2022-08-11 02:01:25 -04:00
briaguya 2af572aa30 add check for mask shop being open to mask select 2022-08-11 01:51:43 -04:00
aMannus e259e87588 ADD: Enable Glitch-Useful Cutscenes option to rando 2022-08-10 21:51:10 +02:00
lilDavid fc08229a46 Save editor: Link adult trade item slot and flags 2022-08-10 11:00:49 -05:00
briaguya d523ba5127 complete mask quest 2022-08-10 06:28:10 -04:00
briaguya 65356b6ced Merge pull request #1051 from garrettjoecox/keysanity 
Keysanity + Shuffle Compasses & Maps
 2022-08-10 02:28:14 -04:00
lilDavid aef77a0913 Merge branch 'rando-next' into trade_quest_shuffle 2022-08-09 20:40:00 -05:00
lilDavid 12d45685b9 Move files in with other rando files 2022-08-09 19:57:40 -05:00
lilDavid 08366c51b6 Correct mixed indentation styles 2022-08-09 10:17:38 -05:00
Garrett Cox 608f493c5b Update descriptions and defaults 2022-08-09 07:53:15 -05:00
Christopher Leggett 7a5acb0a2a Fixes placement 2022-08-09 08:36:20 -04:00
Christopher Leggett 20bbf85f00 Sets player getItemId before other messagebox instance. 2022-08-09 07:26:17 -04:00
Christopher Leggett 6f7b38539b Moves setting of getItemId into a rando save if block. 2022-08-09 01:56:47 -04:00
Christopher Leggett 95918e0cb2 Fixes skulltula messages for custom items. 2022-08-09 01:42:47 -04:00
Garrett Cox 3472e83250 Use new custom message system, skulltula drops still broken text 2022-08-09 00:00:30 -05:00
Garrett Cox e8c4378d17 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 22:47:29 -05:00
briaguya 8410a79b26 Merge branch 'rando-next' into zhora-to-next 2022-08-08 22:27:04 -04:00
briaguya 816fac6c06 Merge branch 'develop-zhora' into zhora-to-next 2022-08-08 22:23:06 -04:00
briaguya 317de33a8b Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-08 21:43:04 -04:00
briaguya fa090c51f6 Merge pull request #831 from leggettc18/custom-messages 
System for Creating and Storing Custom Messages
 2022-08-08 21:24:48 -04:00
Christopher Leggett e63d84bd7d Adapts this branch for cmake building. 2022-08-08 21:14:29 -04:00
aMannus 4ea7f8371f Rando: Zelda sequence fixes (#1095) 
* Fixed zelda sequence oddities

* Fixed code inconsistency

* Adressed review comments

* Adressed review comments, removed unneccesary entrance skip

* Addressed some more review comments

* tiny cleanup
 2022-08-08 19:59:06 -04:00
InfoManiac742 0e10b59307 Update z_kaleido_item.c (#1046) 2022-08-08 19:58:01 -04:00
InfoManiac742 4bf4ad3359 Update z_en_ru1.c (#1042) 2022-08-08 19:56:56 -04:00
lilDavid f80ba4102a Add instant boomerang recall (#1006) 2022-08-08 19:55:07 -04:00
Dog 1f5d323d89 Randomizer: Skip Cutscenes (#846) 
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757

Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773

* Immediately give control back to player when talon running cutscene starts.

* Fix case of not skipping Gannon
 2022-08-08 19:48:53 -04:00
Christopher Leggett 59baf24dc6 Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages 2022-08-08 19:46:09 -04:00
Garrett Cox a0ac945b4e Make logic consistent across z_parameter & z_sram 2022-08-08 14:18:15 -05:00
Garrett Cox 8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00