nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
3,254 Commits 8 Branches 0 Tags
4a9a98d93c4844298725125cfaa7fbd7e10ec008
Commit Graph

3254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike
4a9a98d93c SDL_GameControllerDB repo owner gabomdq -> mdqinc (#5740) 
* SDL_GameControllerDB repo owner gabomdq -> mdqinc

gabomdq redirects to mdqinc

* Docs SDL_GameControllerDB repo owner gabomdq -> mdqinc
 2025-08-25 12:01:25 -07:00
Philip Dubé
3128fb0112 Fix crash on selling big poe (#5733) 
* Fix crash on selling big poe

Easiest steps to reproduce: set poe's to 0, put big poe in inventory, trigger text using big poe bottle

I overlooked selling poes with using bottle instead of talking to collector

* disable hint when count zero
 2025-08-25 12:01:17 -07:00
Pepe20129
9eafa852b5 Fix Dampe Going Backwards (#5731) 
* Add FixDampeGoingBackwards

* Update SohMenuEnhancements.cpp
 2025-08-25 12:00:59 -07:00
Pepe20129
7b4df9bdb2 Boss Rush cleanup (#5652) 
* Reduce stuff in the `.h`s & use `COND_HOOK` + variants

* Move some boss rush stuff from `z_file_choose.c`

* clang

* Update BossRush.cpp
 2025-08-13 12:08:32 -07:00
Philip Dubé
fadae49977 shipinit bonk damage (#5653) 
* shipinit bonk damage

* no initFunc
 2025-08-13 09:46:36 -07:00
Pepe20129
ee20f7f762 Fix max count for TH keys (#5670) 2025-08-12 20:39:31 -07:00
nclok1405
ce38e03562 Allow console commands in debug save (#5675) 2025-08-12 20:38:44 -07:00
Philip Dubé
9cdffc080b small typo fixes (#5680) 
incorrect RR was tripping up my code generator
 2025-08-12 20:36:51 -07:00
PurpleHato
c597e1c4ce TWEAK: SoT Time Travel - Allow Swordless (#5716) 
* Magic number + more modular

* tweak + switch

* forgot basic oot

* linebreak

* c-lang
 2025-08-12 19:57:19 -07:00
Pepe20129
526d221c56 Add timestamps for remaining custom rando items (#5713) 2025-08-12 19:57:02 -07:00
Pepe20129
3e39a94083 Turn song text into a notification (#5712) 2025-08-12 19:56:52 -07:00
Pepe20129
6d4c6f8ea6 Rando: Remove ice trap effect from vanilla ice trap chests (#5711) 2025-08-05 20:43:41 -07:00
Malkierian
429021d434 Add THRescuedAllCarpenters to reset list to prevent seed bleed of bridge. (#5725) 2025-08-05 18:28:19 -07:00
Malkierian
1d20000411 MPQ Support LUS Bump (#5570) 
* Adapt to changes to LUS regarding including MPQ support.

* CMake compile definitions are stupid.

* Don't manually close O2RArchive.

* Finish LUS bump, including SoH-side fix for font free crash.
 2025-07-28 08:54:31 -07:00
aMannus
73209fcf2c Merge pull request #5697 from Malkierian/blair-foxtrot-dev 
Blair Foxtrot -> Develop
 2025-07-25 11:56:33 +02:00
Malkierian
27d88c80b1 Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into blair-foxtrot-dev 2025-07-24 10:04:06 -07:00
Malkierian
7d7072f717 Bump version to 9.0.5 (#5694) 2025-07-23 21:31:13 -07:00
Jordan Longstaff
ccf3d4b6a0 Add playing icon to improve Audio Editor indicator (#5686) 2025-07-23 20:48:01 -07:00
AltoXorg
d06cf6bf10 timesplitdata.json obey app directory (#5693) 2025-07-23 20:45:46 -07:00
Malkierian
d51e88b972 Rando Versioning (Again) (#5691) 
* Adds Sulu/Spock rando block check (data not empty, but all sub-entries null), and put that and data being empty to the old file flow.
Also moves the `SaveFile` call to after everything else is loaded to preserve sohStats block.

* Add check for blank buildVersion in sohStats block for determining old saves.

* clang
 2025-07-23 20:45:22 -07:00
Malkierian
c588d48672 Bump version to Blair Echo. (#5690) 2025-07-21 22:21:59 -07:00
Malkierian
35ad68578e Prevent empty randomizer blocks from triggering the rando version flow. (#5689) 
Clear SpoilerLog CVar when unsupported spoiler log is discovered on load.
 2025-07-21 22:19:04 -07:00
Malkierian
5066fbf82c Fix old file deletion. (#5688) 2025-07-21 17:57:40 -07:00
Malkierian
47c5a7f308 Bump version to Blair Delta 9.0.3, and fix a typo. (#5687) 2025-07-21 14:31:48 -07:00
Pepper0ni
37fb25d2b3 Fix logic for items given at run start due to settings (#5665) 
* initial changes

* submodules

* fix master sword, skip zelda and skip epona logic

* I for one welcome our new clang overlords...
 2025-07-21 11:00:39 -07:00
Shishu the Dragon
681e8dda26 Ivan: collect deku seeds (#5654) 2025-07-21 10:47:03 -07:00
Malkierian
a93b484cf3 Add Clear Devices button that will erase the controllers block. (#5683) 2025-07-21 10:44:53 -07:00
OtherBlue
dfa10383e4 Split Skip Pickup Messages (#5648) 
* Split Skip Pickup Messages

following ZFG's comment https://youtube.com/clip/UgkxF-LDaR-zyTkqSkqtP3dkLrCca_KGScIw?si=RJY9SIG8QKSiWgVl

splits the Skip Pickup Messages time saver for consumables and bottle pickups

* CVar updates I missed

* another cvar I missed
 2025-07-02 21:35:49 -07: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
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
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
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
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
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
Philip Dubé
112fbc5a4b trick: ledge clip into gtg (#5618) 
* trick: ledge clip into gtg

* fix
 2025-06-29 13:57:57 -07: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