mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 09:31:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,338 Commits 6 Branches 52 Tags
f7bd48aaca3280a23485a7cf093bbb8ed29d4062
Commit Graph

1338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garrett Cox f7bd48aaca Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf 2022-08-25 10:27:34 -05:00
Garrett Cox 95372718a3 Transition a few things to randomizerInf flags 2022-08-25 10:27:31 -05:00
briaguya 4ca146b4e1 Merge pull request #1299 from aMannus/bgs-dupe-fix 
Rando: Fix BGS dupe check
 2022-08-25 07:49:10 -04:00
briaguya 9b972c6e4a Merge pull request #1304 from aMannus/item-tracker-v3-ganonkey-fix 
Rando: Item Tracker V3 Ganon's Castle small key fix
 2022-08-25 07:21:45 -04:00
aMannus c41de36c46 Comment 2022-08-25 10:36:28 +02:00
aMannus 6fd22f50ab Swapped logic to boss key 2022-08-25 10:35:04 +02:00
aMannus 954a96baeb tha fix 2022-08-25 10:27:04 +02:00
aMannus 050a9db01d Fix BGS dupe check 2022-08-25 08:38:42 +02:00
briaguya d2fe83edf4 Merge pull request #1295 from HarbourMasters/develop-zhora 
quick zhora -> rando-next
 2022-08-24 19:47:26 -04:00
Baoulettes c0b9171f98 Cosmetics Editor Fixes (#1287) 2022-08-25 01:28:27 +02:00
briaguya f15b3880f3 Merge pull request #1292 from aMannus/custom-key-colors-fix 
Rando: Custom key colors fix
 2022-08-24 17:17:54 -04:00
briaguya 1d77b7fd24 Merge pull request #1293 from aMannus/rando-lost-woods-target-crash-fix 
Rando: Lost Woods target crash fix
 2022-08-24 17:16:15 -04:00
briaguya 0af2239473 Merge pull request #1290 from garrettjoecox/item-tracker-v3-fixes 
Item tracker v3 small fixes
 2022-08-24 17:14:38 -04:00
aMannus a48ac71762 Fixed lost woods target crash 2022-08-24 23:02:48 +02:00
Garrett Cox 27ced1feca Move some comments around 2022-08-24 15:52:19 -05:00
aMannus 179c432ee1 Comment 2022-08-24 22:20:20 +02:00
aMannus d5074c3e77 Fixes double def and split second wrong colors 2022-08-24 22:18:24 +02:00
Ada b70ad81f57 Add platform specific OTR instructions to readme (#1291) 2022-08-24 22:02:20 +02:00
briaguya f88e7fabd5 Merge pull request #1283 from leggettc18/color-coded-keys 
Implements Color Coded Keysanity keys and easier custom draw functions
 2022-08-24 14:46:52 -04:00
Garrett Cox 29509341f9 Support hiding compasses and maps, move combo button behind floating window condition, add padding to windows mode 2022-08-24 13:15:00 -05:00
Christopher Leggett 37fe5491b2 Always color in Double Defense 2022-08-24 13:58:25 -04:00
Christopher Leggett 02a8ba8bb9 Fixes incorrect key order in DrawSmallKeys. 2022-08-24 13:16:14 -04:00
Christopher Leggett 821c7948d6 Cleanup 2022-08-24 13:06:48 -04:00
Christopher Leggett ecd0e3e8bb Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys 2022-08-24 13:03:44 -04:00
briaguya 96d7602761 Merge pull request #1261 from garrettjoecox/item-tracker-v3 
Item tracker v3
 2022-08-24 11:20:47 -04:00
briaguya 61b6d162e8 Merge pull request #1288 from leggettc18/grass-chest-fix 
Fixes rando-next exclusive grass-chest bug I inadvertently introduced.
 2022-08-24 10:58:34 -04:00
briaguya f62ffe57a9 Merge pull request #1243 from aMannus/rando-rupee-names 
Rando: Random rupee names in textboxes
 2022-08-24 10:49:25 -04:00
Christopher Leggett 69a7012b5a Fixes grass-chest bug I inadvertently introduced. 2022-08-24 10:45:39 -04:00
aMannus bfc524c6ef Merge fix, tooltip tweak 2022-08-24 15:57:54 +02:00
aMannus 0e288fc55d Merge branch 'rando-next' into rando-rupee-names 2022-08-24 15:51:02 +02:00
aMannus 684cd862f1 Renamed function 2022-08-24 15:29:45 +02:00
Christopher Leggett e3ae302a64 Adds padding to a few checkboxes in rando menu that were missing it 2022-08-24 00:17:47 -04:00
Christopher Leggett 855147b265 Merge branch 'rando-next' into color-coded-keys 2022-08-24 00:17:37 -04:00
Christopher Leggett 6561073c7b Implements ImGui Checkbox to enable or disable color-coded-keys. 2022-08-24 00:07:16 -04:00
Christopher Leggett c7b998b33b Implements better way to use new draw functions and adds Double Defense colors. 2022-08-23 23:48:14 -04:00
briaguya e7cd2fd649 Merge pull request #1087 from Sarge-117/rando-navi-tips 
Rando navi tips
 2022-08-23 21:53:34 -04:00
briaguya 438331a7e2 Merge pull request #1282 from briaguya-ai/z-to-rn 
zhora -> rando-next
 2022-08-23 21:25:13 -04:00
briaguya a8def1fca8 fix old reference to GlobalCtx2 2022-08-23 21:13:47 -04:00
Christopher Leggett 28afbec341 Adds support for custom drawing functions, and adds one for Small Keys and Boss Keys. 2022-08-23 21:12:21 -04:00
briaguya 133cbcd6c8 Merge branch 'develop-zhora' into z-to-rn 2022-08-23 21:05:35 -04:00
briaguya b7e07bef2f Merge pull request #1191 from leggettc18/get-item-rework-rando-next 
Get-item-rework-rando-next
 2022-08-23 20:40:08 -04:00
Kenix3 0573a1b2ac Adds const to DirtyDirectory std::string 2022-08-23 20:38:22 -04:00
Kenix3 b774252f0c ResourceMgr now decreases priority of load messages to trace. 2022-08-23 20:38:22 -04:00
Kenix3 3792b03a7d Cleans up InputEditor class. 2022-08-23 20:38:22 -04:00
Jake Edvenson 927ffd0b8b Enhancement: Scarecrow song skip (#1183) 
* Added Skip Scarecrow Song

Added in the option for if the user has the time saver for Scarecrow song enabled and has their Ocarina pulled out in range of Pierre.
Added Skip Scarecrow Song
New enhancement under time-savers that allows the user to only pull out their ocarina to summon Pierre.

* Added Default for Scarecrow summon

The scarecrow summon option now defaults to 0 and can be turned on individually. I haven't included it in any other presets so people don't feel like they're cheating.

* Checks if scarecrow song is in possession

* Fixed positional Scarecrow logic

* Fixed style
 2022-08-23 20:30:06 -04:00
Baoulettes d6ebce068d fixes only (#1255) 2022-08-23 20:20:56 -04:00
Sarge-117 45873ba71d Add CVar + Cvar check 
Defaults to "1"
 2022-08-23 17:16:19 -07:00
lilDavid 4680641514 Add bombchu drops (#1257) 
* Add bombchu drops

* Force 3D bombchu drops

* Move bombchu drop conditions for better clarity

* Fix grouping on chu drop condition
 2022-08-23 20:14:17 -04:00
aMannus ca08680a12 Add: Ability to disable ImGui checkboxes (#1272) 
* Added ability to disable checkboxes

* Renamed args, added disabledGraphic option

* Moved checkbox out of ImGui source
 2022-08-23 20:13:15 -04:00
David Chavez 70d7d66d0c Add multiviewport support for SDL (#1275) 2022-08-23 20:12:40 -04:00