mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-14 13:35:07 -05:00
Code Issues Projects Releases Wiki Activity
837 Commits 3 Branches 37 Tags 140 MiB
f55623e1c6
Commit Graph

837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
briaguya
670f84e183
Merge pull request #674 from aMannus/rando-settings-overhaul 
Rando: Randomizer Settings Menu UX Rework
 2022-07-19 17:04:02 -04: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
briaguya
3921e61e87
Merge pull request #844 from HarbourMasters/develop 
quick dev -> rando-next
 2022-07-18 23:39:55 -04: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
briaguya
fc5776053e
Merge pull request #842 from HarbourMasters/develop 
dev -> rando-next
 2022-07-18 22:10:27 -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
qurious-pixel
dabb83fccf
[APPIMAGE] Use GUI dialog boxes (#829) 
* [APPIMAGE] Use GUI dialog boxes

* [APPIMAGE] Adjust timing
 2022-07-18 19:34:08 -04:00
GaryOderNichts
046b7e8949
Include game version in linux otr builds (#826) 2022-07-18 19:33:36 -04:00
GaryOderNichts
97d1f0e46c
Fix ZAPDTR linking order for linux builds (#825) 
* Fix ZAPDTR linking order for linux builds

* Fix linking on macos
 2022-07-18 19:32:15 -04: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
David Chavez
37afdbd84c
Fix: Respect Config Window Resolution (#807) 
* Fix regression witn using config window res

* Fix fullscreen presets
 2022-07-18 19:28:12 -04:00
Baoulettes
9679075cba
- + button optionnal for Int and float sliders (#803) 2022-07-18 19:26:01 -04:00
Josh Bodner
5e5e57ea8f
Add Windows x64 build instruction (#800) 2022-07-18 19:25:11 -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
Ada
cc28a1444d
Update README.md (#796) 2022-07-18 19:24:20 -04:00
Ada
c65a40f432
Adds tooltip to free camera (#795) 2022-07-18 19:23:28 -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
qurious-pixel
10cb23ad74
[APPIMAGE] LibFuse removal fix (#780) 
* [APPIMAGE] LibFuse removal fix

* [APPIMAGE] LibFuse 2 fix

Keep Original App name
 2022-07-18 19:21:47 -04:00
KiritoDev
2daddd8a5a
Added renderer api switch dropdown (#775) 
* Added renderer api switch

* Joined backend api and names into a pair

* Added close button on input editor
 2022-07-18 19:21:31 -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