mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-19 14:52:18 -05:00
Code Issues Projects Releases Wiki Activity
2,628 Commits 3 Branches 38 Tags 142 MiB
4010229de5
Commit Graph

2628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bird
3f3f4ff3ef
Fix: Prevent certain items from being marked as "major" (#2496) 
* fix certain items being marked as major

* simplify check

* avoid string check
 2023-02-17 07:14:43 -05:00
briaguya
68c8f50a71
greg bridge in logic (#2460) 
* greg bridge in logic

---------

Co-authored-by: briaguya <briaguya@alice>
 2023-02-16 21:53:08 -05:00
briaguya
3d8752b3aa
you found greg! (#2458) 
adds greg to the item tracker

---------

Co-authored-by: briaguya <briaguya@alice>
 2023-02-16 20:10:31 -05:00
briaguya
f4f10e4a49
don't show duped sequence names, don't repeat track intros on barinade (#2482) 
* better fix for repeated sequence names, add delay to fix repeated bgm on barinade

---------

Co-authored-by: briaguya <briaguya@alice>
 2023-02-16 18:45:51 -05:00
briaguya
6b93da37d4
fix: use cache on LoadFileRaw (#2489) 
* fix: use cache on LoadFileRaw

this makes it so explosions don't use the dpad texture

---------

Co-authored-by: briaguya <briaguya@alice>
 2023-02-16 18:05:36 -05:00
David Chavez
6cd7066706
Generate assets with MQ present (#2485) 2023-02-16 13:32:01 -05:00
AltoXorg
877fc2dcca
use the convenient printf fomat as ImGui::Text supports it (#2486) 2023-02-16 11:37:27 -05:00
briaguya
1e6ec1bdda
exclude audio from shuffle (#2411) 
* Rename "SFX Editor" to "Audio Editor"
* Move some functionality out into a new class `AudioCollection`
* Add a tab to exclude sfx/sequences from shuffle pool 

---------

Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: briaguya <briaguya>
Co-authored-by: David Chavez <david@dcvz.io>
 2023-02-16 09:49:45 -05:00
briaguya
27f961ac4f
bump lus (#2483) 
Co-authored-by: briaguya <briaguya@alice>
 2023-02-16 00:27:01 -05:00
briaguya
deb47ea430
hintless altar text (#2456) 
Co-authored-by: briaguya <briaguya@alice>
 2023-02-15 21:00:44 -05:00
Bigs
d275740c88
Separate X/Y axis sensitivity sliders (#2472) 
* Update z_camera.c

* Update GameControlEditor.cpp

* Update GameControlEditor.cpp

* Update GameControlEditor.cpp

Adding Sliders for first person X and Y axis

* Update z_player.c

Modified variables to allowed separate sensitivity settings for x and y axis
 2023-02-15 20:42:21 -05:00
David Chavez
8934274c67
[GameInteractor] Game Hooks (#2481) 2023-02-15 20:30:34 +01:00
David Chavez
2c10bca615
Fix compilation against latest libultraship (#2479) 2023-02-15 11:06:19 +01:00
Bigs
b19c72070d
Enhancement Toggle - Disable Automatic First Person Mode for Bombchus (#2471) 
* Update z_camera.c

* Revert "Update z_camera.c"

* Update GameMenuBar.cpp

Added tickbox for NoFPChus

* Update z_player.c

Added check for Disable First Person Bomchus enhancement

* Update z_player.c

Removed comment as statement is clear on its own

* Update GameMenuBar.cpp
 2023-02-15 01:47:38 -05:00
Kenix3
3a4a260e21
SoH now uses the multithreaded resource manager. (#2467) 
* SoH now uses the multithreaded resource manager.

* Fixes build errors on Linux and decreases audio heap size.

* Updates LUS.
 2023-02-15 01:02:09 -05:00
Ralphie Morell
7c3c662eba
Rando: Allow strings as seed hashes (#2438) 
* Allows strings to be used for rando seed hashes;
updated conversion method from `stoi` to `stoul`

* apply suggestions

* Allow spaces + autoselect on input field focus

* Added new text filter; applied suggestions

* leaving 3d rando logic alone

* Apply more suggestions

* Revert buffer size to 1024
 2023-02-14 21:43:25 -05:00
PurpleHato
e60f2b0c55
ADD: Time Savers -> Link as default file name (#2475) 2023-02-14 21:15:15 -05:00
Cardboy777
2241635ac5
Option for link's models reflect the projectile weapon he's holding (Bow/Slingshot) (#2454) 
* Link's models reflect the projectile weapon he's holding

extracted logic from months-old PR

* apply bow/slingshot model changes only if 'gBowSlingShotAmmoFix' is enabled

* Apply suggestions from code review

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* whitespace

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
 2023-02-14 21:14:42 -05:00
Cardboy777
218971c4a9
Option for projectile ammo to match item instead of age (#2453) 
* Projectile ammo matches ItemAction instead of age

extracted logic from months-old PR

* Added cvar under "Enhancements -> Gameplay -> Items" for bow/slingshot ammo

* Update GameMenuBar.cpp
 2023-02-14 21:14:20 -05:00
Garrett Cox
462ab00c7e
Save skipped checks (#2476) 2023-02-14 20:50:59 -05:00
PurpleHato
622d8c4aff
TWEAK: Debug Warp Translations errors (#2464) 
Volvagia is Vulcania in french (I'm so used to it in English)
and I somehow put the german version of dodongo's cavern in french, oops
 2023-02-14 08:56:25 -05:00
PurpleHato
75782e4019
TWEAK: German Rando Navi Hint (Shiek Name) (#2463) 
In German Shiek is called Sheik (something related to how they switched letter to conserve the wanted pronunciation of the name)
 2023-02-14 08:55:12 -05:00
David Chavez
66b2d2d5fa
Add asset headers (#2465) 2023-02-14 08:29:46 -05:00
louist103
8c87bc13db
More junk hints. (#2417) 
* More junk hints.

* More hints.

* Update soh/soh/Enhancements/randomizer/3drando/hint_list.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* More junk hints.

* More hints.

* Remove a hint.

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
 2023-02-13 22:50:13 -05:00
Adam Bird
67421179e4
Fix: Rando settings not being initialized in time (#2461) 
* fix entrance init and entrance tracker not working properly when no spoiler log is loaded

* fix rando adult trade spoilable items reverting when no spoiler log loaded
 2023-02-13 02:00:59 -05:00
Adam Bird
1e9f8df33b
Fix: Hyrule Field bridge entrance and sun song placing link out of bounds in Entrance Rando (#2457) 
* fix market night escape to work with entrance rando; adjust HF bridge spawn to not have link fall in water at night

* use scene enums for ER logic instead of magic nums

* fix sun song loading are with wrong link position with grotto shuffle on

* Update soh/soh/Enhancements/randomizer/randomizer_entrance.c
 2023-02-12 23:34:16 -05:00
PurpleHato
8f9dc17752
FIX: Inverted Night and Day in German (#2448) 2023-02-12 17:58:57 -05:00
briaguya
df1e26d4cd
fix rainbow popping (#2441) 2023-02-08 00:19:48 -05:00
Adam Bird
fdf9d51444
update cvar name for n64 mode (#2440) 2023-02-08 00:18:53 -05:00
briaguya
242a35c3a0
bump version (#2434) 2023-02-07 00:04:19 -05:00
Adam Bird
f57cae120d
Fix: exclude locations not updating and add more location logic (#2428) 
* fix location tab not updating and remove hidden excludes during generation

* add more exclude locations and fix broken ones

* update check tracker check visibility

* rename enum

* rename enums again
 2023-02-06 20:51:26 -05:00
PurpleHato
177194ca5a
ADD: Exit Market at Night to rando preset (#2432) 2023-02-06 17:06:40 -05:00
PurpleHato
3218b2def2
FIX: Song's Overlay with Fast Ocarina Playback (#2431) 
* FIX: Affected songs

* TWEAK: Addressed comments
 2023-02-06 10:56:40 -05:00
David Chavez
8a76a3aa83
Fix: Hang on exit game and CC is enabled (#2427) 
Happens during dev - might affect release, so PRing this.
 2023-02-06 11:02:51 +01:00
Ralphie Morell
5771e6cd1f
Fix spillover on goron messages (#2425) 2023-02-01 00:12:21 -05:00
aMannus
e14fcf92d2
Fix GI overruling link size over anything else (#2424) 2023-01-31 07:21:16 -05:00
aMannus
612700c2ab
Change gPauseAnyCursor into combobox (#2423) 
* Change gPauseAnyCursor into combobox

* Add enums

* Change naming
 2023-01-31 06:53:22 -05:00
Adam Bird
4e08eca1b9
adjust closed forest and starting age settings for edge cases (#2421) 2023-01-30 22:51:41 -05:00
Sirius902
44f963e310
Rumble and check tracker fixes (#2419) 
* Fix rumble

* Fix check tracker crash
 2023-01-30 12:33:52 -05:00
Sirius902
544460d909
QPA restoration (#2422) 2023-01-30 08:43:30 -05:00
PurpleHato
f6c310ae84
TWEAK: Controller Navigation rename + tooltip (#2407) 
* TWEAK: Controller Navigation rename + tooltip

* TWEAK: add back FW

* TWEAK: Button size + name

* TWEAK: Tooltip and text position

* TWEAK: added a PaddedSeparator

* TWEAK: Removed the padding from aMannus Request
 2023-01-28 12:02:38 -05:00
PurpleHato
9b020c0986
TWEAK: Misspelling "Gold" in German + Box formating (#2416) 2023-01-28 10:51:41 -05:00
lilDavid
3617b2e5b7
Fix chest sizes making contents unobtainable (#2410) 2023-01-28 10:17:47 -05:00
aMannus
72dcf3466b
Check tracker fixes (#2414) 2023-01-27 19:16:31 -05:00
Adam Bird
0aab836d1f
Fix: Override jail capture for the Gerudo fighter (#2413) 
* handle overriding gerudo capture for the fighter

* add entrance include
 2023-01-27 18:36:38 -05:00
Garrett Cox
9fe7839f9a
Adjustment to gFastFarores tooltip (#2409) 2023-01-27 01:39:35 -05:00
David Chavez
22efba8cd7
Fix: Quit Game (#2403) 
* Fix quit implemention in console & window

* Point to latest LUS

* match lus from develop
 2023-01-26 20:10:00 -05:00
Adam Bird
1e2b60c6e0
clear cvars that lock up randomizer menu on boot (#2405) 2023-01-26 20:09:33 -05:00
PurpleHato
279553e6b3
TWEAK: Forgot some translation on Debug Warp Screen (#2406) 2023-01-26 20:09:21 -05:00
briaguya
0df5060541
bump lus (#2408) 2023-01-26 19:41:16 -05:00