Commit Graph

2812 Commits

Author SHA1 Message Date
Fredrik Andréasson
023a82e81e * Clear grassIdentity on item drop
* Added check for RC on RandoDraw function
Results in no extra dupe drops, and instantly correct the color of the grass when cut instead of on collecting the item.
2025-01-22 02:16:13 +01:00
Fredrik Andréasson
4a583254a7 * see previous (forgot to stage woops) 2025-01-22 01:25:32 +01:00
Fredrik Andréasson
b39d0a27dc * formatting and removal of dupe lines after merge 2025-01-22 01:24:40 +01:00
Fredrik Andréasson
22e07a59f6 * Renaming and removal of some locs.
* Restructure in z_en_kusa.c to leave vanilla code alone.
* Formatting.
2025-01-22 01:18:23 +01:00
Eric Hoey
bc561efa8e
change RCs to RHTs (#4932) 2025-01-21 16:51:17 +01:00
Fredrik Andréasson
6590f97146 Merge from develop 2025-01-21 16:45:13 +01:00
Malkierian
c781a76e89
Add DMT Cow Grotto Storms Fairy to DMT location access. (#4931) 2025-01-21 10:05:36 +01:00
Pepper0ni
04c0697379
Clean up settings and add boss soul files (#4891)
* Clean up settings and add boss soul files

* address reviews

* didn't realise there was more

* add comment for how to undummy stealth
2025-01-21 06:46:52 +01:00
Philip Dubé
ad9984ef68
pause warp: check player has buttons (#4927)
* pause warp: check player has buttons

* feedback
2025-01-21 06:45:33 +01:00
PurpleHato
26e92a063f
ADD: French translations for rando on file select (#4928)
* French translation for rando file select

* better seed than Seed
2025-01-21 06:45:15 +01:00
Pepper0ni
6f8ac16a9e
Add DMT cow fairy and give overworld misc song fairies hints (#4930) 2025-01-21 06:44:56 +01:00
aMannus
8a5dd6323c
Use textures for boss souls in item tracker (#4925)
* Use textures for boss souls in item tracker

* Fix builds
2025-01-21 00:12:49 +01:00
aMannus
5c4a6ae8c0
Hint purge (#4924) 2025-01-21 00:03:38 +01:00
Philip Dubé
936b159a67
fix 4 warnings (#4922)
1. pragma in cpp
2. missing return
3. unnecessary function call
4. remove impossible null check
2025-01-21 00:03:21 +01:00
Garrett Cox
eab11d7f56
Lock overworld doors Randomizer option (#4489) 2025-01-21 00:03:02 +01:00
aMannus
ded1c721f2
Fix particles (#4923) 2025-01-20 22:37:44 +01:00
aMannus
878a8fe465
Fix boss soul ice traps (#4921) 2025-01-20 22:37:11 +01:00
briaguya
63046a89ec
simplify controllers (#4914)
* start moving towards just using `ShipDeviceIndex::SDLGamepad`

* rename `ShipDeviceIndex` to `ShipDeviceType`

* all sdl mappings are always `ShipDeviceType::SDLGamepad`

* create new `physicaldevice` directory where the new stuff can live

* `ConnectedPhysicalDeviceManager`

* start to not need index mapping manager

* somes fixes and stuff

* remove more shipdeviceindex stuff

* more removing and what not

* axis thresholds

* rename some stuff and remove device icons

* back to all stuff visible

* show connected device names

* bring in mouse color from lus input editor window

* lus

* remove

* more stuff

* more lus

* basic filtering

* update lus

* upstream LUS

* make `Controller_ShouldRumble` make sense
2025-01-20 19:51:39 +01:00
Fredrik Andréasson
30acbe6d39 Merge remote-tracking branch 'hm64/develop' into grassanity 2025-01-20 04:42:42 +01:00
Christopher Leggett
8244d63719
Fix rando menu sliders so they update on JSON drop (#4912) 2025-01-19 18:06:54 -07:00
Christopher Leggett
526aad59d5
Fix the trick options loop (#4917)
It initialized an array with a size, which pre-filled
it all with nullptrs, and then used push_back on top of that.
So it was a bunch of nullptrs followed by the actual
option pointers. Fixed by calling reserve instead of
constructing with a size, so it reserves the memory it needs
without actually filling the vector with nullptrs, so push_back
properly starts from the beginning.
2025-01-19 18:06:42 -07:00
Philip Dubé
ed674f1ed2
mOptionGroups: populate RSG_TRICKS with loop (#4909)
There were some tricks missing, using loop makes one less place to update when adding tricks
2025-01-19 20:49:59 +01:00
Malkierian
7a7eed74db
entrancesMap cleanup (#4905)
* Make spoiler entrancesMap use the same names and display scheme as the entrance tracker.

* Use `Entry` in place of grotto `Exit` and interior `Outside`.
2025-01-19 20:45:30 +01:00
aMannus
2a172de52a
Cosmetics Editor tweaks (#4904)
* Cosmetics Editor Tweaks

* More work on keys
2025-01-19 20:45:07 +01:00
Lord Jabu Jabu
3357543538 Dev Feature - Create VS Code Build tasks and update build documentation (#4895)
* Added vs code build tasks

* Fix typo in BUILDING.md regarding CMake Tools plugin

* Add "Build All" task to VS Code configuration
2025-01-19 13:49:23 -05:00
Fredrik Andréasson
27d9dd2c1a Corrected the 2 JJB locs 2025-01-19 07:28:35 +01:00
aMannus
c466c92905
Uncomment chime on one points (#4901) 2025-01-18 23:54:59 +01:00
Fredrik Andréasson
056b062aa7 Slightly less ghastly color 2025-01-18 21:44:14 +01:00
Fredrik Andréasson
0ac012f56d Hints and additional formatting 2025-01-18 21:03:28 +01:00
Eric Hoey
3061b138fa
pause menu behind advanced + remove from applysideeffects (#4903) 2025-01-18 19:54:52 +01:00
Fredrik Andréasson
6576bd49df Seperated the 2 KF bushes into 4 checks 2025-01-18 17:55:54 +01:00
Fredrik Andréasson
6e699e3e67 Workaround to allow market grass during night 2025-01-18 15:10:56 +01:00
Fredrik Andréasson
f3a0726159 Grottos done 2025-01-18 14:33:31 +01:00
Fredrik Andréasson
8bff058742 Merge branch 'main' into grassanity 2025-01-18 13:39:26 +01:00
Fredrik Andréasson
bc936c31d1 WIP grottos 2025-01-18 13:35:51 +01:00
aMannus
8a5dd022f6
Fix ice trap size not getting reset (#4897) 2025-01-18 11:46:59 +01:00
aMannus
188b9757da
Fix triforce hunt timer (#4896) 2025-01-18 11:46:48 +01:00
aMannus
b4f7d2289a
Play success sound on dropping in spoiler log (#4899) 2025-01-18 11:46:38 +01:00
aMannus
7d2a4e5818
Default "Hide unshuffled shop item checks" to off (#4900) 2025-01-18 11:46:01 +01:00
Archez
d1b7a5b814
Fix new Boss Soul skeleton based items (#4902)
* Fix and tweak boss soul skeleton patterns

* slow down morpha tex scroll

* extern c

* lower kotake a little
2025-01-18 11:45:21 +01:00
Fredrik Andréasson
586fbdd302 Added BotW + MQ locs 2025-01-18 10:41:38 +01:00
Fredrik Andréasson
9a89c6dd1e JJB done minus after big octo 2025-01-18 09:44:26 +01:00
Fredrik Andréasson
047b98cd9e Fixed DC incorrect pos value on 1 loc 2025-01-17 17:28:46 +01:00
Fredrik Andréasson
41b7870614 Added DC + MQ 2025-01-17 16:54:09 +01:00
Fredrik Andréasson
98646ad68f * removed comments in bush actor
* added rest of Deku Tree plus MQ
2025-01-17 02:40:40 +01:00
Fredrik Andréasson
58e24b3b07 Removed old WIP locacc files 2025-01-16 06:32:38 +01:00
Fredrik Andréasson
6df13afccf * forgot to rename the files to grassanity
* updated draw method to fix regrowing grass
2025-01-16 05:49:49 +01:00
Fredrik Andréasson
4cc675ab4b Merge remote-tracking branch 'origin/main' into grassanity 2025-01-16 04:12:24 +01:00
Fredrik Andréasson
4daa372561 * color is a sickly green when containing a check
* added ZR 14 (adult only bush on the platform, not the same?)
2025-01-16 04:09:19 +01:00
Pepper0ni
47fdaabd1b
Update Actor Flags to decomp (#4822) 2025-01-16 04:02:23 +01:00