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
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
Garrett Cox
8c2feb537d
Use 454+cowId to identify cows in randomizer.cpp
2022-08-03 11:26:14 -05: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
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
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
aMannus
8c25e9a992
Added line break ( #958 )
2022-07-31 21:54:26 -04:00
Josh Bodner
7a45380123
Automatically break long tooltip lines ( #925 )
...
* Remove manual newlines from the middle of sentences in tooltips and automatically break long lines instead
* Move split functionality into header so randomizer tooltips can use it
* Rewrite logic to be O(n)
* Found another typo
* Move helper function to libultraship to (hopefully) get Jenkins happy
* Fix typo I made when fixing the typo before
* Remove unneeded header
* Parameterize line length in case variable line length is desired in the future
2022-07-31 21:40:26 -04:00
Christopher Leggett
2f9874c68f
Cleanup.
2022-07-31 19:31:22 -04:00
Nicholas Estelami
3bb234e6a6
Fixed merge issues.
2022-07-31 16:57:04 -04:00
Nicholas Estelami
44bf5af33a
Fixed up merge issues and crash
2022-07-31 16:57:04 -04:00
Nicholas Estelami
0193489b00
RGBA8 CVar Support Added
2022-07-31 16:57:04 -04:00
Nicholas Estelami
a6092c21d4
Merge with develop
2022-07-31 16:57:04 -04:00
aMannus
83d8e1caf4
Code cleanup
2022-07-31 18:26:18 +02:00
aMannus
8b023188a0
Updated default window size to accomodate padding
2022-07-31 18:15:37 +02:00
aMannus
da464c596e
Added padding to rando settings menu
2022-07-31 17:59:51 +02:00
aMannus
ee1bdd6899
Added no logic
2022-07-31 09:30:04 +02:00
PurpleHato
ec468ed6e1
TWEAK: Typo
2022-07-27 23:03:30 +02:00
PurpleHato
1e8f02a3ee
Update randomizer_item_tracker.cpp
2022-07-27 23:01:57 +02:00
Christopher Leggett
e8d2b0cceb
Hopefully fixes build errors on Linux-CI.
2022-07-26 20:46:49 -04:00
Christopher Leggett
5a97e9f0de
Factors away some raw textIDs into an enum with descriptive names.
2022-07-26 20:11:17 -04:00
Christopher Leggett
d0968a99c1
Removes some unneeded function definitions (some of which were already commented out).
2022-07-26 19:25:17 -04:00
