mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-02 00:34:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
817 Commits 6 Branches 52 Tags
b4206382676f8135dcda82c7254859cdee5706d2
Commit Graph

817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sarge-117 65de2a6ecd Merge pull request #3 from Sarge-117/Allow-Equipment-Toggle 
Allow equipment toggle
 2022-07-17 10:05:55 -07:00
Sarge-117 58fdc82bdd Merge pull request #2 from Sarge-117/rando-quest-item-fanfares 
Rando quest item fanfares
 2022-07-17 10:04:17 -07: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
Sarge-117 efe3294f1c Set up Cvar and check for MS 
Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
 2022-07-16 10:10:34 -07:00
aMannus 0f1f8c15f2 Closer but not yet 2022-07-16 12:20:53 +02:00
Sarge-117 cf0b68c572 Allow Equipment Toggle 
Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.
 2022-07-16 00:24:38 -07:00
aMannus ac099018e4 still nothing yet 2022-07-15 14:56:52 +02:00
Sarge-117 d0a42986a9 Merge branch 'HarbourMasters:develop' into rando-quest-item-fanfares 2022-07-14 21:15:51 -07: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 67017e3e1b Merge branch 'develop' into spoopy-spiders 2022-07-14 22:40:16 +02:00
Sarge-117 e60053500d Merge branch 'HarbourMasters:develop' into rando-quest-item-fanfares 2022-07-14 09:49:46 -07:00
Sirius902 8417db65c7 Various controller fixes (#771) 
* Fix controller

* Also fix rumble strength being a bool

* Remove ControllerHud.cpp

* Downgrade platform toolset back to previous version

* Fix gyro

* Fix bug that makes binding axes difficult and clear buttons before reading

* Exaggerate gyro display and adjust stick binding threshold

* Initialize drift thresholds
3.0.0 		2022-07-14 09:05:36 -04:00
aMannus fe8641cab4 not yet 2022-07-14 10:45:42 +02:00
Kenix3 16f52c03b9 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into develop 2022-07-14 01:35:52 -04:00
David Chavez 1ed58c4a99 Fix migration cvar deletion path (#765) 2022-07-14 01:19:40 -04:00
agamache 06338d864f Fixes macOS randomizer functionality with App Directory (#761) 
* Fixes macOS randomizer functionality with App Directory

* Fix windows build

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

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

* Revert band-aid fix

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
 2022-07-14 00:56:29 -04:00