David Chavez
e519caa554
Merge pull request #871 from jbodner09/fix-zelda-skip
...
Fix Child Zelda Skip rando setting always on
2022-07-22 00:23:53 +02:00
briaguya
6df2a03fd2
Merge pull request #875 from aMannus/ux-fixes
...
Fixed rename breaking maps/compasses
2022-07-21 14:51:31 -04:00
Josh Bodner
1d208c7dc2
Revert to using boolean in json
2022-07-21 11:04:37 -07:00
Josh Bodner
2edc81ee2d
Attempt to restore formatting of randomizer.cpp
2022-07-21 11:03:28 -07:00
Christopher Leggett
21c585b2ce
Removes randomizer_custom_messages, as I relocated its logic elsewhere.
2022-07-21 13:10:04 -04:00
Christopher Leggett
b5dc097587
Cleanup and move most hint logic to CustomMessage.
...
Haven't removed where rando stores the hints for itself and the ganon and altar hints are still pulled from the randomizer class' local storage, but gossip stone hints are pulled from the custom message table now.
2022-07-21 13:05:15 -04:00
aMannus
6f082e1769
Fixed rename breaking maps/compasses
2022-07-21 17:32:28 +02:00
briaguya
b16a96fbad
Merge pull request #862 from aMannus/spoopy-spiders
...
Rando: Add skullsanity and nighttime GS tokens require Sun's Song
2022-07-21 06:38:58 -04:00
aMannus
8f89b969cb
Tiny code cleanup
2022-07-21 12:25:16 +02:00
aMannus
9ce552659a
Changed iceTrapped var name/type and tooltip
2022-07-21 12:22:36 +02:00
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
Josh Bodner
cddca2700a
Move Child Zelda spoiler write out of for loop so it's not repeatedly hit
2022-07-20 23:08:57 -07:00
Josh Bodner
17b3f65276
Fix the issue for real
2022-07-20 22:57:18 -07:00
Josh Bodner
75a4d2cf99
Actually use the same strings everywhere lol
2022-07-20 21:50:55 -07:00
Josh Bodner
795ee54f2b
Remove use of std::format since Jenkins doesn't like it
2022-07-20 21:44:32 -07: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
Josh Bodner
3633bdeeaf
Fix Child Zelda Skip rando setting always on
2022-07-20 19:57:38 -07: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
Christopher Leggett
c5f66373c3
Adds ability to store and retrieve textbox size and position.
2022-07-19 22:51:39 -04:00
Christopher Leggett
2d1aa1d13a
Merge in develop-zhora
2022-07-19 20:28:21 -04: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
Sarge-117
ceef852a9a
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares
2022-07-19 10:56:20 -07: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
Christopher Leggett
32abe61554
Implements a basic CreateMessage function for non-GetItem text.
2022-07-19 00:31:37 -04: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
Sarge-117
d9f4314f5c
Undo accidental commit
...
I'm a dummy and accidentally committed changes from other branches I was working on.
2022-07-18 19:01:47 -07:00
Sarge-117
3ab3e962d3
Merge branch 'test' into rando-quest-item-fanfares
2022-07-18 18:50:13 -07:00
Sarge-117
cb1b725cda
Shorten code
...
Shortened the code
2022-07-18 18:39:24 -07:00
Sarge-117
2133fe97dd
Merge branch 'HarbourMasters:develop' into test
2022-07-18 16:48:29 -07:00
Sarge-117
b4291516b6
Merge branch 'HarbourMasters:develop' into rando-quest-item-fanfares
2022-07-18 16:48:01 -07:00
