mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-27 11:52:18 -05:00
Code Issues Projects Releases Wiki Activity
1,883 Commits 3 Branches 37 Tags 140 MiB
f4e4545180
Commit Graph

1883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Manian
7a9160ed78
Clarify how to build and run on Mac (#1195) 2022-08-14 23:21:16 -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
aMannus
651e0ddad4
Fixed 2 incorrect needs_save instances (#1115) 2022-08-14 22:59:12 -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
KiritoDev
b989ef4f7f
Fixed error screen (#1184) 2022-08-14 12:41:15 -04:00
sholdee
789cf13aae
[ci] move asset gen timeout to steps block (#1163) 2022-08-12 18:59:20 +02:00
Kenix3
86faa42acf Make libultra OSContPad struct consistent with the one from libultraship 2022-08-11 19:41:53 -04:00
Kenix3
d623ac5918 Copy over right stick Y axis sensitivity in the UI when the X sensitivity is changed. 2022-08-11 19:41:53 -04:00
Kenix3
4a3e43f73f VirtualController -> DummyController in CMake 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
th-2021
791f7774a5
[cmake] Split OTRGui into it's own target (#1116) 2022-08-11 10:05:54 +02:00
sholdee
e88000aeb0
[ci] asset stage tweaks (#1120) 2022-08-11 10:05:26 +02:00
Kenix3
d34a6d7666 Fixes error in LUS where there were multiple Vertex classes declared. 2022-08-10 23:14:29 -04:00
Kenix3
3bcc9514ab Cleanup ControlDeck class 2022-08-10 20:21:36 -04:00
Kenix3
15fba97949 Fixes some missed conversions of Console class singleton within the class itself. 2022-08-10 00:38:56 -04:00
Kenix3
6766719969 Fixes issue in Apple builds where imgui was referring directly to Console.Commands 2022-08-10 00:38:56 -04:00
Kenix3
6484d9354d Fixes incorrect command string when adding basic console commands. 2022-08-10 00:38:56 -04:00
Kenix3
23fb885e09 Console class is now a proper object oriented class. 2022-08-10 00:38:56 -04:00
Kenix3
81cd594704 Console now exposes commands with a reference to itself. 2022-08-10 00:38:56 -04:00
Kenix3
797d9fab7c GameOverlay command handler no longer uses SPDLOG and prints to console. 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
7b11509010 Fixes missed Switch specific invocation of old Console logging macros. 2022-08-09 22:34:16 -04:00
Kenix3
a4804d7290 No longer passing in C strings to SendInfoMessage formatted overload. 2022-08-09 22:34:16 -04:00
Kenix3
5751b5c278 debugconsole now uses console output functions. 2022-08-09 22:34:16 -04:00
Kenix3
f97f9ae422 Sets default value of ConsoleLine channel to "Console" 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
Kenix3
1f351418e1 Removes a couple printf in favour of SPDLOG calls. 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
Kenix3
0d9c390526
Removes no longer desired commented code. (#1105) 2022-08-08 21:53:36 -04:00
Kenix3
b924831eba
Merge pull request #1104 from briaguya-ai/rachael-to-zhora 
rachael -> zhora
 2022-08-08 21:53:04 -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
Kenix3
5581f45050
Adds instructions for Visuals Studio 2019 2022-08-08 21:01:46 -04:00
Josh Bodner
b6934b34db
Re-add Windows dependencies to build instructions (#1102) 2022-08-08 20:04:55 -04:00
sholdee
5453c68399
[ci] docker improvements (#1101) 2022-08-08 19:59:43 -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
th-2021
c803ff65ce
fix path to ZAPD (#1092) 2022-08-08 19:58:43 -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
KiritoDev
a4334ecb02
Changed input disable to only be forced on switch (#941) 
* Changed input disable to only be forced on switch

* Inverted if

* Finally fixed validation

* Removed enhancement if its a switch build

* Input now only gets blocked when the device is not a keyboard or its on switch

* Input gets blocked when the controller view is opened

* gControlNav is enabled by default on switch

* Fixed compilation issues
 2022-08-08 19:53:43 -04:00
aMannus
a8fea61bda
ADD: Enhancement presets (#926) 
* Proof of concept

* Finished default preset

* Added v1 presets

* Overhauled implementation

Function has been moved out of ImGuilmpl.cpp, and all presets have been put in their own functions so they can be applied in a cascading manner.

Also did some slight changes to the presets themselves.

* Fixed link animation settings

* Deleted unneccesary change

* Fixed missing newlines

* Moved functions back to ImGuilmpl.cpp

* Removed Ironman preset
 2022-08-08 19:52:34 -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
briaguya
cf639b1d51
SDL/OpenGL - actually use the window resolution from the json (#1082) 
* actually use the window resolution from the json

* switch fix

Co-authored-by: briaguya <briaguya@alice>
 2022-08-08 19:46:37 -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