mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 01:25:16 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,663 Commits 6 Branches 52 Tags
c2c6955b9087af841f86c2880fef0cfcbbba3f89
Commit Graph

1663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garrett Cox c2c6955b90 [#1434] Renders non-warp songs more consistently with warp songs 2022-09-16 08:59:22 -05:00
briaguya 1c3d7f92b6 Merge pull request #1477 from louist103/format-rando-1 
Format hint_list.cpp
 2022-09-15 09:05:19 -04:00
louist103 c6ea367856 format 2022-09-14 22:37:05 -04:00
briaguya 978ddcc5a6 Merge pull request #1471 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-09-14 10:58:59 -04:00
briaguya 941cf65227 use strnlen for c string empty check (#1352) 
* use strcmp for c string compare

* Update z_file_choose.c

Co-authored-by: briaguya <briaguya@alice>
 2022-09-13 21:12:03 -04:00
aMannus e1f95a5ad9 ImGui Switch/Wii U slider fixes (#1371) 
* Switch/Wii U slider fixes

* Attempt at better spacing

* Updated after ImGui merge
 2022-09-13 20:47:00 -04:00
lilDavid 18a26b480e Use Color_RGB8 CVars in z_message_PAL (#1372) 2022-09-13 20:45:51 -04:00
Christopher Leggett 67bbeca809 Another fix for getting items near critters. (#1332) 2022-09-13 20:45:23 -04:00
Josh Bodner eda5a6ac91 Fix blocks not being pushed all the way (#1363) 2022-09-13 20:38:26 -04:00
briaguya 43cde7eccd Merge pull request #1467 from HarbourMasters/develop-zhora 
zhora -> rando-next (pdb for crash handler)
 2022-09-13 11:37:14 -04:00
briaguya e646903691 Merge pull request #1442 from leggettc18/leggettc18/issue1071 
Randomizer: Fixes Child only Gerudo Fortress PoH matching with RC_GF_CHEST
 2022-09-13 11:02:05 -04:00
briaguya e73e26c54a Merge pull request #1465 from garrettjoecox/patch-1 
Fix amount of keys given for BotW
 2022-09-13 10:31:31 -04:00
briaguya 04a375aa6e Merge pull request #1464 from garrettjoecox/tiny-fix-for-tracker-wallet 
Fix adult wallet having its own max capacity on tracker
 2022-09-13 10:31:20 -04:00
Garrett Cox 420ebf3715 Fix amount of keys given for BotW 2022-09-13 01:13:20 -05:00
Garrett Cox 717c639783 Fix adult wallet having its own max capacity 2022-09-13 00:56:26 -05:00
briaguya 09ab2dc24c Merge pull request #1335 from Sarge-117/rando-enhanced-magic-arrows 
Rando: Enhanced Magic Arrows
 2022-09-12 16:45:47 -04:00
Kenix3 a2d4f4766d Fixes crash handler for jenkins builds. (#1445) 
* Fixes crash handler for jenkins builds.

We must include the pdb in redistributables.

* Properly selects PDB file path for inclusion

Co-authored-by: Christopher Leggett <chris@leggett.dev>
 2022-09-11 23:15:10 -04:00
Sarge-117 4db2f44f7b Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-11 11:32:50 -07:00
briaguya 1eb6235ddc Merge pull request #1456 from leggettc18/leggettc18/issue1437 
Fixes Ice Trap as starting item.
 2022-09-09 21:46:40 -04:00
Christopher Leggett 944d5344dc Applies fix to Song from Impa as well. 2022-09-09 19:20:20 -04:00
Christopher Leggett cfc24b16ca crash on pause menu on linux (only in appimage) 
Fixes #1437
 2022-09-09 19:20:20 -04:00
Sarge-117 aee6445a45 Fix merge error 2022-09-08 22:22:31 -07:00
Sarge-117 0f0c438b1b Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-08 22:04:30 -07:00
briaguya 19b8e12933 Merge pull request #1449 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-09-09 00:16:36 -04:00
Garrett Cox 74ec9f6c04 Add descriptions to save editor flags editor, and added randomizer flags (#1386) 
* Add descriptions to save editor flags editor, and added randomizer flags

* Hide randomizer flags when not on a randomizer save

* Move flag descriptions to header file

* Update soh/soh/Enhancements/debugger/debugSaveEditor.h

* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
 2022-09-08 23:48:15 -04:00
Sarge-117 a9f3aedf8e Enhanced Magic Arrows (non-rando) (#1376) 
* Add magic arrow enhancements, non-rando

Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision

* Update tooltip

* Simplify mudwall collision check

* Restore checkboxes in menu

Accidentally lost these during merge

* Update tooltip

* Add line break in tooltip

* Clarify var names and comments

Also preserve chain platform cutscene in spirit based on Link's position

* Remove !=0 from cvar check

* Missed a couple

* Clean up chain platform cutscene check
 2022-09-08 22:58:08 -04:00
lilDavid 9686a7ca4c Add Items submenu to Enhancements > Gameplay (#1410) 2022-09-08 22:57:09 -04:00
GaryOderNichts e80e3440e1 wiiu: package SoH as a homebrew bundle (#1427) 2022-09-08 22:55:55 -04:00
Kenix3 4cda92462a Lowers severity of resource manager logging. 2022-09-08 20:25:44 -04:00
Christopher Leggett 210ed5e1c6 Merge branch 'rando-next' into leggettc18/issue1071 2022-09-08 20:07:35 -04:00
Christopher Leggett b9c7f74ef9 Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into rando-next 2022-09-08 20:06:24 -04:00
Christopher Leggett 6b273c9041 [Rando] Child Gerudo Fortress 37th Heartpiece randomized 
Fixes #1071
 2022-09-08 20:02:58 -04:00
Kenix3 4a0269b3b1 Increment version 2022-09-08 19:10:03 -04:00
louist103 4d81c28738 boxes (#1428) 2022-09-08 19:05:16 -04:00
Sarge-117 5e0382384b Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-07 22:12:36 -07:00
briaguya 2c693d2f22 Merge pull request #1433 from garrettjoecox/use-3drando-item-names 
Use 3drando item table for parsing spoiler names
 2022-09-07 23:41:43 -04:00
briaguya 956c04cfc4 Merge pull request #1436 from leggettc18/better_icon_hash 
Randomizer: Better Icon Hashes
 2022-09-07 23:22:21 -04:00
Christopher Leggett 32c0af27a8 Hopefully makes Jenkins happy 2022-09-07 22:51:43 -04:00
Christopher Leggett f7af306eff Hopefully makes Jenkins happy 2022-09-07 22:48:11 -04:00
Christopher Leggett 90cc2fa361 Changes filename format to icon indexes separated by dashes 2022-09-07 22:22:16 -04:00
Christopher Leggett cb0f4ffd97 Prevents leading 0s added to hash from being in file name 2022-09-07 21:30:33 -04:00
Christopher Leggett bba59509f3 Removes some unused functions and variables in spoiler_log.cpp 2022-09-07 21:23:41 -04:00
Christopher Leggett e3d174cc9b Uses the hash instead of seed for spoilerfile name and icons. 2022-09-07 21:19:16 -04:00
Christopher Leggett 1763eda169 Implements a larger array of Sprites for the Icon Hash. 2022-09-07 20:23:22 -04:00
Garrett Cox 85bb09c70b Remove log 2022-09-06 21:24:05 -05:00
Garrett Cox f366e1d56e Add missing newline 2022-09-06 21:19:43 -05:00
Garrett Cox 4dd9c99c11 Use another nested method instead of one at the top level to fetch the table 2022-09-06 21:17:55 -05:00
Garrett Cox f47f27c19e Use 3drando item table for parsing spoiler names 2022-09-06 19:42:01 -05:00
Sarge-117 cfc5d1d4e3 Fix merge error 
Didn't mean to have Zhora changes in here yet
 2022-09-06 14:05:29 -07:00
Sarge-117 d96feaf4a4 Tidy up chain platform cutscene check 2022-09-06 14:00:09 -07:00