mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 09:31:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
793 Commits 6 Branches 52 Tags
ed3cddbeafdf9e06f709beed0033a842ece85e2b
Commit Graph

793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garrett Cox ed3cddbeaf Add option to shuffle frog song rupees 2022-08-05 09:52:11 -05:00
briaguya 2d22099805 Merge pull request #1039 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-03 21:02:29 -07: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
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
Kenix3 4ce19e1448 LUS Cleanup: Only including the correct audio player header file. 2022-08-03 21:12:51 -04:00
Kenix3 fd379896d6 LUS Cleanup: Clean up hooks system. 2022-08-03 21:12:51 -04:00
Kenix3 8431cddb14 LUS Cleanup: GameOverlay and moves various GUI related files to it's own filter. 2022-08-03 20:10:39 -04:00
Kenix3 2d60c772bf LUS Cleanup: Controllers cleanup (#1016) 2022-08-03 00:07:52 -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 7267b60a26 gfxFramebuffer is now only compared or set to 0 rather than NULL 2022-08-02 23:31:50 -04:00
Kenix3 67d5ba08ab Converts gfxFramebuffer to be a pointer. 2022-08-02 23:31:50 -04:00
Kenix3 1de525900d Removes unnecessary Environment.cpp file. 2022-08-02 23:31:50 -04:00
Kenix3 352b46c1f5 LUS Cleanup: Console class is now in the Ship namespace 2022-08-02 22:54:38 -04:00
Kenix3 1bf7771981 LUS Cleanup: Utils.cpp is now in namespace Ship. 2022-08-02 22:38:01 -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
briaguya 4dfd2e5c32 Merge pull request #1011 from PurpleHato/randodupe 
TWEAK: French dup entry
 2022-08-02 16:20:41 -07:00
PurpleHato da79e43adf TWEAK: forgot item_list 2022-08-03 01:03:28 +02:00
PurpleHato 31af53957d TWEAK: de de repetition 2022-08-03 00:58:51 +02:00
PurpleHato f281a07dfb TWEAK: French dup entry 2022-08-03 00:52:14 +02:00
briaguya f01f9a9b45 Merge pull request #1010 from briaguya-ai/rnextmerge 
zhora -> rando-next
 2022-08-02 15:30:16 -07: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
briaguya 1872bd09d1 Merge pull request #339 from briaguya-ai/develop-zhora 
Re-added ImStrdup around string value (#1009)
 2022-08-02 15:06:13 -07:00
aMannus 85c4cd3863 Re-added ImStrdup around string value (#1009) 2022-08-02 23:47:39 +02:00
briaguya 9fa2e79006 Merge pull request #1008 from briaguya-ai/zhornext 
zhora > rando-next
 2022-08-02 13:07:00 -07:00
briaguya ac776ce7bc Merge branch 'develop-zhora' into zhornext 2022-08-02 15:49:59 -04:00
David Chavez cec0bc6fca Merge pull request #999 from dcvz/rachael-zhora 
Rachael -> Zhora
 2022-08-02 20:15:26 +02: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
briaguya 8aa20e1732 Merge pull request #1007 from briaguya-ai/zhora-to-rnext-merge 
zhora -> rando-next
 2022-08-02 10:40:33 -07:00
briaguya f7abf79bf3 update rando tooltips to utilize auto newlines 2022-08-02 13:26:26 -04:00
briaguya d1ddc2a0c3 Merge branch 'develop-zhora' into zhora-to-rnext-merge 2022-08-02 13:02:13 -04:00