mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 17:41:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
552 Commits 6 Branches 52 Tags
bfd76dc2449aa1750b5208e8a16dbd7a894fdfec
Commit Graph

552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
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 67017e3e1b Merge branch 'develop' into spoopy-spiders 2022-07-14 22:40:16 +02: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
KiritoDev b2b7cf2374 Fixed menubar items position (#763) 
* Fixed menubar items position

* Reverted tooltip tab position
 2022-07-14 00:42:15 -04:00
Kenix3 31511af130 Enough! My ship sails in the morning. 2022-07-13 23:41:22 -04:00
KiritoDev 219804cbe4 Controller Configuration UI and JSON Config (#760) 
* Initial controller hud ui

* Reverted fbdemo changes

* Moved config to json and implemented controller config

* fix build on linux, gitignore new config file

* fix build

* Fix compilation and file directory paths

* Call save on cvar save

* Fixed cvar loading and added deck slots to the config

* Changed control deck port 0 to use a physical device by default

* Added gyro and rumble & fixed loading errors

* Save config on toggle menubar

* fix linux build

* Fixed drift calculation

* Controller config now saves when pressing F1

* Removed ExitGame hook from ImGuiImpl

* Moved mappings to a map

* Added GetKeyName

* untranslate scancodes

* Fixed hud layout on keyboard device

* Fixed keyboard read on hud

* Fixed crash when reloading controllers

* Removed ConfigFile and changed file extension

* Changed Dummy to Disconnected and fixed filters

* Removed function leftover

* Changed ControllerHud to InputEditor

Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
 2022-07-13 23:12:11 -04:00
briaguya cb6876792e don't spawn blocking mido after we've already shown him the sword/shield (#675) 
Co-authored-by: briaguya <briaguya@alice>
 2022-07-13 22:04:48 -04:00
aMannus f7db8868d0 Skip warp song cutscenes in rando (#664) 
Does it by skipping to the last part of the cutscene data. Tested on all songs, both adult and child.
 2022-07-13 22:04:19 -04:00
Nicholas Estelami 379649bead Fixed soundfont issues 2022-07-13 21:36:19 -04:00
ChristopherJTrent 248f49b3bf Update Keese labels 2022-07-13 19:39:44 -04:00
Baoulettes 2b72b10356 .xiF slebaL 2022-07-13 19:39:25 -04:00
Christopher Leggett 7c6d8a6b9c Fixes Maps, Compasses, and Boss Keys in Vanilla. (#751) 2022-07-13 19:38:25 -04:00
earthcrafterman 4d65a5ff73 Split damage multiplication into its own PR (#656) 
* Split damage multiplication into its own PR

* Found a more elegant implementation of the powers char*[]
 2022-07-13 00:24:05 -04:00
Baoulettes cff73cccf0 fix hidden wnd (#744) 2022-07-13 00:23:22 -04:00