Commit Graph

3348 Commits

Author SHA1 Message Date
aMannus
b700e0cc5f Fix market death crash & no logic parse, limit archi console lines 2025-07-06 23:25:07 +02:00
aMannus
80b0d036d7 Fix death link crash 2025-07-05 14:45:59 +02:00
aMannus
33bdd06bfc typo fix 2025-07-04 15:06:14 +02:00
aMannus
5ebc20c0a6 linxu pls? 2025-07-04 15:05:13 +02:00
aMannus
524a26f759 Hopefully fix linux + clang_format 2025-07-04 14:24:33 +02:00
aMannus
59993c75be Force on skip child zelda 2025-07-04 14:17:13 +02:00
aMannus
1b9e03b92f Merge branch 'develop' into aManchipelago 2025-07-04 13:22:17 +02:00
aMannus
4aacc1bc0c Temporarily disable skull token flag setting 2025-07-04 11:49:45 +02:00
aMannus
50af166a84 Daeth link done 2025-07-04 10:28:21 +02:00
aMannus
427b5aa25c Fix archi connection cvar & stop normal rando gen with archi 2025-07-02 15:40:16 +02:00
aMannus
c06f7bda75 Implement archi and hide rando hash in archi save 2025-07-02 15:11:07 +02:00
aMannus
500481f75f Rewrite notifications to eliminate flicker with many in the queue 2025-07-02 14:34:51 +02:00
Malkierian
237dcfec74 Move all maps from Menu.h to the source files that use them. (#5644) 2025-07-01 17:40:42 -07:00
aMannus
53118cc9e3 Improvements in connection UI + random cleanup 2025-07-01 23:00:58 +02:00
aMannus
53a1aa3d3f Remove archi debug mode 2025-07-01 22:01:41 +02:00
aMannus
d1070397c1 Merge branch 'aManchipelago-QuestSelect' into aManchipelago 2025-07-01 21:07:09 +02:00
aMannus
7887d888c4 Quest select changes 2025-07-01 21:07:01 +02:00
Philip Dubé
ec54d02c0c Spirit Flags (#5631)
1. skip cutscene delay for sun on floor & sun on block
2. persist sun on floor temp flag
3. persist big mirror being solved before platform lowered

2 removes need for weird bomb key logic
3 needed for shuffle doors
2025-07-01 12:04:26 -07:00
Philip Dubé
cddc7353af tts: replace rupee count with key count in dungeons (except first 3 child dungeons) (#5642) 2025-07-01 10:54:39 -07:00
aMannus
48d2193fec CrowdControl additions & improvements (#5104)
* CrowdControl additions & improvements

* Update after dev merge

* clang format

* Revert "clang format"

This reverts commit 1be5ad18f5995792971fa0a1772109b0157817b4.

* clang format
2025-07-01 10:54:26 -07:00
Philip Dubé
05a7f728e7 dev tools save editor: change dungeon drop down to current dungeon (#5635) 2025-07-01 10:30:02 -07:00
aMannus
0e9a382232 More specific checks for skipping GIs for special cases 2025-07-01 14:20:32 +02:00
aMannus
cd90410489 Merge branch 'pr/73' into aManchipelago-QuestSelect 2025-07-01 09:49:21 +02:00
aMannus
db58c3a029 Fix clang-format ps1 script (#5637)
* Fix clang-format ps1 script

* use path variable
2025-06-30 16:56:55 -07:00
Philip Dubé
f80836d8b7 Enemy Randomizer: all the invis (#5621)
Fire Keese, Floormaster, Ice Keese, Keese, Redead, Stalfos
2025-06-30 14:52:45 -07:00
Philip Dubé
928bb7767b reduce logical implications of closed forest (#5626)
* reduce logical implications of closed forest

closed forest should only be about kokiri blocking the way,
no need to try plug alternate forest escapes out

* revert adult deku being unlocked in forest without showing mido sword/shield
2025-06-30 14:52:02 -07:00
Malkierian
96d3b480b1 Merge pull request #5638 from Malkierian/blair-dev-6-30
Blair->Dev 6/30
2025-06-30 14:31:30 -07:00
aMannus
3e06696441 Fix spoiler loading, setting more defaults, archi console crash fix + styling 2025-06-30 23:30:32 +02:00
Malkierian
7f3d2adc63 Fix whitespacing in presets. 2025-06-30 13:04:51 -07:00
Malkierian
015dcf2af1 Fix typo. 2025-06-30 10:58:49 -07:00
Jerom Venneker
786b7481c4 Added Disconnecting from the server when selecting new game and backing out of name select 2025-06-30 19:34:45 +02:00
Malkierian
30d1932354 Re-add new preset items to new preset files. 2025-06-30 09:37:02 -07:00
Malkierian
002e8e9f09 Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop 2025-06-30 09:28:11 -07:00
aMannus
abe682e0f2 clang-format 2025-06-30 11:40:20 +02:00
Malkierian
32683e2a74 Change early return in CheckTrackerLoadGame to check specifically for Boss Rush instead of Not Rando. (#5634) 2025-06-29 19:12:04 -07:00
Philip Dubé
063fb2577f cleanup, trying to speed up build (#5627) 2025-06-29 18:21:47 -07:00
Malkierian
16c3cb1adf Tracker circle (#5632)
* Fix item tracker circle display.

* Add .o2r to .gitignore.

* clang
2025-06-29 18:06:21 -07:00
aMannus
ae17e572a0 Hard code custom prices for scrubs/shops for now 2025-06-30 00:13:03 +02:00
aMannus
2e496d1666 Merge pull request #72 from jeromkiller/AddArchipelagoClientLib
Add archipelago client lib
2025-06-29 23:53:46 +02:00
aMannus
dc76883a56 Implement get item messages 2025-06-29 23:49:38 +02:00
Philip Dubé
112fbc5a4b trick: ledge clip into gtg (#5618)
* trick: ledge clip into gtg

* fix
2025-06-29 13:57:57 -07:00
aMannus
c2788bd0ba Fix build after develop merge 2025-06-29 21:08:35 +02:00
aMannus
456a736beb Merge branch 'develop' into aManchipelago 2025-06-29 20:44:49 +02:00
Malkierian
a9b857469e Fix Boss Rush scene/cutscene setup after Bongo/Twinrova. (#5623)
Also prevent check tracker crash loading Boss Rush.
2025-06-28 17:48:21 -07:00
Eblo
9924ebbd05 Enhancement to double pause menu animation speed (#5615)
* Add enhancement to speed up pause menu animation

* Rename CVar to FasterPauseMenu

* Rename kaleido to pause menu

* Rename register func to InitFasterPauseMenu
2025-06-28 07:50:28 -07:00
Malkierian
1161ce3546 Expand tooltip for Free Look to explain camera locks and scene reload. (#5624) 2025-06-28 07:50:06 -07:00
louist103
e15f8d395b Backport 2ship streamed audio (#5457)
* Bring over changes from 2ship

# Conflicts:
#	.github/workflows/apt-deps.txt
#	soh/CMakeLists.txt
#	soh/soh/resource/importer/AudioSampleFactory.h
#	soh/soh/resource/importer/AudioSequenceFactory.cpp
#	soh/soh/resource/importer/AudioSequenceFactory.h
#	soh/soh/resource/importer/AudioSoundFontFactory.h

* Update xml format

* Format and fix mixer for Windows

* Fixes for new LUS

* Good ole clang-format
2025-06-27 17:15:02 -07:00
Philip Dubé
9e686ae6f6 Shuffles: use ObjectExtension system for rando object identity (#5603) 2025-06-25 22:00:53 -07:00
Eric Hoey
8b616c8709 first person to first-person (#5616) 2025-06-25 21:54:57 -07:00
Pepper0ni
1d24edaa92 Split Gerudo Fortress and fix break room logic errors (#5338)
* Separate HBA range

* Separate 4 rooftop regions

* Rest of rooftops

* Small cleanup

* Whoops

* Create `thieves_hideout.cpp` & move `gerudo_fortress.cpp`

* Ground and some inside

* More outside cleanup and more inside

* Kitchen

* Final tweaks

* Use `TH_` prefix for Thieves' Hideout locations

* Add clarifying images (+ `.xcf` source)

* Thieves' Hideout is overworld

* Fix `RC_GF_GS_TOP_FLOOR` & blue -> violet entrance

* Address review

* Update gerudo_fortress.cpp

* Address review

* Split "CarpenterRescue"

* Rename events

* Update logic.cpp

* Move from function to event

* Rename most of the regions

* Address review

* Add new conections

* update logic, get it working

* apply clang format

* undo clang format in logic files

* final reordering

* remove additions to .gitIgnore

* Fix some jump trick logic

* clean up ShufflePots

* fix submodules

* update for review and talk to jail and always gate PRs

* change thieves hideout to scene handling

* final fixes and update enum names and hint text

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
2025-06-25 21:54:48 -07:00