mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 09:31:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,073 Commits 6 Branches 52 Tags
dbb4e3eefcdca09978580bdf55f68ca3dd500da5
Commit Graph

753 Commits

Author SHA1 Message Date
briaguya dbb4e3eefc start on tree view 2022-08-18 08:20:52 -04:00
briaguya 3816ed11a4 add area names, fix kak bazaar 2022-08-18 08:20:35 -04:00
briaguya a7d4aa8042 add areas to rcos 2022-08-18 07:37:24 -04:00
briaguya 289a6e5a82 start on RC object stuff 2022-08-18 06:15:02 -04:00
briaguya ae8c7cb509 add excluded locations set 2022-08-17 11:08:11 -04:00
briaguya 11cc040710 add rcs to itemlocations in 3drando 2022-08-17 10:45:33 -04:00
briaguya 5605542452 start playing with imgui filters 2022-08-17 09:03:27 -04:00
briaguya c933d521c3 Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix 
Fix Ganon's Boss Key hints for Keysanity
 2022-08-17 00:09:26 -04:00
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
Kenix3 f9621dcc17 Cleans up Window class. 2022-08-16 23:30:20 -04:00
Christopher Leggett b6d6ede520 Fixes color replacement from being saved to the save file. 
This was bad because replacing `%w` with `\x05\x00` was causing
the string to prematurely terminate.
 2022-08-16 23:04:14 -04:00
Christopher Leggett ecaf0fd87a Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next 2022-08-16 22:12:20 -04:00
Christopher Leggett 5a3ab9bcdc Fixes Ganon's Boss Key hints for keysanity. 2022-08-16 22:12: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
th-2021 b46c7a0607 [cmake] Use SDL2, GLEW and GLFW from vcpkg (Windows) (#1194) 2022-08-16 09:29:45 +02:00
briaguya ee9ea3f2bd add 3drando license (#1206) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-15 21:17:58 -04: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
Julien Lemay 8945b2ed48 Fix Save Editor Event Check Inf "A" Row flags (#1138) 
Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".
 2022-08-14 23:02:14 -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
briaguya f70c1ff88a Merge pull request #1160 from aMannus/rando-better-dupe-handling 
Rando: Added more items to have dupe handling
 2022-08-13 00:30:12 -04:00
briaguya 8c965b4dc7 Merge pull request #1171 from aMannus/item-tracker-improvements 
Item tracker improvements
 2022-08-12 23:39:00 -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
aMannus 4c9f2493d7 Brought CVar naming in line with others 2022-08-12 22:51:40 +02:00
lilDavid 947a97608c Save Editor Adult Trade Shuffle bugfixes: 
- Having multiple items with the collapsing header open rapidly cycles trade items
 - Unchecking any item's checkbox cycles the trade item (it should only do so if it's the one you've selected)
 - Setting the adult trade slot sets the wrong items' flags
 - Emptying the adult trade slot doesn't reset all trade items' flags
 2022-08-12 15:43:08 -05:00
aMannus 3689abd01f One more small code cleanup 2022-08-12 22:39:12 +02:00
aMannus 5f2bcb39c9 Small code cleanup 2022-08-12 22:16:23 +02:00
aMannus 4d7982911e More fixes and code cleanup 2022-08-12 22:08:10 +02:00
aMannus ff64bc42fb First pass fixes item tracker save loading 2022-08-12 18:21:28 +02:00
aMannus aa7380fe06 Added missing double defense 2022-08-12 13:14:15 +02: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
aMannus 1e36de19aa Added more duplicate item handling 2022-08-11 11:57:43 +02:00
briaguya 5156ccbfd5 Merge pull request #1154 from aMannus/maps-compasses-name-change 
Rando: Small fixes for "Maps/Compasses"
 2022-08-11 04:17:21 -04:00
aMannus e7c793df9b Fixed comment too 2022-08-11 08:57:18 +02:00
aMannus ac70d92b31 Changed maps/compasses location in UI 2022-08-11 08:55:29 +02:00
aMannus 67edf574f2 Rename maps/compasses 2022-08-11 08:35:37 +02:00