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
Christopher Leggett
58da0a5aa2
Some more partial ice trap fixing that wasn't pushed earlier
2022-08-07 17:19:26 -04:00
Christopher Leggett
7516725f13
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework
2022-08-07 16:24:59 -04:00
Christopher Leggett
0efb008213
Partially fixes Ice Traps
...
Obtaining a freestanding Ice Trap causes link to slide forward
and receiving one from an NPC plays the sound effect and damage
animation but doesn't freeze link.
2022-08-07 13:17:06 -04:00
th-2021
ed9378375d
[cmake] Use static libraries with vcpkg on Windows ( #1079 )
2022-08-07 18:23:20 +02:00
Christopher Leggett
9616058952
Fixes item fanfares
2022-08-07 12:14:07 -04:00
Christopher Leggett
75aaefaf04
Fixed Particle effects in the new getItem system.
2022-08-07 11:35:37 -04: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
Christopher Leggett
3258fc5fb3
Correctly renders freestanding items
...
Particle effects are probably broken, need to fix them still, I pretty
much know how I would do that.
2022-08-06 23:29:28 -04:00
Christopher Leggett
cfce0eba3d
Implements fixes for competing getItem calls.
2022-08-06 22:51:15 -04: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
Christopher Leggett
194c4f4e52
Adds new files to CMakeLists.
2022-08-06 15:54:19 -04:00
Christopher Leggett
ba160cf997
merge in develop-zhora
2022-08-06 12:26:38 -04:00
Christopher Leggett
9062eaaca5
Should fix switch build pt 2
2022-08-06 12:21:11 -04:00
Christopher Leggett
43461cec69
Should fix switch build
2022-08-06 12:15:27 -04: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
Christopher Leggett
63ace6a4cc
Change ItemTableID to be uint16_t so we can use ModIndex for it.
2022-08-04 22:50:55 -04:00
Christopher Leggett
95d439bb30
Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge
2022-08-04 20:54:51 -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
Christopher Leggett
1da655adb5
Resolve merge conflicts with develop-zhora
2022-08-03 23:13:53 -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
Kenix3
6d3d5e7da5
LUS Cleanup: Removes unnecessary ModManager class.
2022-08-03 21:48:39 -04:00
Kenix3
212d774613
Clean up unnecessary compiler checks.
2022-08-03 21:12:51 -04:00
Kenix3
e68fac14c8
Uses correct audio player per platform now.
2022-08-03 21:12:51 -04:00
Kenix3
7675309e3f
Moves specific audio player header file include to after the definition of AudioPlayer class in AudioPlayer.h
2022-08-03 21:12:51 -04:00
