mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 06:41:52 -05:00
Code Issues Projects Releases Wiki Activity
662 Commits 3 Branches 38 Tags
Commit Graph

432 Commits

Author SHA1 Message Date
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
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
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
aMannus
3a11aa08bb Added v1 ice traps and fixed some tokens 2022-07-18 23:55:44 +02: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
aMannus
3b747b41be Cleanup and freeze fix 
Don't freeze the player when the skulltula token check is something else than a token. Also some cleanup and declaring variables more globally within z_en_si.c
 2022-07-18 09:05:32 +02:00
aMannus
0da14603e2 Freeze fix/first batch of skull actors 2022-07-17 23:50:48 +02:00
aMannus
4ccd4d5895 Exposed static table to change skulltokens 
This static table is normally only used within z_player.c, but is needed to switch the itemId to something Item_Give() can use and to set the correct TextId.
 2022-07-17 16:02:27 +02:00
aMannus
0f1f8c15f2 Closer but not yet 2022-07-16 12:20:53 +02:00
aMannus
ac099018e4 still nothing yet 2022-07-15 14:56:52 +02:00
M4xw
93bea4c151 git subrepo push soh 
subrepo:
  subdir:   "soh"
  merged:   "75ccbade8"
upstream:
  origin:   "https://github.com/HarbourMasters/soh.git"
  branch:   "master"
  commit:   "75ccbade8"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"
 2022-07-14 20:47:48 -04:00
aMannus
fe8641cab4 not yet 2022-07-14 10:45:42 +02:00