Malkierian
cd32181415
Fix incorrect merge conflict resolution.
2025-06-12 22:41:19 -07:00
Malkierian
c2b6942282
clang
2025-06-12 17:57:29 -07:00
Malkierian
2b1322d723
Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop
2025-06-12 17:46:47 -07:00
Jason
62c03abfd4
Updates docs/MODDING.md example to reflect current codebase ( #5558 )
...
* Update docs/MODDING.md change example to reflect current codebase
* Changes to MODDING.md (#5558 ): fixes slight typo
* Changes to MODDING.md (#5558 ): fix typo and remove uneeded explanation that minimum and maximum are floats
2025-06-12 13:39:21 -07:00
Malkierian
bf3add7a72
Re-add ShipInit::InitAll() to the end of applyPreset(). ( #5574 )
2025-06-12 13:24:19 -07:00
Philip Dubé
9432b3420b
tts: only announce timer at 10s intervals ( #5559 )
...
* tts: only announce timer at 30s
1. reading out every second doesn't have enough time to even say more than a number
2. tts is hard to hear the rest of the game over while it's counting non stop
* under a minute announce every 10s
2025-06-12 13:23:47 -07:00
Pepper0ni
c7e3e08f8d
Fix club moblins moving out of bounds and remove them from the no-clear-room list ( #5569 )
2025-06-12 13:23:42 -07:00
Jerom Venneker
1fe3871f6c
Added automatic move to name entry after connecting and scouting
2025-06-12 21:52:47 +02:00
Philip Dubé
52debea44b
Difficulty: CuccosToReturn ( #5552 )
...
* Difficulty: CuccosToReturn
Mirrors rando option
* remove RSK_CUCCO_COUNT
* revert forcing rando to at least 1
2025-06-11 14:41:54 -07:00
Malkierian
69792e9717
Save and Randomizer Version Control ( #5557 )
...
* Add version control for Rachael saves and old rando saves.
* Change spoiler drop success sound to puzzle success chime.
Add spoiler drop fail sound (sys_error).
Improve path sanitizer operation.
Add check for a spoiler having a version and it equaling running version. Deletes spoiler CVar if spoiler becomes unusuable while running, and prevents loading dropped spoilers that don't match.
* clang
* Remove backslash escaping from Sanitize.
Remove duplicate Sanitize from Context and make it use SohUtils.
Fix typo.
2025-06-11 14:39:15 -07:00
Philip Dubé
07328a0ecb
remove leftover No Dampe Fire checkbox ( #5561 )
...
got moved to difficulty dropdown
2025-06-11 14:38:34 -07:00
Philip Dubé
af99ef8e07
Hookify TreesDropSticks ( #5566 )
...
* Hookify TreesDropSticks
* fix off by one
2025-06-11 14:38:12 -07:00
Rozelette
dbc2ff09b5
Convert actor health bars to use ObjectExtension ( #5565 )
2025-06-11 14:37:34 -07:00
Malkierian
0b9fe2d9b9
Fix Search Crash from Scrolling ( #5571 )
...
* Fix search crashing when section child scrolled too far.
* clang
2025-06-11 14:35:57 -07:00
Eric Hoey
ad850e50b1
prevent OOB write for BGM fix in grotto mixed pools ( #5572 )
2025-06-11 14:35:49 -07:00
Jerom Venneker
0fe29b4a20
Added menus for creating an archipelago file
2025-06-11 21:35:03 +02:00
Jerom Venneker
29a661994a
Merge branch 'aManchipelago' into AddArchipelagoClientLib
2025-06-08 13:32:36 +02:00
Jerom Venneker
c1ac635bea
Added PostLoadGame hook, so item synching hooks can get fired after they've been subscribed to in hook handlers
2025-06-06 14:42:42 +02:00
aMannus
102585c434
Merge pull request #71 from jeromkiller/AddArchipelagoClientLib
...
Add archipelago client lib
2025-06-06 08:50:36 +02:00
aMannus
a6503386a5
Merge branch 'develop' into aManchipelago
2025-06-06 08:48:40 +02:00
Pepe20129
abb0a93945
Add Anubis, Flare Dancer, Skull Kid & Spear Moblin to enemy randomizer ( #5483 )
...
* Add Anubis, Flare Dancer, Skull Kid & Spear Moblin
* Include spear moblins and exclude flare dancer in clear rooms
* Exclude anubis from clear rooms
* Fix skull kill issues
* Clang format
* Address review
* Use hook
* Update z_en_mb.c
2025-06-04 18:07:57 -07:00
Philip Dubé
5b2c30edb0
Faster water temple gate ( #5556 )
...
* rando: faster water temple gate
* move to time saver
2025-06-04 17:09:06 -07:00
nclok1405
3377dc636a
Default to Hiragana keyboard when playing in Japanese ( #5543 )
...
* Default to Hiragana keyboard in Name Entry screen when playing in Japanese (NTSC behavior)
* clang-formated
2025-06-04 17:08:50 -07:00
Philip Dubé
3a60c3f651
SkipAmyPuzzle ( #5550 )
2025-06-04 17:08:36 -07:00
Philip Dubé
56a53e9fac
consolidate RAND_GET_OPTION ( #5553 )
2025-06-04 17:08:27 -07:00
Jerom Venneker
fb0bf1be45
Added setting of flags when externaly checking
2025-06-04 21:03:34 +02:00
Jerom Venneker
5e821ca641
Fixed items from other games not scouting and recieving right
2025-06-02 20:21:17 +02:00
Jerom Venneker
53d6374c6c
Fixed issue where client crashes when collecting item while offline
2025-06-02 19:19:13 +02:00
Jerom Venneker
b6990d92bf
Added Rounded corners to text entry field
2025-06-02 19:17:13 +02:00
Jerom Venneker
bf85a85aba
Merge remote-tracking branch 'fork/aManchipelago' into AddArchipelagoClientLib
2025-05-31 01:03:29 +02:00
aMannus
df525c2f1e
Merge branch 'develop' into aManchipelago
2025-05-30 23:49:18 +02:00
Pepe20129
f5d8f1eece
Add ShuffleSongs.cpp & RO_SONG_SHUFFLE_OFF ( #5534 )
...
* ShuffleSongs.cpp
* Address review and fix build
* Update soh/soh/Enhancements/randomizer/settings.cpp
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com >
* Change back to "Off"
---------
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com >
2025-05-30 12:51:21 -07:00
Jerom Venneker
a2e7b21155
Fixed quote typo
2025-05-30 20:18:07 +02:00
aMannus
11d055c3f1
Fix windows build
2025-05-30 19:14:01 +02:00
aMannus
bbfcf8789c
Merge pull request #70 from jeromkiller/AddArchipelagoClientLib
...
Add archipelago client lib
2025-05-30 18:59:33 +02:00
Jerom Venneker
03c93484fd
Added Error messages when attempting to send messages while disconnected and when attempting to use local commands
2025-05-30 11:36:34 +02:00
Malkierian
40fa3c8d64
Convert RandomizerInf to the dynamic #define model to allow for automatic string names. ( #5537 )
2025-05-29 19:14:32 -07:00
Jerom Venneker
497700fe6a
Added textbox to console window for chatting and server commands
2025-05-29 19:38:38 +02:00
Pepe20129
40da9997c5
Fix some dark link issues ( #5532 )
2025-05-29 07:51:35 -07:00
Philip Dubé
2b360d4bbe
Rebottle Blue Fire ( #5375 )
...
* Rebottle Blue Fire
* hookify
2025-05-29 07:06:53 -07:00
Jerom Venneker
7d49cb1281
Refactor so apclientpp.h doesn't have to be included a second time
2025-05-29 00:00:13 +02:00
Jerom Venneker
422b7d1950
Added proper archipelago textclient colors to the console
2025-05-28 22:52:14 +02:00
Jerom Venneker
cc40d3ca86
Moved hooks to Registration function and improved item queue filtering
2025-05-28 15:15:46 +02:00
Jerom Venneker
747da8d6b7
Added auto disconnect if loading a save accosiated with the wrong slot
2025-05-28 14:53:59 +02:00
Jerom Venneker
d9d453501e
Corrected spelling on receive
2025-05-28 10:30:58 +02:00
Jerom Venneker
7a8a5a19a0
Don't Send or queue Unknown checks. Todo, figure out what triggers sending one
2025-05-28 10:21:24 +02:00
Hunter Marshall
fc10e36cdb
Fix minor mistakes in region table ( #5545 )
...
* Fix minor mistakes in region table
* Update soh/soh/Enhancements/randomizer/location_access/dungeons/ice_cavern.cpp
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com >
---------
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com >
2025-05-27 14:34:36 -07:00
aMannus
d8a9355846
Merge pull request #69 from jeromkiller/AddArchipelagoClientLib
...
Add archipelago client lib
2025-05-27 23:18:17 +02:00
aMannus
9d3ea502bb
Implement rewards gcbk settings & fix shopsanity
2025-05-27 23:12:01 +02:00
Pepper0ni
f0e36c2694
Fix failure to assign areas to regions on initial spoiler load ( #5540 )
2025-05-27 13:19:30 -07:00
