Christopher Leggett
|
75f9775ad8
|
Merge pull request #3769 from HarbourMasters/develop
develop->develop-rando 20231229
|
2023-12-29 18:25:16 -05:00 |
|
Jérémy Lugand
|
a08943edc8
|
Fix typos in scenes_fra.json (#3732)
* Update scenes_fra.json
|
2023-12-29 18:00:06 -05:00 |
|
Pepe20129
|
c860f7a73a
|
Rando: Shuffle Ocarina Buttons (Rando V3) (#3735)
* Shuffle Ocarina Buttons
* Address review
* Add trick names
* Temporarily remove the ocarina button ice trap models
* Update soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
Fix lost closing brackets from merge resolution.
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
|
2023-12-28 14:19:23 -05:00 |
|
Christopher Leggett
|
d58968d196
|
Merge branch 'develop' into merge-develop
# Conflicts:
# soh/soh/Enhancements/custom-message/CustomMessageTypes.h
# soh/soh/Enhancements/debugger/debugSaveEditor.h
# soh/soh/Enhancements/item-tables/ItemTableTypes.h
# soh/soh/Enhancements/mods.cpp
# soh/soh/Enhancements/randomizer/3drando/entrance.cpp
# soh/soh/Enhancements/randomizer/3drando/item_location.cpp
# soh/soh/Enhancements/randomizer/3drando/keys.hpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
# soh/soh/Enhancements/randomizer/3drando/menu.cpp
# soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
# soh/soh/Enhancements/randomizer/3drando/settings.cpp
# soh/soh/Enhancements/randomizer/3drando/settings.hpp
# soh/soh/Enhancements/randomizer/randomizer.cpp
# soh/soh/Enhancements/randomizer/randomizerTypes.h
# soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
# soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
# soh/soh/Enhancements/randomizer/randomizer_entrance.c
# soh/soh/OTRGlobals.cpp
# soh/src/code/z_sram.c
# soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
|
2023-12-10 12:49:15 -05:00 |
|
Ralphie Morell
|
5de2e731c8
|
move boss soul assets
|
2023-11-05 13:33:28 -05:00 |
|
Adam Bird
|
f1f04a5583
|
Add TTS for Game Over menu (#3338)
|
2023-11-05 12:06:21 -06:00 |
|
Adam Bird
|
c61f519f17
|
move soh assets out of otrexporter
|
2023-10-20 20:23:41 -04:00 |
|