mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 04:42:18 -05:00
Code Issues Projects Releases Wiki Activity
1,193 Commits 3 Branches 37 Tags 141 MiB
08a487f35e
Commit Graph

849 Commits

Author SHA1 Message Date
Oliver Schall
8841e0b607
Fixed Shooting Gallery Difficulty Menu implementation issues (#1991) 2022-11-22 00:53:23 +01:00
GaryOderNichts
5dcc7e41b9
Display all game versions in build info (#1982) 2022-11-20 20:13:54 +01:00
Oliver Schall
82fff6486c
Shooting gallery difficulty options menu (#1354) 
* Added difficulty settings menu for shooting gallery

* Reverted linux assert fix for PR

* Added difficulty option to not randomize rupee order as adult

* Changed checkbox wording due to text overflow

* Reverted incorrect change from merge

* Update soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Added Checkbox to turn on and off all customizations in shooting gallery behavior

* Added disable-switch for sliders, shooting gallery difficulty options are now disabled when customize behavior is turned off instead of hidden

Co-authored-by: Ralphie Morell <rafael.morell@techfield.us>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2022-11-18 18:55:22 -05:00
Josh Bodner
2c0ec96eff
Fix credits timing (#1254) 
* Fix credits timing

* Add documentation

* Fix typo
 2022-11-18 18:42:58 -05:00
aMannus
dcd9ca56e6
Keyrings count fix (#1975) 2022-11-18 13:03:26 -05:00
Garrett Cox
283854c854
Implement option to start with a specific number of skulltula tokens (#1967) 2022-11-16 01:39:53 -05:00
sonoftunk
5307457ab0 Explicitly defines vector header in randomizer.h to fix compile errors 2022-11-15 12:48:53 -05:00
sonoftunk
35f493046a Reorders headers to (hopefully) avoid CI build conflicts on linux/consoles 2022-11-15 12:03:49 -05:00
Adam Bird
adb1365200
add a toggle for multi viewports in imgui (#1896) 2022-11-15 01:02:48 -05:00
briaguya
c9a3dcdb44
update lus (#1965) 
* update lus

* rename things to fix build

Co-authored-by: briaguya <briaguya@alice>
 2022-11-14 23:01:06 -05:00
sonoftunk
c3f0ebe949 Merges origin/develop into LocationTracker to resolve trivial conflict with libultraship submodule in randomizer_item_tracker.cpp 2022-11-14 21:07:29 -05:00
Josh Bodner
e7597bae30
Prevent autosave when first loading a file (#1792) 2022-11-14 20:02:07 -05:00
sonoftunk
f39e8cc93d Check Tracker - Fixes Gerudo Card check not showing in Fast setting 2022-11-14 19:31:43 -05:00
briaguya
8571545bf2
Cheat: Switch Age and Reload Link (#1963) 
* Added button to switch age

* Added logic to switch link's age

Reloads link from last entrance he went through once his age is switched.

* Link now respawns where he last was

* Update game.c

* move setting to GameMenuBar.cpp, fix build issues

Co-authored-by: Jake Edvenson <77412657+JakeEdvenson@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
 2022-11-14 19:29:16 -05:00
sonoftunk
77f36b71cf Check Tracker - Item names are now dependent on file language 2022-11-14 19:20:26 -05:00
sonoftunk
48085f0f48 Check Tracker - Fixes an issue where any time an item is removed the tracker would cause an application crash 2022-11-14 18:55:57 -05:00
sonoftunk
e5f1114c06 Check Tracker - Refactors adult trade items to RandomizerInf 2022-11-14 18:43:25 -05:00
RaelCappra
6361a4c776
Fixes most known bugs associated with FreeCam (#1960) 
* Fixes most known bugs associated with FreeCam

Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>

* Address review suggestions

Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>
 2022-11-14 17:59:17 -05:00
Adam Bird
15a9975200
Entrance Rando (#1760) 2022-11-14 12:13:21 +01:00
Alto1772
8be2c4ddd7
Audio & Rendering backend option greyed out if theres only one (#1958) 2022-11-14 12:09:13 +01:00
briaguya
3914781ebf
Import libultraship as a submodule (#1943) 
Co-authored-by: briaguya <briaguya>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: David Chavez <davi@dcvz.io>
 2022-11-14 11:22:34 +01:00
sonoftunk
f161ac9b56 Check Tracker - Adds Skip functionality to buttons 2022-11-13 17:50:37 -05:00
sonoftunk
648fe17532 Check Tracker - Item List 
- Fixes item list not updating when changing seeds/options
- Separates item exclusion list from item check list
- Clean up comments
 2022-11-13 16:44:05 -05:00
sonoftunk
ad10807ca0 Cleans up item_location 2022-11-13 14:08:37 -05:00
sonoftunk
f842b294af Check Tracker - Fixes giving Adult Trade Items shown on tracker: Broken Sword, Saw, Cojiro, Eyeball Froge, and Eyedrops 2022-11-13 13:15:59 -05:00
sonoftunk
bf17abdf03 Check Tracker - Fixes scroll for Hyrule Market and Bazaar 2022-11-13 11:02:40 -05:00
sonoftunk
8ca1dbeb8a Check Tracker - Fixes Bazaar showing under wrong area on tracker between adult/child 2022-11-13 10:43:37 -05:00
sonoftunk
77bdbf2265 Check Tracker - Fixes Prescription to King Zora 2022-11-13 10:16:46 -05:00
sonoftunk
bf96ee3130 Check Tracker - Fixes Dampe's Gravedigging Tour 2022-11-13 08:24:59 -05:00
sonoftunk
2cbeeaf817 Check Tracker - Updates blue warp checks 
- Fixes Bongo Bongo and Twinrova checks
 2022-11-13 08:01:41 -05:00
sonoftunk
c80f91a033 Check Tracker - Fixes Great Fairy auto-scroll to wrong location 2022-11-13 07:39:24 -05:00
sonoftunk
392e764eb5 Check Tracker - Fixes Sheik at Temple 2022-11-13 07:30:16 -05:00
sonoftunk
b0bfb0195e Check Tracker - Fixes Great Faries checks 2022-11-13 07:23:44 -05:00
sonoftunk
33f50006e5 Save Editor - Adds missing label for Treasure Chest Game 2022-11-12 09:27:03 -05:00
sonoftunk
87e290fe84 Check Tracker - Fixes #19 for Darunia's Joy 2022-11-12 09:06:32 -05:00
sonoftunk
b278320f82 Check Tracker - Fixes #16 for Shooting the Sun 2022-11-12 09:03:52 -05:00
sonoftunk
1af2cc3b92 Check Tracker - Fixes #14 for Song from Ocarina of Time 2022-11-12 08:59:30 -05:00
sonoftunk
5d459543a9 Check Tracker - Fixes #10 for Composer Grave 2022-11-12 08:55:17 -05:00
sonoftunk
537e5decec Check Tracker - Fixes #9 for Adult Shooting Gallery 2022-11-12 08:48:28 -05:00
sonoftunk
8063cf51c3 Check Tracker - Fixes #8 for Song from Saria 2022-11-12 08:45:06 -05:00
sonoftunk
b4d9b4cad2 Check Tracker 
- Adds support for merchants
- Fixes #7 for Bomchu Salesman
- Fixes #12 for Medigoron
 2022-11-12 08:39:46 -05:00
sonoftunk
65b4125c7c Check Tracker - Fixes #2 for Skull Mask and Mask of Truth checks 2022-11-12 08:04:12 -05:00
sonoftunk
142d91d27d Merge remote-tracking branch 'origin/develop' into LocationTracker 2022-11-08 20:14:32 -05:00
sonoftunk
ad42bcf84e Check Tracker 
- Fixes Claim Check check not tracking
- Fixes spoiler for Claim Check check when getting Biggoron's Sword
- Fixes LACS being spoiled and not tracking
 2022-11-08 20:10:47 -05:00
sonoftunk
b49cbcb9a3 Check Tracker - Song from Malon now works 2022-11-08 19:07:47 -05:00
Ralphie Morell
341bc43daf
Rando: Shuffle Merchants (#1720) 2022-11-08 19:54:51 +01:00
PurpleHato
f050ba9ff7
TWEAK: Fix corrupted characters on French gossip hint (#1935) 2022-11-07 16:41:33 -05:00
Garrett Cox
92b1730237
[#1931] Fix issue with ZF Gossip stones (#1933) 2022-11-07 14:14:24 -05:00
sonoftunk
542916d770 Fixes most Event Chk Inf Checks on Check Tracker, and Frogs 2022-11-07 07:11:58 -05:00
sonoftunk
8eabef6c42 InfTable Check Location Fixes: Lost Dog Richard, Rolling Gorons, HBA 1000, Thawed Zora 2022-11-07 06:24:14 -05:00
lilDavid
e170407517
Enhancements for equipping magic arrows (#1022) 
Skip Magic Arrow Equip Animation, Equip Multiple Arrows at Once
 2022-11-07 09:05:56 +01:00
RaelCappra
8d57ef4bed
Restore QPA glitched damage (#1789) 2022-11-07 09:02:42 +01:00
Dakota Brown
328ff0e8c4
Added Chests of Agony (#1885) 2022-11-06 22:07:58 +01:00
sonoftunk
d77487f06f Merge remote-tracking branch 'origin/develop' into LocationTracker 2022-11-06 13:05:08 -05:00
sonoftunk
d83c7722df Fixes gerudo fortress checks showing in tracker when settings have them removed 2022-11-06 12:44:08 -05:00
sonoftunk
d481181170 Fixes issue where Check Tracker would auto-scroll to wrong location when entering a grotto 2022-11-06 11:06:15 -05:00
sonoftunk
44b7d72916 Checks Tracker only shows checked locations once in game 2022-11-06 10:36:27 -05:00
sonoftunk
b6c0775f1b Auto scroll Check Tracker windows to current area 2022-11-06 09:58:31 -05:00
sonoftunk
dba5df9e2a Fixes crashing issues with Check Tracker rendering 2022-11-06 08:50:29 -05:00
sonoftunk
984a2b0bb1 Updates styling for checked items in Check Tracker 2022-11-06 08:08:47 -05:00
briaguya
498769c990
Remove colons from shopsanity messages (#1881) (#1887) 
Co-authored-by: lilDavid <1337lilDavid@gmail.com>
 2022-11-06 05:36:07 -05:00
David Chavez
e6e7a7b549
Refactor CrowdControl Setup (#1890) 2022-11-06 11:00:34 +01:00
blackgamma7
be72f48cea
Expanded Save Editor for Fishing Minigame (#1900) 2022-11-06 10:59:33 +01:00
Garrett Cox
2f6dea92c7
Add option to disable jump velocity boost with bunny hood (#1918) 2022-11-06 10:05:34 +01:00
Garrett Cox
99260acaf1
Use PlayState instead of GlobalContext (#1927) 
* Use PlayState instead of GlobalContext
- GlobalContext -> PlayState
- globalCtx -> play
- GlobalCtx -> PlayState
- globalContext -> playState

* Find and replace Gameplay_ with Play_

* Correct some misnamed argument cases
 2022-11-06 09:24:34 +01:00
sonoftunk
466aa7d96e Initial Auto-Location Tracking 2022-11-05 16:15:11 -04:00
PurpleHato
710a768d76
TWEAK: Some forgotten colors + google translation rewrite (#1919) 2022-11-05 16:09:03 -04:00
briaguya
274a108167
fix: add ShouldAdvanceSilent to functions.h (#1920) 
The implicit declaration was causing issues on Linux when building in release mode. The call was getting optimized out which was preventing the "equip now?" message box from functioning as intended. Adding the `Message_ShouldAdvanceSilent` declaration to `functions.h`resolves the issue.
 2022-11-05 15:33:04 -04:00
Garrett Cox
4396411d10
Add enhancement for making nuts explode bombs, similar to bombchus (#1906) 2022-11-05 14:37:32 +01:00
Garrett Cox
6d10e6b9f8
[rando] Pull gamestabled/OoT3D_Randomizer #540 fixes (#1917) 2022-11-05 14:31:25 +01:00
Garrett Cox
d77e810aae
Always show GTG & Ganons castle MQ status on tracker (#1913) 2022-11-05 03:11:04 -04:00
Garrett Cox
1dc28978fe
Fix copy/paste for ganons castle keyring (#1916) 2022-11-05 03:00:34 -04:00
Garrett Cox
dc758739f4
Add missing randomizer inf flags to save editor (#1909) 2022-11-05 01:57:36 -04:00
Garrett Cox
960c2732e5
Skip cutscenes for DOT and Rainbow bridge in rando (#1908) 2022-11-04 21:47:13 -04:00
Garrett Cox
a40b7180d9
handle keyrings on sohStats (#1911) 2022-11-04 21:37:16 -04:00
Garrett Cox
763f3a5760
Tweaks to chest matches contents setting (#1902) 2022-11-03 18:07:11 -04:00
Garrett Cox
a4697c6fcb
Change lineup tick default to off (#1899) 2022-11-03 12:55:40 -04:00
Christopher Leggett
75af33a04c
Fixes choose-quest with missing MQ crash. (#1903) 2022-11-03 12:29:25 -04:00
Garrett Cox
c5940905e7
Add glitch line-up tick option (#1875) 2022-11-02 22:07:10 -04:00
Christopher Leggett
4156a1d2c7
Fixes bug preventing name entry with single OTR. (#1894) 2022-11-02 18:00:57 -04:00
Christopher Leggett
d49a1cd6b3
Fixes bug with generating seed on the choose-quest screen. (#1892) 2022-11-02 17:30:44 -04:00
Garrett Cox
3b7b4913eb
Track keys, heart pieces, and heart containers collected (#1849) 
* Track keys, heart pieces, and heart containers collected

* Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
 2022-11-02 14:09:25 -04:00
Garrett Cox
897e70b6fc
Sfx Editor - 3rd Pass (#1873) 
* First pass on SFX Editor

* Fix crash at night in Colossus (and probably other undocumented issues)

The SFX editor was swapping out the bytes corresponding to the sequence
to be played regardless of the audio command being issued. This fix
ensures the swap will only happen on commands which actually treat those
bytes as a sequence identifier.

* enabling a few more songs/fanfares

* Removing a few broken bgms, fixing the preview button returning to the wrong bgm

* Fixes restoration from miniboss music to previous one

* add timed minigame into the sounds pool

* A few small tweaks

* More cleanup and add instruments

* adjust usage of getReverseReplacementSeq

* Changes from feedback and prefix external methods with SfxEditor

Co-authored-by: RaelCappra <rael.cappra@gmail.com>
 2022-11-02 12:27:05 -04:00
Garrett Cox
fab52d323b
Implement hint for dungeon type on Map get item messages (#1852) 
* Implement hint for dungeon type on Map get item messages

* Color dungeon name in item tracker when MQ and map is found

* No hint when all dungeons are MQ or non MQ

* TWEAK: French hint

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-11-02 12:03:26 -04:00
Christopher Leggett
fd8a2c9483
Adds in-game menu for selecting a dungeon quest/randomizer (#1863) 
* Adds most visuals and interactions for quest select menu.

* "Scrolling" menu, adds remaining sub/title textures, language support

* Tweak: ENG, FRA, GER title to match the original style

* ADD: Randomizer tex

* TWEAK: Randomizer ZAPD extension format

* Adds control stick prompts to the "scrolling" menu.

* Adds third entry for Randomizer.

* Bold text on randomizer subtitle.

* Ensures the game won't allow selecting an unsupported quest.

* Makes save files be created from the quest menu selection.

* Removes the master quest and randomizer checkboxes (no longer needed).

* Removes lock on MQ-only rando.

* Skips quest select if only one quest is playable.

* Adds ability to back out of quest select menu

* Show seed icons while Randomizer is selected on Quest Select Menu.

* Fixes custom hud colors and d-pad navigation.

* Implements backing up from name entry to quest select.

Also implements backwards rotations on the file select screen.

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-11-02 11:50:47 -04:00
Garrett Cox
dda4a13bc3
Implement keyrings (#1869) 
* Implement keyrings

* ADD: French GIMessage

* Remove cvar include

* Rename maxKeys to numOfKeysOnKeyring

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-11-02 11:36:02 -04:00
Sarge-117
fb0b71ea54
Show player state flags on the "Player" tab of Save Editor (#1851) 2022-11-02 14:39:45 +01:00
Adam Bird
57c1f4dce2
Fix rando save creation crash due to corrupted hint text (#1846) 2022-11-02 14:37:44 +01:00
Garrett Cox
e6150ea8da
Add cheat: hookshot everything (#1874) 2022-10-31 22:28:03 +01:00
Christopher Leggett
087f42a826
Fixes crash with toggling walk speed. (#1877) 2022-10-31 12:39:43 -04:00
Amaro Martínez
8932f30904
Fix Piece of Heart sound (#1862) 
Fixes #1843.
 2022-10-31 01:56:57 -04:00
vaguerant
76e4e97a72
Correct gNoRestrictAge for gTimelessEquipment (#1856) 2022-10-30 00:00:17 +02:00
Garrett Cox
4a686cf800
Redone fast file select (#1854) 
* Redone fast file select

* Update soh/src/overlays/gamestates/ovl_title/z_title.c

* Prevent loading incompatible saves

* Dont change cvar on incompatible file
 2022-10-29 13:53:39 -04:00
David Chavez
cc7f831ec1
Fix SDL issue (#1870) 2022-10-29 18:23:26 +02:00
Christopher Leggett
a9f73ee641
Makes merchant prices array size not depend on Rando Setting Values (#1860) 2022-10-26 15:57:14 -04:00
Christopher Leggett
4adfb93b48
Fixes bug in loading of MQ Dungeons. (#1859) 2022-10-26 14:41:22 -04:00
Garrett Cox
f860d57c8c
Fix freestanding POH in MQ Ice cavern (#1855) 2022-10-26 01:51:44 -04:00
Garrett Cox
0389c8084c
Cleanup some of our uses of custom messages (#1847) 
* Cleanup some of our uses of custom messages

* Fix some string escape warnings
 2022-10-25 21:24:48 -04:00
Adam Bird
0819ad4f9c
Fix LACS ganon's key hint text coloring and new lines (#1845) 
* fix lacs hint text coloring and new lines

* missed a new line

* fix wrong control code

* TWEAK: French LACS + Vanilla

* more french hint fixes

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-10-25 11:56:35 -04:00
vaguerant
67e98d43b7
Time Savers: Ask to Equip New Items (#1133) 
* Time Savers: Ask to Equip New Items

* Add to presets; fix early SFX

* Simplify text reading

* Shrug, does this fix it

* Merge error

* Merge develop
 2022-10-24 14:16:59 -04:00