mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
756 Commits 3 Branches 36 Tags 135 MiB
Commit Graph

756 Commits

Author SHA1 Message Date
Christopher Leggett c1155bb08c
Cleans up unused z_message_PAL code. 2022-07-24 19:35:24 -04:00
Christopher Leggett 661946b4f5
Pulls altar text from CustomMessageTable instead of gSaveContext. 2022-07-24 19:34:12 -04:00
Christopher Leggett 780e9f4669
Fixes storage of altar and ganon hints/text. 
Only one language is stored in gSaveContext at the moment so store the one language in all 3 CustomMessageEntry languages.
 2022-07-24 19:23:54 -04:00
Christopher Leggett a33c3d606a
Fixes minor oversight from previous commit. 2022-07-24 18:54:05 -04:00
Christopher Leggett a21998c489
Does some refactoring of rando custom message registration 
The goal was less verbosity when adding new get-item messages later.
 2022-07-24 18:47:55 -04:00
Christopher Leggett dca922ade8
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages 2022-07-24 18:08:10 -04:00
Andrew Van Caem 5f6d0939bd
Apply AA and resolution scale settings at startup (#911) 2022-07-24 22:01:28 +02:00
Josh Bodner ffb3523cb5
Add an option to always win the Goron spinning pot jackpot (#913) 2022-07-24 22:00:54 +02:00
Revo 01347dc9f9
Move Skulltula Debug functionality to its own checkbox option. (#912) 2022-07-24 18:12:34 +02:00
lilDavid 62d9390c9b
Add option to allow the ocarina to be played faster (#903) 
* Add the ability to play the ocarina really fast like in MM3D

* Clean up CVar condition

* Rename Unlimited Ocarina Speed to Prevent Dropped Ocarina Inputs
 2022-07-24 09:48:06 -04:00
GaryOderNichts 44bdfe552c
Fix height value for OptionsMenuSettings (#900) 2022-07-24 09:38:02 -04:00
GaryOderNichts d3c2c0ec7d
Controller: zero-initialize wCam values (#902) 2022-07-24 09:37:17 -04:00
GaryOderNichts bd787719b8
Initialize staticSegment in Title_Init to NULL (#899) 2022-07-24 09:36:36 -04:00
Baoulettes d4bd953c0b
Fix purple rupee issue (#895) 
* moved few break to fix purple rupee issue

* fix breaks
 2022-07-24 09:23:32 -04:00
briaguya 474eee5d98
set morpha reset function in initvars (#881) 
Co-authored-by: briaguya <briaguya@alice>
 2022-07-24 09:21:38 -04:00
vaguerant 38ecb6cfff
Bug fix: Water Temple gate & bootcommands.c cleanup (#618) 
* Vanilla bug fix: child Water Temple gate

* Clean up bootcommands.c
 2022-07-24 09:15:33 -04:00
vaguerant ccf1bffd4f
Timer Savers: Mask Select in Inventory (#670) 
* Timer Savers: Mask Select in Inventory

* Merge derp

* Implement suggestions per @briaguya-ai

* Fix cut & paste derp
 2022-07-24 09:14:36 -04:00
vaguerant 1de5b72802
L-button cheats disable minimap toggle (#514) 
* L-button cheats disable minimap toggle

* Add debug mode to exclusion list

per @briaguya-ai
 2022-07-24 09:13:43 -04:00
sholdee bd95fe616b
Disable concurrent builds (#885) 2022-07-22 09:13:38 +02:00
David Chavez d299284751
Merge pull request #878 from dcvz/develop-zhora-merge 
Rachael -> Zhora
 2022-07-22 03:01:16 +02:00
David Chavez b3d3148383 Merge branch 'develop-rachael' into develop-zhora 2022-07-22 02:34:55 +02:00
earthcrafterman 2ad78887b9
Added a time saver option to allow players to instantly put items away (#600) 
* Added a time saver option to allow players to instantly put items away

Expanded the range of damage multiplication to 80 (20 hearts of damage for each quarter heart) so players can play a sudden death challenge

* The damage sliders are now comboboxes
Damage multiplication is now exponential instead of incremental

The FPS slider is now a text input

* Splitting into solely being a quick putaway PR

* Removed some leftover code from the split
 2022-07-22 02:31:49 +02:00
David Chavez 1ca12feaed
Adds Xcode project (#769) 
* Add Xcode project

Add dynamic lib paths

Generate resources scripts

Fix after rebase

tweak targets

Set min deployment target

* remove project

* readd project with correct gitignore
 2022-07-21 20:15:45 -04:00
briaguya 84236e7ac3
stop floor under shadow statue opening immediately (#857) 
* stop floor under shadow statue opening immediately

* use ActorResetFunc to reset sStatueRotY

Co-authored-by: briaguya <briaguya@alice>
 2022-07-22 02:11:13 +02:00
KiritoDev 1cbaa592d0
Added 'Auto' controller backend (#850) 2022-07-22 01:36:28 +02:00
Baoulettes df756b2ce0
Cosmetics editor - Feature requested (#841) 
* Precise positionning, reset margin and pos

* Fix big hearts issues

* add + and - to the editor

* add const to the char*

* Fix labels issues
 2022-07-22 01:33:39 +02:00
lilDavid c7c16c39b0
Add fixes for power crouch stab to the Enhancements menu (#874) 
* Add optional fixes for power crouch stab

* Add line break in "Fix Megaton Hammer" tooltip

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-07-22 01:22:09 +02:00
vaguerant 059045481c
Controller option: Navi on L (#861) 2022-07-22 01:21:18 +02:00
Christopher Leggett 44dbd3a8a9
Fixes naming discrepancy of textbox positions. (#854) 
Equivalent to https://github.com/zeldaret/oot/pull/1329
 2022-07-22 01:13:04 +02:00
Jeffrey Crowell 753031df17
allow roms with spaces to be extracted (#868) 
using subprocess instead of os.system() is a little safer, and allows
for roms with spaces to be extraced.

i've noticed this is somewhat common in people reporting issues on
discord.
 2022-07-22 01:12:43 +02:00
Sarge-117 52f22275e3
Fix Giant's Knife unexpected behaviours (#834) 
* Giant's Knife Behaviour Fixes

Fixes a case where Giant's Knife (specifically, breaking and re-buying it) can behave unexpectedly if you don't have a Kokiri Sword in your inventory.  Also fixes the broken icon not showing up in inventory after you break it.

* less whitespace

* fix 0xE check

Accidentally committed with the wrong check

* Move the grayscale code up

Moved the grayscaling portion up higher in the function and renamed "bool not_acquired" to "bool age_restricted".  Thanks to @vaguerant for the suggestion!
 2022-07-22 00:39:04 +02:00
Baoulettes c19beca980
Fast Save Loader crashes fixes (#848) 2022-07-22 00:36:46 +02:00
briaguya eb49053e73
Prevent unrestricted items camera crash (#852) 2022-07-22 00:35:30 +02:00
RaelCappra d08b1d277e
Savestate crash fix on Ubuntu (#843) 2022-07-22 00:34:35 +02:00
RaelCappra e41873fff4
Savestate crash fix on Ubuntu (#843) 2022-07-22 00:34:04 +02:00
briaguya dfa929a16f
Reset var for shadow boss key room spike walls (#860) 2022-07-22 00:31:26 +02:00
Christopher Leggett 880e3928cf
Fixes odd rando interaction with malon after receiving her check. (#867) 2022-07-22 00:28:43 +02:00
Jeffrey Crowell 41d1bbe137
Fix nullptr dereference in morpha (#870) 
reported on discord, i don't have the ability to reproduce this, but it
appears to be a benign fix, as the only time that the tent2 is checked
down later is guarded by a null check.
 2022-07-22 00:27:44 +02:00
David Chavez e519caa554
Merge pull request #871 from jbodner09/fix-zelda-skip 
Fix Child Zelda Skip rando setting always on
 2022-07-22 00:23:53 +02:00
Josh Bodner 1d208c7dc2 Revert to using boolean in json 2022-07-21 11:04:37 -07:00
Josh Bodner 2edc81ee2d Attempt to restore formatting of randomizer.cpp 2022-07-21 11:03:28 -07:00
Christopher Leggett 21c585b2ce
Removes randomizer_custom_messages, as I relocated its logic elsewhere. 2022-07-21 13:10:04 -04:00
Christopher Leggett b5dc097587
Cleanup and move most hint logic to CustomMessage. 
Haven't removed where rando stores the hints for itself and the ganon and altar hints are still pulled from the randomizer class' local storage, but gossip stone hints are pulled from the custom message table now.
 2022-07-21 13:05:15 -04:00
Josh Bodner cddca2700a Move Child Zelda spoiler write out of for loop so it's not repeatedly hit 2022-07-20 23:08:57 -07:00
Josh Bodner 17b3f65276 Fix the issue for real 2022-07-20 22:57:18 -07:00
Josh Bodner 75a4d2cf99 Actually use the same strings everywhere lol 2022-07-20 21:50:55 -07:00
Josh Bodner 795ee54f2b Remove use of std::format since Jenkins doesn't like it 2022-07-20 21:44:32 -07:00
Josh Bodner 3633bdeeaf Fix Child Zelda Skip rando setting always on 2022-07-20 19:57:38 -07:00
Christopher Leggett c5f66373c3
Adds ability to store and retrieve textbox size and position. 2022-07-19 22:51:39 -04:00
Christopher Leggett 2d1aa1d13a
Merge in develop-zhora 2022-07-19 20:28:21 -04:00