Commit Graph

1703 Commits

Author SHA1 Message Date
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
David Chavez
9b33827d02
[ci] Share Generated Assets Across All Platforms (#1074) 2022-08-09 00:02:35 +02:00
David Chavez
9afbe42720
Use -O2 for Release config builds (#1083) 2022-08-08 12:01:45 +02:00
Christopher Leggett
7f233de502
Fixes CMake to explicity launch python interpreter on Windows. (#1089) 2022-08-08 10:31:47 +02:00
th-2021
ed9378375d
[cmake] Use static libraries with vcpkg on Windows (#1079) 2022-08-07 18:23:20 +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
qurious-pixel
b2ac01bc98
[CI] Link Updated SDL2 version (#1078) 2022-08-07 03:52:22 +02:00
David Chavez
1794683d3a Ignore build.c 2022-08-06 21:06:40 -04:00
David Chavez
c70e3f38b1 Enable SPD logging in libultra 2022-08-06 21:06:40 -04:00
David Chavez
aadabe1ecd Better instructions for VS solutions 2022-08-06 21:06:40 -04:00
briaguya
7f58ef14ee add a command to copy the otr to the build dir 2022-08-06 21:06:21 -04:00
briaguya
8efeceb236 formatting 2022-08-06 21:05:51 -04:00
briaguya
9a126dec4e add version requirements in building.md 2022-08-06 21:05:51 -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
Kenix3
2f5f089e7f
Increment version 2022-08-04 17:35:32 -04:00
briaguya
facd1723f8
don't use signed ints for epochs (#1044)
Co-authored-by: briaguya <briaguya@alice>
2022-08-04 17:32:23 -04:00
Kenix3
5f913cb9bf
Merge pull request #1037 from briaguya-ai/rachael-to-zhora
Rachael to zhora
2022-08-03 23:18:24 -04:00
briaguya
739434e3e4 Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-03 23:01:11 -04:00
vaguerant
78ad282056
Fix Navi HUD text regression (#1020)
* Fix Navi HUD text regression

* Fix the fix
2022-08-03 22:47:54 -04:00
Baoulettes
d61d4e508a
fix same name controller entry being unselectable (#1031)
This fix being unable to select both entry of controller that has same ID and Name (for example Mayflash mf103 in my tests got two port both ports has same name and ID.
2022-08-03 22:45:02 -04:00
Ada
bd86c792c3
Moves release version text (#1028) 2022-08-03 22:44:43 -04:00
Christopher Leggett
dffcbb035e
Fixes glitchy dungeon maps. (#1032) 2022-08-03 22:43:55 -04:00
Kenix3
0f7a88bd5a
This should fix (all?) 60fps interpolation issues left. (#938)
* This should fix (all?) 60fps interpolation issues left.

Resolves #631 #917

* Update z_fishing.c

* Re-adds Emil's interpolation in certain places.

* move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child

* move disps out of ifs for morpha

* use recordopen/recordclose for volv

* recordopen/recordclose for ganondorf

* switch back to recordopen/recordclose for ganondorf floor

* Frame interpolation now uses a 64bit parameter rather than 32.

* More 60fps fixes

* Fix close child typo

* add todo calls to recordopen/recordclose

* fix build

* revert long long frame interpolation

* add some epochs

* add more epochs

* bongo epochs

* the rest of the epochs

* fix the typo fix the build

* interpolation fixes pr cleanup

* init/cleanup bongo epochs

* bongo hand trails

* Fixes niw feathers

* Fixes bongo bongo hands, and replaces epoch * i with epoch + i

* don't update epochs

Co-authored-by: briaguya <briaguya@alice>
2022-08-03 22:36:13 -04:00
Kenix3
97adc4a7f2 Changes string.h include in CVar.cpp 2022-08-03 21:48:51 -04:00
Kenix3
6190388164 Now using posix strdrup on non-msvc builds. 2022-08-03 21:48:51 -04:00
Kenix3
8c9d067657 LUS Cleanup: CVars functions are now consistent 2022-08-03 21:48:51 -04:00