Commit Graph

762 Commits

Author SHA1 Message Date
Garrett Cox
8c2feb537d Use 454+cowId to identify cows in randomizer.cpp 2022-08-03 11:26:14 -05:00
Garrett Cox
25a272ce0c Fix shuffle cows bug from copy paste 2022-08-03 09:07:38 -05:00
Garrett Cox
723e34a06a Move some flags around and use global array instead of flag for shuffle cows 2022-08-03 08:44:48 -05:00
Garrett Cox
c18203878b Add shuffleCows options for randomizer 2022-08-03 00:14:38 -05: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
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
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
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
InfoManiac742
206f63f9e6
Fix build link in README (#944)
Currently leads to a 404 page since there's no longer a branch called "develop", I've just sent it to the main page for the builds site
2022-07-31 21:48:43 -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
GaryOderNichts
99ecccfaab
Save scarecrow songs as OcarinaNotes (#918) 2022-07-31 21:39:24 -04:00
PurpleHato
7dd6f59b8b
TWEAK: added 360hz support (#896)
* FIX: Increased the maximum actor limit for draw distance

Fix issue #529

* TWEAK: added 360hz support

Has been asked by an user who have a fancy 360hz laptop refresh rate
https://www.androidauthority.com/asus-rog-ces-2021-1191928/

* TWEAK: Forgot one value
2022-07-31 21:38:40 -04:00
vaguerant
361a986b8e
Add bottle swipes to Fast Drops; rename to Skip Pickup Messages (#847)
* Add bottle-swipes to Fast Drops; rename to Fast Pickups

* More freecam friendly

* Resolve freecam interaction

* Rename to "Skip Pickup Messages"
2022-07-31 21:37:47 -04:00
Sarge-117
b98c8b4abb
Minor enhancement: Allow toggling on equipment screen (#813)
* Allow Equipment Toggle

Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.

* Set up Cvar and check for MS

Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
2022-07-31 21:35:05 -04:00
David Chavez
582f084973
Use tex sizes from texture rather than hardcoded values (#610)
* Use tex sizes from texture rather than hardcoded values

* Dynamic do action tex sizes

* Remove unused minimap texture keys

* Restore MESSAGE_STATIC_TEX_SIZE

* Use dynamic offsets

* MACRO it up

* Enable SPDLOG in Xcode

* Handle non-existent texture
2022-07-31 21:32:40 -04:00
Nicholas Estelami
47ad3bdc47 Fixed linux compile issue 2022-07-31 16:57:04 -04:00
Nicholas Estelami
9d12813282 Fixed merge/rebase issues 2022-07-31 16:57:04 -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