Garrett Cox
c18203878b
Add shuffleCows options for randomizer
2022-08-03 00:14:38 -05: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
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
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
