mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-14 15:38:15 -05:00
Code Issues Projects Releases Wiki Activity
739 Commits 3 Branches 38 Tags 145 MiB
d1ddc2a0c3
Commit Graph

498 Commits

Author SHA1 Message Date
lilDavid
4a15e113f7 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-25 19:06:05 -04:00
vaguerant
1160fb2b15 Controller option: Navi on L (#861) 2022-07-25 19:06:05 -04:00
Christopher Leggett
27b3644335 Fixes naming discrepancy of textbox positions. (#854) 
Equivalent to https://github.com/zeldaret/oot/pull/1329
 2022-07-25 19:06:05 -04:00
Christopher Leggett
87ed5fedfd
Fixes Goron Wakeup animations (#897) 
* Fixes Goron Wakeup animations

* Cleanup of some unneeded code.

* Fixes comment spacing
 2022-07-25 18:30:40 -04:00
Sarge-117
c6cd0f5e03 Fix special case with the "WINNER" heart 
The "WINNER" heart is its own unique item rather than just another piece of heart, so it needed its own check to make it consistent with other pieces of heart
 2022-07-25 12:43:36 -07:00
aMannus
2e450648a8 Reverted default values rainbow bridge settings 2022-07-25 18:28:59 +02:00
PurpleHato
b81bcf435c TWEAK: Removed placeholder old test 2022-07-24 22:12:55 +02:00
PurpleHato
1f9c1dedec ADD: Rando Item Tracker Personnal Note space 2022-07-24 22:11:08 +02:00
Sarge-117
5ad90bf71b Change cvar name for accuracy 
Changed Cvar from "gRandoFanfareByItemType" to "gRandoQuestItemFanfares" for better accuracy
 2022-07-24 12:51:55 -07:00
Sarge-117
6c72d39f79
Remove comment border 
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2022-07-24 11:01:57 -07:00
Revo
01347dc9f9
Move Skulltula Debug functionality to its own checkbox option. (#912) 2022-07-24 18:12:34 +02:00
GaryOderNichts
44bdfe552c
Fix height value for OptionsMenuSettings (#900) 2022-07-24 09:38:02 -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
Sarge-117
70e4f216ed Account for boomerang/hookshot tokens 
Fixed the case where you get the token via the boomerang or hookshot.  Done by separating out the code into its own function and then calling it in the two appropriate spots.
 2022-07-24 00:53:37 -07:00
Sarge-117
068f3426d7 Account for tokensanity 
Added changes to restore small item fanfares to rupees, heart containers, and items when picked up from skulltulas in tokensanity.
 2022-07-23 23:25:35 -07:00
aMannus
48d97975a0 Fixed crash 2022-07-24 00:28:54 +02:00
aMannus
3758d8bb8d Removed bool declaration 2022-07-23 20:36:46 +02:00
aMannus
29b944df92 Fixed incompabitility options (again) 2022-07-23 20:00:32 +02:00
aMannus
f49d397581 Removed unneccesary line 2022-07-23 19:22:22 +02:00
aMannus
2d2d558657 Removed CVar updating in UI 2022-07-23 18:44:15 +02:00
aMannus
59531f89b1 Adressed first comments 2022-07-23 11:28:07 +02:00
Sarge-117
5505d0d284
Merge pull request #6 from Sarge-117/rando-next 
Rando next
 2022-07-22 23:35:22 -07:00
aMannus
061c8c9fff Small fix handling incompatible options 2022-07-22 21:59:09 +02:00
aMannus
330b025453 Fixed minimum amounts rainbow bridge 2022-07-22 21:35:18 +02:00
aMannus
af877a4cc6 Added +- buttons to sliders 2022-07-22 21:22:04 +02:00
aMannus
0f4e65eb46 Removed unneeded check after UI changes 2022-07-22 19:58:27 +02:00
aMannus
cbf4a9267f Irmproved handling incompatibilities 2022-07-22 18:44:46 +02:00
aMannus
0ee898bd56 Improved disabling of settings 
For Skip Child Zelda (and possibly other options in the future)
 2022-07-22 12:21:12 +02:00
aMannus
97c37eb46a Changed default values 
Shuffle/open settings now align with the first option which makes it the option closest to vanilla.

Also added default values for rainbow bridge settings so they align with the max value instead of 0.
 2022-07-22 09:48:30 +02:00
Sarge-117
77eeeb9c81
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares 2022-07-21 22:52:14 -07:00
briaguya
cab9499a76
Merge pull request #338 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-07-21 21:05:35 -04: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
briaguya
27d37e9d00 fix dot song Only vs only issue 2022-07-21 20:06:19 -04: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
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
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
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
aMannus
6f082e1769 Fixed rename breaking maps/compasses 2022-07-21 17:32:28 +02:00
aMannus
8f89b969cb Tiny code cleanup 2022-07-21 12:25:16 +02:00
aMannus
9ce552659a Changed iceTrapped var name/type and tooltip 2022-07-21 12:22:36 +02:00
aMannus
37134cbc9a Fixed ice traps (maybe actually this time) 2022-07-21 08:30:48 +02:00
aMannus
2c5bdbfd4b Merge branch 'rando-next' into spoopy-spiders 2022-07-21 08:30:31 +02: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
briaguya
1944b68d19 fix starting inventory 2022-07-20 23:36:39 -04:00
Josh Bodner
3633bdeeaf Fix Child Zelda Skip rando setting always on 2022-07-20 19:57:38 -07:00
aMannus
a7936942b1 Fixes for double spiders & ice traps 
getItemId should've been set earlier to make sure double spiders didn't screw up ice traps.

Additionally Item_Give() was still being called with skultulla tokens as the default value so it granted a token when picking up an ice trap.

Skulltula freeze was also happening on ice traps which it shouldn't do, so that's fixed now too.
 2022-07-20 22:47:25 +02:00
aMannus
0cc59a9370 Fix for spooders to overwroote each ooder 2022-07-20 17:15:22 +02:00
aMannus
3be2dbd005 Added nighttime GS sun's song option 2022-07-20 14:33:12 +02:00
aMannus
36d451eb85 Add setting tooltip and fixed an oopsie 2022-07-20 14:07:01 +02:00
aMannus
715a4f7315 Added all remaining tokens(?) 2022-07-20 13:37:28 +02:00
aMannus
5c25364eff Nother batch of spooders 2022-07-20 11:56:03 +02:00
aMannus
bee6fdb8ba Small fix after UX merge 2022-07-20 11:04:01 +02:00
aMannus
a4af34c8dc Merge branch 'rando-next' into spoopy-spiders 2022-07-20 10:58:53 +02:00
aMannus
bfd76dc244 Added comment 2022-07-19 23:20:05 +02:00
aMannus
69de5ac14a Fixed all possible ice trap scenarios 2022-07-19 22:29:52 +02:00
Sarge-117
ceef852a9a
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares 2022-07-19 10:56:20 -07:00
aMannus
16e676d2d0 Removed some spaces that were missed 2022-07-19 16:57:54 +02:00
aMannus
27ac523b14 Fix after dev merge 2022-07-19 16:47:49 +02:00
aMannus
75ab2f7780 Removed temporary bunny hood change 2022-07-19 13:36:12 +02:00
aMannus
51dae73387 Merge branch 'develop-zhora' into spoopy-spiders 2022-07-19 13:33:45 +02:00
aMannus
0e4169ee84 Revert "Revert "Merge branch 'develop-zhora' into rando-settings-overhaul"" 
This reverts commit 109485188cfc8c47698ebb53b009cf852a17ef58.
 2022-07-19 13:09:24 +02:00
aMannus
1c384c5b3e Revert "Merge branch 'develop-zhora' into rando-settings-overhaul" 
This reverts commit 55f114e3d499f510eadab5f918b7eb95fd9dd249, reversing
changes made to 2809cd01dffb7f1a1df1068adaae8f2b1b44ae85.
 2022-07-19 13:09:24 +02:00
aMannus
02d0b354a1 Copied over files from old branch 
Dev merge made it so I couldn't easily merge into the old branch, so this is the next best thing.
 2022-07-19 13:09:24 +02:00
PurpleHato
235cef6abf
FIX: RetrictItem SunSong issue (#839) 
Thanks @vaguerant
 2022-07-18 22:47:37 -04:00
MelonSpeedruns
e871b53afc
Free cam collision v2 (#836) 2022-07-18 22:47:23 -04:00
Sarge-117
d9f4314f5c Undo accidental commit 
I'm a dummy and accidentally committed changes from other branches I was working on.
 2022-07-18 19:01:47 -07:00
Sarge-117
3ab3e962d3
Merge branch 'test' into rando-quest-item-fanfares 2022-07-18 18:50:13 -07:00
Sarge-117
cb1b725cda Shorten code 
Shortened the code
 2022-07-18 18:39:24 -07:00
Sarge-117
2133fe97dd
Merge branch 'HarbourMasters:develop' into test 2022-07-18 16:48:29 -07:00
Sarge-117
b4291516b6
Merge branch 'HarbourMasters:develop' into rando-quest-item-fanfares 2022-07-18 16:48:01 -07:00
Andrew Van Caem
edfa369639
Add yShift position when displaying the positions of cylinders (#823) 2022-07-18 19:31:52 -04:00
Christopher Leggett
169f757954
Fixes ice trap chests to have short chest animations (#817) 2022-07-18 19:31:04 -04:00
David Chavez
4745f73655
[macOS] Bring support down to macOS 10.15 (#816) 
* Pull out CC and CXX flags

* Set minimum deployment target

* Update version to 3.0.0
 2022-07-18 19:30:29 -04:00
GaryOderNichts
660897ff63
Avoid UB on ocarinaAction shifts (#809) 2022-07-18 19:29:24 -04:00
PurpleHato
9118788149
ADD: SaveEditor Edit current D-Pad Item (#799) 
* ADD: Dapd on "current Dpad equip

* TWEAK: Spelling

* TWEAK: Shows it only if gDpadEquips is enable

* TWEAK: Forgot one "D-pad"

* TWEAK: Spacing
 2022-07-18 19:24:56 -04:00
briaguya
9e8335c1f0
fix non-rando non-3d-drops small key crash (#789) 
Co-authored-by: briaguya <briaguya@alice>
 2022-07-18 19:22:12 -04:00
briaguya
d45968270a
Address rando pr comments (#742) 
* prefix randomizer methods with Randomizer_

* make filename a local var

* remove unused file, update malon to use new names

* move randomizertypes to randomizer directory

* rename to Randomizer_GetSettingValue

Co-authored-by: briaguya <briaguya@alice>
 2022-07-18 19:20:07 -04:00
Sarge-117
486c129fb4
Merge pull request #4 from Sarge-117/fix-broken-knife-inventory-icon 
Fix broken knife inventory icon
 2022-07-18 15:00:42 -07:00
aMannus
3a11aa08bb Added v1 ice traps and fixed some tokens 2022-07-18 23:55:44 +02:00
Sarge-117
b188ed8fb4 less whitespace 2022-07-18 14:47:15 -07:00
Sarge-117
3de4e955db 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.
 2022-07-18 14:44:55 -07:00
aMannus
3341c3d404 Another batch of spooders 2022-07-18 11:08:35 +02:00
aMannus
06c3c2ba67 Fixed mistake 2022-07-18 09:10:36 +02:00