mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity
814 Commits 3 Branches 37 Tags 139 MiB
f87f636828
Commit Graph

527 Commits

Author SHA1 Message Date
louist103
eed3942b81
Restore Gold skulltula CS from the "0.9" version (#1217) 
* GS CS

* add to defaults
 2022-08-21 22:11:23 -04:00
Ralphie Morell
f5112a709a
Add'l Console Commands (#1207) 
* Added console commands

* Style conformance
 2022-08-21 22:01:51 -04:00
PurpleHato
f6bb46a0dc
FIX: Disable Draw Distance, Miniboss music could still play in DC with Lizalfos under certain conditions (#1170) 
Thanks @jbodner09 for the report 💯
 2022-08-21 21:57:55 -04:00
Kenix3
51e4485966
LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 
* Merges GlobalCtx2 and Window classes.

* Includes condition variable in File.

* add mac specific include

* sstream to get past "implicit instantiation of undefined template" error

* switch/wiiu includes

* that file doesn't exist

* more wii u globalctx2 stuff

Co-authored-by: briaguya <briaguya@alice>
 2022-08-21 21:08:01 -04:00
briaguya
ad8179287e
Fix controller nav on WiiU (#1258) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-20 02:03:28 +02:00
briaguya
0971b9aa78
only toggle menu with controller when controller nav enabled (#1043) 2022-08-19 15:46:11 +02:00
qurious-pixel
9bc6aac81e
MacOS OTR (#973) 2022-08-18 19:40:41 +02: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
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
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
Kenix3
81cd594704 Console now exposes commands with a reference to itself. 2022-08-10 00:38:56 -04:00
briaguya
96c2033361
fix linux release mode crash (#1124) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-09 22:50:25 -04:00
Kenix3
5751b5c278 debugconsole now uses console output functions. 2022-08-09 22:34:16 -04:00
Kenix3
c7ccd6dbff LUS Cleanup: Strips out the logging system created for the console 
Properly routes SPDLog to the console.
Creates an API to be able to send command responses back to the console.
Cleans up the console UI, hiding options when not needed.
Removes stdout console sink for Windows.
 2022-08-09 22:34:16 -04:00
aMannus
e4b58e5a0c
TWEAK: Layout/styling overhaul for the F1 menu (#1026) 
* First pass of UX changes

* More padding/styling/layout

* More styling

* Moar styling

* Some more styling

* Implemented padding helpers

* More styling, added closing buttons to windows

* Fixed merge conflict mistake

* Fixed new enhancements

* Hopefully fix jenkins errors

* Changed button behaviour, more styling

* Tiny code cleanup

* Change buttons from close/open to > when open

* Small button spacing fix

* Small styling changes after merge

* Small fix after merge mistake
 2022-08-09 02:16:45 -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
David Chavez
9afbe42720
Use -O2 for Release config builds (#1083) 2022-08-08 12:01:45 +02:00
th-2021
e51e7f3d45
[cmake] Fix Switch icon (#1084) 
* Update CMakeLists.txt

* fix switch icon

* Update soh/CMakeLists.txt

* Update soh/CMakeLists.txt

Co-authored-by: David Chavez <david@dcvz.io>
 2022-08-07 16:47:16 +02:00
GaryOderNichts
cb2410d9c5 Handle audio thread properly 2022-08-06 21:52:42 -04:00
th-2021
7ef3fff869
add soh icon for Windows (#1060) 2022-08-06 22:19:06 +02:00
th-2021
1ebca42f46
Move to cmake across all platforms (#363) 2022-08-05 07:59:19 +02:00
Kenix3
93d0d7443a
LUS Cleanup: Removes GameSettings class. Moves code to Imgui. (#1036) 
* LUS Cleanup: Removes GameSettings class. Moves code to Imgui.

* Fixes more strdup problems and finalized removal of GameSetting.

* Reverts changes to Directory.h

* Update Directory.h

* Fixes PR.

* Update Directory.h

* Update rando_main.cpp
 2022-08-05 01:03:11 -04:00
Josh Bodner
c23457d666
Automatically save after every scene transition (#984) 
* Automatically save after every scene transition

* Refactor and don't save in grottos

* Don't save in cutscenes

* Save after getting items as well

* Fix paren
 2022-08-05 00:15:49 -04:00
Kenix3
d397c1d871
Increment version 2022-08-04 17:35:49 -04:00