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
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
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
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
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
fd379896d6
LUS Cleanup: Clean up hooks system.
2022-08-03 21:12:51 -04:00
Christopher Leggett
41ea5c6685
Adds rando item table and way to differentiate tables in GetItemEntry.
2022-08-03 08:15:17 -04:00
Garrett Cox
6d0d608e38
Unrestricted warping in randomizer ( #951 )
2022-08-02 23:51:07 -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
Nycz
db33604171
added Cheat Sync Time ( #957 )
...
* added Cheat Sync Time
This syncs the ingame time with the real world time.
I wasnt quite sure where to put the code so im sorry if this is bad i just wanted to contribute to this project.
* Update soh/src/code/z_play.c
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Update z_play.c
added suggestions from leggettc18
* Update z_play.c
Co-authored-by: Christopher Leggett <chris@leggett.dev>
2022-08-02 23:48:41 -04:00
InfoManiac742
27e0f19dac
Remember save location ( #980 )
...
* Remember save location
* Clarified grotto caveat
* Update ImGuiImpl.cpp
2022-08-02 23:47:57 -04:00
aMannus
b89cc25df3
Fixed deku stick on B and horse swordless ( #995 )
2022-08-02 23:46:39 -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
Christopher Leggett
7eba85c3b4
Prevents blocking Song of Time check by shielding. ( #1001 )
2022-08-02 18:09:53 -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
Christopher Leggett
73447f05ab
Revert Goron Spin Fix ( #1003 )
...
* Fixes Goron Wakeup animations
* Cleanup of some unneeded code.
* Fixes comment spacing
* Revert goron's back to spinny behavior with smooth transitions.
2022-08-02 18:09:02 -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
Josh Bodner
18013e1ae0
Do this in Rachael instead
2022-08-02 13:57:34 -04: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
