aMannus
37134cbc9a
Fixed ice traps (maybe actually this time)
2022-07-21 08:30:48 +02:00
aMannus
2c5bdbfd4b
Merge branch 'rando-next' into spoopy-spiders
2022-07-21 08:30:31 +02:00
briaguya
76215b8fc6
Merge pull request #872 from briaguya-ai/fix-starting-inventory
...
fix starting inventory
2022-07-20 23:47:27 -04:00
briaguya
1944b68d19
fix starting inventory
2022-07-20 23:36:39 -04:00
aMannus
a7936942b1
Fixes for double spiders & ice traps
...
getItemId should've been set earlier to make sure double spiders didn't screw up ice traps.
Additionally Item_Give() was still being called with skultulla tokens as the default value so it granted a token when picking up an ice trap.
Skulltula freeze was also happening on ice traps which it shouldn't do, so that's fixed now too.
2022-07-20 22:47:25 +02:00
aMannus
0cc59a9370
Fix for spooders to overwroote each ooder
2022-07-20 17:15:22 +02:00
aMannus
3be2dbd005
Added nighttime GS sun's song option
2022-07-20 14:33:12 +02:00
aMannus
36d451eb85
Add setting tooltip and fixed an oopsie
2022-07-20 14:07:01 +02:00
aMannus
715a4f7315
Added all remaining tokens(?)
2022-07-20 13:37:28 +02:00
aMannus
5c25364eff
Nother batch of spooders
2022-07-20 11:56:03 +02:00
aMannus
bee6fdb8ba
Small fix after UX merge
2022-07-20 11:04:01 +02:00
aMannus
a4af34c8dc
Merge branch 'rando-next' into spoopy-spiders
2022-07-20 10:58:53 +02:00
aMannus
bfd76dc244
Added comment
2022-07-19 23:20:05 +02:00
briaguya
670f84e183
Merge pull request #674 from aMannus/rando-settings-overhaul
...
Rando: Randomizer Settings Menu UX Rework
2022-07-19 17:04:02 -04:00
aMannus
69de5ac14a
Fixed all possible ice trap scenarios
2022-07-19 22:29:52 +02:00
aMannus
16e676d2d0
Removed some spaces that were missed
2022-07-19 16:57:54 +02:00
aMannus
27ac523b14
Fix after dev merge
2022-07-19 16:47:49 +02:00
aMannus
75ab2f7780
Removed temporary bunny hood change
2022-07-19 13:36:12 +02:00
aMannus
51dae73387
Merge branch 'develop-zhora' into spoopy-spiders
2022-07-19 13:33:45 +02:00
aMannus
0e4169ee84
Revert "Revert "Merge branch 'develop-zhora' into rando-settings-overhaul""
...
This reverts commit 109485188cfc8c47698ebb53b009cf852a17ef58.
2022-07-19 13:09:24 +02:00
aMannus
1c384c5b3e
Revert "Merge branch 'develop-zhora' into rando-settings-overhaul"
...
This reverts commit 55f114e3d499f510eadab5f918b7eb95fd9dd249, reversing
changes made to 2809cd01dffb7f1a1df1068adaae8f2b1b44ae85.
2022-07-19 13:09:24 +02:00
aMannus
02d0b354a1
Copied over files from old branch
...
Dev merge made it so I couldn't easily merge into the old branch, so this is the next best thing.
2022-07-19 13:09:24 +02:00
briaguya
3921e61e87
Merge pull request #844 from HarbourMasters/develop
...
quick dev -> rando-next
2022-07-18 23:39:55 -04:00
PurpleHato
235cef6abf
FIX: RetrictItem SunSong issue ( #839 )
...
Thanks @vaguerant
2022-07-18 22:47:37 -04:00
MelonSpeedruns
e871b53afc
Free cam collision v2 ( #836 )
2022-07-18 22:47:23 -04:00
briaguya
fc5776053e
Merge pull request #842 from HarbourMasters/develop
...
dev -> rando-next
2022-07-18 22:10:27 -04:00
qurious-pixel
dabb83fccf
[APPIMAGE] Use GUI dialog boxes ( #829 )
...
* [APPIMAGE] Use GUI dialog boxes
* [APPIMAGE] Adjust timing
2022-07-18 19:34:08 -04:00
GaryOderNichts
046b7e8949
Include game version in linux otr builds ( #826 )
2022-07-18 19:33:36 -04:00
GaryOderNichts
97d1f0e46c
Fix ZAPDTR linking order for linux builds ( #825 )
...
* Fix ZAPDTR linking order for linux builds
* Fix linking on macos
2022-07-18 19:32:15 -04:00
Andrew Van Caem
edfa369639
Add yShift position when displaying the positions of cylinders ( #823 )
2022-07-18 19:31:52 -04:00
Christopher Leggett
169f757954
Fixes ice trap chests to have short chest animations ( #817 )
2022-07-18 19:31:04 -04:00
David Chavez
4745f73655
[macOS] Bring support down to macOS 10.15 ( #816 )
...
* Pull out CC and CXX flags
* Set minimum deployment target
* Update version to 3.0.0
2022-07-18 19:30:29 -04:00
GaryOderNichts
660897ff63
Avoid UB on ocarinaAction shifts ( #809 )
2022-07-18 19:29:24 -04:00
David Chavez
37afdbd84c
Fix: Respect Config Window Resolution ( #807 )
...
* Fix regression witn using config window res
* Fix fullscreen presets
2022-07-18 19:28:12 -04:00
Baoulettes
9679075cba
- + button optionnal for Int and float sliders ( #803 )
2022-07-18 19:26:01 -04:00
Josh Bodner
5e5e57ea8f
Add Windows x64 build instruction ( #800 )
2022-07-18 19:25:11 -04:00
PurpleHato
9118788149
ADD: SaveEditor Edit current D-Pad Item ( #799 )
...
* ADD: Dapd on "current Dpad equip
* TWEAK: Spelling
* TWEAK: Shows it only if gDpadEquips is enable
* TWEAK: Forgot one "D-pad"
* TWEAK: Spacing
2022-07-18 19:24:56 -04:00
Ada
cc28a1444d
Update README.md ( #796 )
2022-07-18 19:24:20 -04:00
Ada
c65a40f432
Adds tooltip to free camera ( #795 )
2022-07-18 19:23:28 -04:00
briaguya
9e8335c1f0
fix non-rando non-3d-drops small key crash ( #789 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-07-18 19:22:12 -04:00
qurious-pixel
10cb23ad74
[APPIMAGE] LibFuse removal fix ( #780 )
...
* [APPIMAGE] LibFuse removal fix
* [APPIMAGE] LibFuse 2 fix
Keep Original App name
2022-07-18 19:21:47 -04:00
KiritoDev
2daddd8a5a
Added renderer api switch dropdown ( #775 )
...
* Added renderer api switch
* Joined backend api and names into a pair
* Added close button on input editor
2022-07-18 19:21:31 -04:00
briaguya
d45968270a
Address rando pr comments ( #742 )
...
* prefix randomizer methods with Randomizer_
* make filename a local var
* remove unused file, update malon to use new names
* move randomizertypes to randomizer directory
* rename to Randomizer_GetSettingValue
Co-authored-by: briaguya <briaguya@alice>
2022-07-18 19:20:07 -04:00
aMannus
3a11aa08bb
Added v1 ice traps and fixed some tokens
2022-07-18 23:55:44 +02:00
aMannus
3341c3d404
Another batch of spooders
2022-07-18 11:08:35 +02:00
aMannus
06c3c2ba67
Fixed mistake
2022-07-18 09:10:36 +02:00
aMannus
3b747b41be
Cleanup and freeze fix
...
Don't freeze the player when the skulltula token check is something else than a token. Also some cleanup and declaring variables more globally within z_en_si.c
2022-07-18 09:05:32 +02:00
aMannus
0da14603e2
Freeze fix/first batch of skull actors
2022-07-17 23:50:48 +02:00
aMannus
4ccd4d5895
Exposed static table to change skulltokens
...
This static table is normally only used within z_player.c, but is needed to switch the itemId to something Item_Give() can use and to set the correct TextId.
2022-07-17 16:02:27 +02:00
aMannus
0f1f8c15f2
Closer but not yet
2022-07-16 12:20:53 +02:00
