mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 14:51:46 -05:00
Code Issues Projects Releases Wiki Activity
1,414 Commits 3 Branches 38 Tags
Commit Graph

461 Commits

Author SHA1 Message Date
Garrett Cox
f7267be29a Change shuffle cows to checkbox and remove extra line 2022-08-07 02:10:54 -05:00
briaguya
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs 
Shuffle frog song rupees
 2022-08-07 02:13:24 -04:00
Garrett Cox
ea9d76621c Fix issue with keysanity values not loading from spoiler file 2022-08-06 22:01:55 -05:00
Christopher Leggett
cfce0eba3d
Implements fixes for competing getItem calls. 2022-08-06 22:51:15 -04:00
lilDavid
c8289f5946 Skip lines in Adult Trade Shuffle description 2022-08-06 15:38:32 -05:00
Garrett Cox
77f2e56039 Support starts with and more options on ganons boss key 2022-08-06 14:07:46 -05:00
lilDavid
f41b939a71 Only show adult trade items in the save editor if they're shuffled 2022-08-06 12:58:21 -05:00
lilDavid
6603a9a474 Add adult trade shuffle to randomizer 2022-08-06 12:58:08 -05: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
Garrett Cox
b420638267 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-06 00:48:55 -05:00
Garrett Cox
5346217af3 Misc fixes 2022-08-06 00:29:05 -05:00
briaguya
61c88386a1 Merge branch 'develop-zhora' into zhora-to-next 2022-08-06 00:26:50 -04:00
Garrett Cox
4a78375c8f And like magic, keysanity working :D 2022-08-05 23:08:46 -05:00
briaguya
97d363c91e
Merge pull request #1019 from garrettjoecox/shuffleCows 
Add shuffleCows options for randomizer
 2022-08-06 00:03:27 -04:00
Garrett Cox
9a145221ec Remove newline 2022-08-05 21:02:02 -05:00
Garrett Cox
528dbcdc17 More suggested changes 2022-08-05 14:59:04 -05:00
Garrett Cox
5de662a326 Fix ice traps 2022-08-05 12:05:22 -05:00
Garrett Cox
ed3cddbeaf Add option to shuffle frog song rupees 2022-08-05 09:52:11 -05:00
Garrett Cox
11d7a78e62 More changes from suggestions 2022-08-05 01:38:45 -05: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
Garrett Cox
e9d1bf2d56 Initial work for keysanity 2022-08-04 22:28:21 -05: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
Garrett Cox
587147dc40 Remove count of cows from tooltip 2022-08-04 19:44:08 -05:00
Garrett Cox
ebcf574085 Use Randomizer_GetItemIdFromKnownCheck instead for shuffleCows 2022-08-04 19:42:58 -05:00
briaguya
2d22099805
Merge pull request #1039 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-03 21:02:29 -07:00
Christopher Leggett
1da655adb5
Resolve merge conflicts with develop-zhora 2022-08-03 23:13:53 -04:00
Garrett Cox
8c2feb537d Use 454+cowId to identify cows in randomizer.cpp 2022-08-03 11:26:14 -05: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
c18203878b Add shuffleCows options for randomizer 2022-08-03 00:14:38 -05:00
Kenix3
352b46c1f5 LUS Cleanup: Console class is now in the Ship namespace 2022-08-02 22:54:38 -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
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
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
briaguya
ac776ce7bc Merge branch 'develop-zhora' into zhornext 2022-08-02 15:49:59 -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
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
Christopher Leggett
480053dfaa
Exposes FormatCustomMessage and uses it in FormatJsonHintText. 2022-08-01 23:05:29 -04:00