Ralphie Morell
f5112a709a
Add'l Console Commands ( #1207 )
...
* Added console commands
* Style conformance
2022-08-21 22:01:51 -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
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
lilDavid
46a421f933
Add window to customize specific controls ( #1122 )
2022-08-16 09:43:09 +02:00
briaguya
ee9ea3f2bd
add 3drando license ( #1206 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-15 21:17:58 -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
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
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
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
Christopher Leggett
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-08-08 19:46:09 -04:00
GaryOderNichts
cb2410d9c5
Handle audio thread properly
2022-08-06 21:52:42 -04: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
briaguya
739434e3e4
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-03 23:01:11 -04:00
Kenix3
fd379896d6
LUS Cleanup: Clean up hooks system.
2022-08-03 21:12:51 -04:00
Christopher Leggett
fe02818d51
Randomizer: Ocarina of Time Ice Trap Fix ( #964 )
...
* Fixes Ice Trap on OoT check from preventing SoT check
* Removes unneeded GlobalContext argument.
2022-08-02 23:48:51 -04:00
Kenix3
352b46c1f5
LUS Cleanup: Console class is now in the Ship namespace
2022-08-02 22:54:38 -04:00
Kenix3
c1659d3dcf
Adds a function for grabbing physical device from virtual slot.
2022-08-02 22:37:42 -04:00
Kenix3
b3c3882b12
LUS Cleanup: Make ControlDeck a member of Window
2022-08-02 22:37:42 -04:00
Christopher Leggett
d80742d882
Adds documentation comments to CustomMessageManager.h
2022-08-02 19:32:59 -04:00
Christopher Leggett
a007bfd14a
Merge changes from develop-zhora
2022-08-02 19:17:08 -04:00
David Chavez
d9443d98f0
Store RGBA Cvar as JSON object ( #996 )
...
* Store RGBA Cvar as JSON object
* Use existing split string method
* Extract key setting to var
2022-08-02 18:09:33 -04:00
David Chavez
53229f0905
Merge branch 'develop-rachael' into rachael-zhora
...
# Conflicts:
# libultraship/libultraship/ImGuiImpl.cpp
2022-08-02 20:05:40 +02:00
David Chavez
61c68666d6
Closer align Makefiles & Dockerfiles ( #748 )
2022-08-02 16:22:20 +02:00
Christopher Leggett
bb8152b376
Replaces string literal for BaseGameOverrides with const variable.
2022-08-01 23:16:16 -04:00
Christopher Leggett
480053dfaa
Exposes FormatCustomMessage and uses it in FormatJsonHintText.
2022-08-01 23:05:29 -04:00
Christopher Leggett
eae97cff79
Addresses most of bria's comments.
2022-08-01 21:44:28 -04:00
Christopher Leggett
4d30cc50a1
Adds newlines to the ends of some files.
2022-08-01 21:21:29 -04:00
David Chavez
4ed82c71dc
Fix c++20 clang issue
2022-08-01 17:16:03 -04:00
Christopher Leggett
d332c3d9d6
Randomizer Allows Skull Kid to accept Mask after receiving an ice trap. ( #963 )
...
* Allows Skull Kid to accept Mask after receiving an ice trap.
* Extracts obscure rando check into a clearly named function.
* Fixes missing semicolon...
2022-07-31 21:58:13 -04:00
aMannus
8c25e9a992
Added line break ( #958 )
2022-07-31 21:54:26 -04:00
Josh Bodner
7a45380123
Automatically break long tooltip lines ( #925 )
...
* Remove manual newlines from the middle of sentences in tooltips and automatically break long lines instead
* Move split functionality into header so randomizer tooltips can use it
* Rewrite logic to be O(n)
* Found another typo
* Move helper function to libultraship to (hopefully) get Jenkins happy
* Fix typo I made when fixing the typo before
* Remove unneeded header
* Parameterize line length in case variable line length is desired in the future
2022-07-31 21:40:26 -04:00
GaryOderNichts
99ecccfaab
Save scarecrow songs as OcarinaNotes ( #918 )
2022-07-31 21:39:24 -04:00
David Chavez
582f084973
Use tex sizes from texture rather than hardcoded values ( #610 )
...
* Use tex sizes from texture rather than hardcoded values
* Dynamic do action tex sizes
* Remove unused minimap texture keys
* Restore MESSAGE_STATIC_TEX_SIZE
* Use dynamic offsets
* MACRO it up
* Enable SPDLOG in Xcode
* Handle non-existent texture
2022-07-31 21:32:40 -04:00
Christopher Leggett
2f9874c68f
Cleanup.
2022-07-31 19:31:22 -04:00
Nicholas Estelami
3bb234e6a6
Fixed merge issues.
2022-07-31 16:57:04 -04:00
Nicholas Estelami
44bf5af33a
Fixed up merge issues and crash
2022-07-31 16:57:04 -04:00
Nicholas Estelami
0193489b00
RGBA8 CVar Support Added
2022-07-31 16:57:04 -04:00
Nicholas Estelami
a6092c21d4
Merge with develop
2022-07-31 16:57:04 -04:00
GaryOderNichts
6818247317
Big-endian support ( #909 )
2022-07-27 23:50:56 +02:00
Christopher Leggett
e8d2b0cceb
Hopefully fixes build errors on Linux-CI.
2022-07-26 20:46:49 -04:00