mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-14 21:45:16 -05:00
Code Issues Projects Releases Wiki Activity
1,113 Commits 3 Branches 37 Tags 141 MiB
525dcca499
Commit Graph

1113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christopher Leggett
d80742d882
Adds documentation comments to CustomMessageManager.h 2022-08-02 19:32:59 -04:00
briaguya
4dfd2e5c32
Merge pull request #1011 from PurpleHato/randodupe 
TWEAK: French dup entry
 2022-08-02 16:20:41 -07:00
Christopher Leggett
a007bfd14a
Merge changes from develop-zhora 2022-08-02 19:17:08 -04: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
briaguya
cdef05a871
Merge pull request #987 from aMannus/better-rando-settings-padding 
Rando: More UX improvements (padding, menu layout)
 2022-08-02 07:45:51 -07:00
David Chavez
61c68666d6
Closer align Makefiles & Dockerfiles (#748) 2022-08-02 16:22:20 +02:00
briaguya
646237c4ce
Merge pull request #921 from PurpleHato/RandoItemTrackerNotesSpace 
ADD: Rando Item Tracker Personnal Note space
 2022-08-02 05:22:29 -07:00
aMannus
c404d95b67 Adressed review comments 2022-08-02 13:38:17 +02:00
aMannus
e479cb424b Moved logic rules dropdown 2022-08-02 12:35:52 +02:00
aMannus
44522e6518 merge rando-next 2022-08-02 12:31:24 +02:00
briaguya
491fe8e84d
Merge pull request #985 from aMannus/rando-no-logic-option 
Rando: Added no logic option
 2022-08-02 03:25:03 -07:00
briaguya
412264050a
Merge pull request #746 from Sarge-117/rando-quest-item-fanfares 
Rando: Item Fanfares
 2022-08-02 03:24:36 -07:00
briaguya
bf6ef1344e
Merge pull request #915 from aMannus/rando-enhancements-menu 
Rando: Added extra flyout for item fanfares
 2022-08-02 03:23:59 -07: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
Christopher Leggett
bfdf814a1f
Implements new getItem table in game. 2022-08-01 21:03:58 -04:00
David Chavez
4ed82c71dc Fix c++20 clang issue 2022-08-01 17:16:03 -04:00
aMannus
7b1b362e5a More styling & layout changes 2022-08-01 13:23:21 +02:00
aMannus
f7b8ad7eee Some more padding 2022-08-01 08:50:11 +02:00
Christopher Leggett
4a87ed709b
Adds ItemTableManager class. 2022-07-31 23:26:48 -04:00
Garrett Cox
9389ceb8c1
Speed up lifting silver rocks and obelisks by 5x (#953) 
* Speed up lifting silver rocks and obelisks by 3x

* Increase rock lifting speed to 5x

* Fix bug that sped up picking up small rocks, grass, bombflowers

* Add enhancement checkbox for faster block lifting and reduced speed to 3x
 2022-07-31 22:09:30 -04:00
David Chavez
b4f4e36acb
[macos] Disable buggy resolution scaling (#982) 2022-07-31 22:08:10 -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
Christopher Leggett
b59c9cdf02
Randomizer: Fixes LACS and Prelude checks under certain conditions (#961) 
* Prevents LACS flag from getting set when it shouldn't be.

* Fixes Prelude and LACS checks so they apply immediately if missed.

* Refactors the scene-flag-setting code into its own function.

* Renames new enums and props to be clearer and not specific to scene flags.

* Refactors pendingFlag data into a separate struct.
 2022-07-31 21:57:30 -04:00
aMannus
8c25e9a992
Added line break (#958) 2022-07-31 21:54:26 -04:00
Kenix3
4f29833476
Adds beta quest Gameshark cheat. (#975) 
* Adds beta quest Gameshark cheat.

* Fixes issue where lus was including a function from soh.

* Limits beta quest to 0-8
 2022-07-31 21:52:10 -04:00
Garrett Cox
d648c7275c
Hide Dpad in minimal UI (#955) 2022-07-31 21:51:36 -04:00
KiritoDev
a1ed35e5bd
Fixed slowdown on dodongo (#945) 
* Fixed slowdown on dodongo

* Invalidate only works on pc

* Added todo comment
 2022-07-31 21:49:54 -04:00