Commit Graph

753 Commits

Author SHA1 Message Date
briaguya
474eee5d98
set morpha reset function in initvars (#881)
Co-authored-by: briaguya <briaguya@alice>
2022-07-24 09:21:38 -04:00
vaguerant
38ecb6cfff
Bug fix: Water Temple gate & bootcommands.c cleanup (#618)
* Vanilla bug fix: child Water Temple gate

* Clean up bootcommands.c
2022-07-24 09:15:33 -04:00
vaguerant
ccf1bffd4f
Timer Savers: Mask Select in Inventory (#670)
* Timer Savers: Mask Select in Inventory

* Merge derp

* Implement suggestions per @briaguya-ai

* Fix cut & paste derp
2022-07-24 09:14:36 -04:00
vaguerant
1de5b72802
L-button cheats disable minimap toggle (#514)
* L-button cheats disable minimap toggle

* Add debug mode to exclusion list

per @briaguya-ai
2022-07-24 09:13:43 -04:00
aMannus
5e2b7acabb Tiny code cleanup 2022-07-24 14:19:37 +02:00
aMannus
b42a282a84 Manually declared rando menu 2022-07-24 14:06:55 +02:00
aMannus
ffa3780d7b Added extra flyout for item fanfares 2022-07-24 12:22:27 +02:00
Sarge-117
70e4f216ed Account for boomerang/hookshot tokens
Fixed the case where you get the token via the boomerang or hookshot.  Done by separating out the code into its own function and then calling it in the two appropriate spots.
2022-07-24 00:53:37 -07:00
Sarge-117
068f3426d7 Account for tokensanity
Added changes to restore small item fanfares to rupees, heart containers, and items when picked up from skulltulas in tokensanity.
2022-07-23 23:25:35 -07:00
briaguya
81d389d0b7
Merge pull request #908 from aMannus/ux-debug-crash-fix
Rando: UX debug config crash fix
2022-07-23 20:08:49 -04:00
aMannus
48d97975a0 Fixed crash 2022-07-24 00:28:54 +02:00
briaguya
8766f24b87
Merge pull request #893 from aMannus/more-ux-changes
Rando: More UX Changes
2022-07-23 14:52:23 -04:00
aMannus
3758d8bb8d Removed bool declaration 2022-07-23 20:36:46 +02:00
aMannus
29b944df92 Fixed incompabitility options (again) 2022-07-23 20:00:32 +02:00
aMannus
f49d397581 Removed unneccesary line 2022-07-23 19:22:22 +02:00
aMannus
2d2d558657 Removed CVar updating in UI 2022-07-23 18:44:15 +02:00
aMannus
59531f89b1 Adressed first comments 2022-07-23 11:28:07 +02:00
Sarge-117
5505d0d284
Merge pull request #6 from Sarge-117/rando-next
Rando next
2022-07-22 23:35:22 -07:00
aMannus
061c8c9fff Small fix handling incompatible options 2022-07-22 21:59:09 +02:00
aMannus
330b025453 Fixed minimum amounts rainbow bridge 2022-07-22 21:35:18 +02:00
aMannus
af877a4cc6 Added +- buttons to sliders 2022-07-22 21:22:04 +02:00
aMannus
0f4e65eb46 Removed unneeded check after UI changes 2022-07-22 19:58:27 +02:00
aMannus
cbf4a9267f Irmproved handling incompatibilities 2022-07-22 18:44:46 +02:00
aMannus
0ee898bd56 Improved disabling of settings
For Skip Child Zelda (and possibly other options in the future)
2022-07-22 12:21:12 +02:00
aMannus
97c37eb46a Changed default values
Shuffle/open settings now align with the first option which makes it the option closest to vanilla.

Also added default values for rainbow bridge settings so they align with the max value instead of 0.
2022-07-22 09:48:30 +02:00
sholdee
bd95fe616b
Disable concurrent builds (#885) 2022-07-22 09:13:38 +02:00
Sarge-117
77eeeb9c81
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares 2022-07-21 22:52:14 -07:00
briaguya
f2b07ac3a9
Merge pull request #879 from briaguya-ai/merge-zhora-into-rando-next
zhora -> rando next
2022-07-21 21:29:13 -04:00
briaguya
cab9499a76
Merge pull request #338 from HarbourMasters/develop-zhora
zhora -> rando-next
2022-07-21 21:05:35 -04:00
David Chavez
d299284751
Merge pull request #878 from dcvz/develop-zhora-merge
Rachael -> Zhora
2022-07-22 03:01:16 +02:00
David Chavez
b3d3148383 Merge branch 'develop-rachael' into develop-zhora 2022-07-22 02:34:55 +02:00
earthcrafterman
2ad78887b9
Added a time saver option to allow players to instantly put items away (#600)
* Added a time saver option to allow players to instantly put items away

Expanded the range of damage multiplication to 80 (20 hearts of damage for each quarter heart) so players can play a sudden death challenge

* The damage sliders are now comboboxes
Damage multiplication is now exponential instead of incremental

The FPS slider is now a text input

* Splitting into solely being a quick putaway PR

* Removed some leftover code from the split
2022-07-22 02:31:49 +02:00
briaguya
623cb35f19
Merge pull request #877 from briaguya-ai/fix-song-only
fix dot song Only vs only issue
2022-07-21 20:21:59 -04:00
David Chavez
1ca12feaed
Adds Xcode project (#769)
* Add Xcode project

Add dynamic lib paths

Generate resources scripts

Fix after rebase

tweak targets

Set min deployment target

* remove project

* readd project with correct gitignore
2022-07-21 20:15:45 -04:00
briaguya
84236e7ac3
stop floor under shadow statue opening immediately (#857)
* stop floor under shadow statue opening immediately

* use ActorResetFunc to reset sStatueRotY

Co-authored-by: briaguya <briaguya@alice>
2022-07-22 02:11:13 +02:00
briaguya
27d37e9d00 fix dot song Only vs only issue 2022-07-21 20:06:19 -04:00
KiritoDev
1cbaa592d0
Added 'Auto' controller backend (#850) 2022-07-22 01:36:28 +02:00
Baoulettes
df756b2ce0
Cosmetics editor - Feature requested (#841)
* Precise positionning, reset margin and pos

* Fix big hearts issues

* add + and - to the editor

* add const to the char*

* Fix labels issues
2022-07-22 01:33:39 +02:00
lilDavid
c7c16c39b0
Add fixes for power crouch stab to the Enhancements menu (#874)
* Add optional fixes for power crouch stab

* Add line break in "Fix Megaton Hammer" tooltip

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2022-07-22 01:22:09 +02:00
vaguerant
059045481c
Controller option: Navi on L (#861) 2022-07-22 01:21:18 +02:00
Christopher Leggett
44dbd3a8a9
Fixes naming discrepancy of textbox positions. (#854)
Equivalent to https://github.com/zeldaret/oot/pull/1329
2022-07-22 01:13:04 +02:00
Jeffrey Crowell
753031df17
allow roms with spaces to be extracted (#868)
using subprocess instead of os.system() is a little safer, and allows
for roms with spaces to be extraced.

i've noticed this is somewhat common in people reporting issues on
discord.
2022-07-22 01:12:43 +02:00
Sarge-117
52f22275e3
Fix Giant's Knife unexpected behaviours (#834)
* Giant's Knife Behaviour Fixes

Fixes a case where Giant's Knife (specifically, breaking and re-buying it) can behave unexpectedly if you don't have a Kokiri Sword in your inventory.  Also fixes the broken icon not showing up in inventory after you break it.

* less whitespace

* fix 0xE check

Accidentally committed with the wrong check

* Move the grayscale code up

Moved the grayscaling portion up higher in the function and renamed "bool not_acquired" to "bool age_restricted".  Thanks to @vaguerant for the suggestion!
2022-07-22 00:39:04 +02:00
Baoulettes
c19beca980
Fast Save Loader crashes fixes (#848) 2022-07-22 00:36:46 +02:00
briaguya
eb49053e73
Prevent unrestricted items camera crash (#852) 2022-07-22 00:35:30 +02:00
RaelCappra
d08b1d277e
Savestate crash fix on Ubuntu (#843) 2022-07-22 00:34:35 +02:00
RaelCappra
e41873fff4
Savestate crash fix on Ubuntu (#843) 2022-07-22 00:34:04 +02:00
briaguya
dfa929a16f
Reset var for shadow boss key room spike walls (#860) 2022-07-22 00:31:26 +02:00
Christopher Leggett
880e3928cf
Fixes odd rando interaction with malon after receiving her check. (#867) 2022-07-22 00:28:43 +02:00
Jeffrey Crowell
41d1bbe137
Fix nullptr dereference in morpha (#870)
reported on discord, i don't have the ability to reproduce this, but it
appears to be a benign fix, as the only time that the tent2 is checked
down later is guarded by a null check.
2022-07-22 00:27:44 +02:00