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,578 Commits 6 Branches 52 Tags
c0b3f229fa8a6994f84e40410b18b84fb6bcc346
Commit Graph

1578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Leggett c0b3f229fa Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem. 2022-09-05 20:39:52 -04:00
Garrett Cox 670a41bd08 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-05 15:33:15 -05:00
briaguya 87a78cf87c Merge pull request #1405 from PurpleHato/TrackerAmmoFix 
Rando: Item Tracker currentAndMax rework
 2022-09-04 18:35:46 -04:00
Garrett Cox 45fc416963 Swap german and french translations for shop messages 2022-09-04 15:25:37 -05:00
Garrett Cox ad1e051b59 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-04 15:23:18 -05:00
PurpleHato a6937e9850 added hovertext for the number display 2022-09-04 21:31:50 +02:00
Garrett Cox adb7ce773e Merge pull request #3 from leggettc18/pr/garrettjoecox/1329 
Implement's Tycoon Wallet.
 2022-09-04 14:30:47 -05:00
Garrett Cox f282e25c16 Move all merchant messages to be generated on file load 2022-09-04 13:53:59 -05:00
PurpleHato 47c7d3f061 always display XX/YY when in ammo/capacity mode 2022-09-04 20:39:56 +02:00
PurpleHato e11ca62ee1 small tweaks and rename 2022-09-04 20:09:48 +02:00
PurpleHato 2c241d5fe8 Merge branch 'rando-next' into TrackerAmmoFix 2022-09-04 19:57:56 +02:00
PurpleHato 7a222f9d0f Merge pull request #20 from garrettjoecox/item-tracker-count-adjustments 
Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
 2022-09-04 19:39:01 +02:00
Garrett Cox 6bf886ecae Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options 2022-09-04 11:55:40 -05:00
Christopher Leggett 9e617f8923 Implement's Tycoon Wallet. 2022-09-04 12:32:07 -04:00
briaguya 2c63321638 Merge pull request #1407 from garrettjoecox/item-tracker-notes-fix 
Ensure itemTrackerNotes vector is not fully empty in InitItemTracker
 2022-09-04 07:47:01 -04:00
Garrett Cox 1bbde39439 Ensure itemTrackerNotes vector is not fully empty 2022-09-04 02:06:42 -05:00
briaguya 6439c45f26 Merge pull request #1402 from garrettjoecox/beans-obtainability-fix 
Fix for beans obtainability
 2022-09-03 20:04:11 -04:00
PurpleHato 6dbc292ff3 Fix: changes to please new LUS 2022-09-04 01:22:15 +02:00
PurpleHato ed96a0c272 Merge branch 'rando-next' into TrackerAmmoFix 2022-09-04 01:08:26 +02:00
PurpleHato 27f613b3f8 All color logic for all types 2022-09-04 01:03:28 +02:00
briaguya e55ec29d66 Merge pull request #1396 from garrettjoecox/item-tracker-notes 
Persist item tracker notes
 2022-09-03 18:40:32 -04:00
Garrett Cox 8a3d1352d7 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-03 17:39:11 -05:00
PurpleHato d4bc5875d7 tweak on main logic 2022-09-03 23:49:15 +02:00
Garrett Cox 77a5d03019 Hook into file delete and clear notes 2022-09-03 15:46:33 -05:00
Garrett Cox 72660e2cfd Fix for beans obtainability 2022-09-03 15:28:59 -05:00
PurpleHato 377c030469 Fixed capacity on ammmo tracking 2022-09-03 21:57:58 +02:00
briaguya d90145da47 Merge pull request #1391 from aMannus/rando-skip-scarecrow 
Rando: Add Skip Scarecrow's Song option
 2022-09-03 15:04:58 -04:00
briaguya 8e49f0465c Merge pull request #1399 from aMannus/rando-bombchu-drops 
Rando: Add Bombchu Drops
 2022-09-03 15:03:30 -04:00
aMannus 6cd8d6ca3a Clean up bool 2022-09-03 20:48:00 +02:00
aMannus 8d033c6766 Update settings.cpp 2022-09-03 20:29:45 +02:00
aMannus ae0ccb9cca Missing break 2022-09-03 20:18:54 +02:00
aMannus 274242e0d7 Implement rando bombchu drops 2022-09-03 20:17:12 +02:00
briaguya cbc181bc0a Merge pull request #1392 from lilDavid/re-add_progressive_chus 
Reimplement progressive Bombchus + fix bowling Bombchu prize
 2022-09-03 14:13:17 -04:00
briaguya 98dbbfda13 Merge pull request #1395 from leggettc18/starting-bgs 
Fixes Link starting with BGS
 2022-09-03 13:36:12 -04:00
briaguya 1f7122025f Merge pull request #1394 from leggettc18/leggettc18/issue1390 
Rando-next: Fixes Enemy Drops giving a blue rupee
 2022-09-03 13:33:19 -04:00
Garrett Cox ac6843ca57 Fix for overriding deku scrub messages 2022-09-03 10:34:35 -05:00
Garrett Cox 771d1dfbf5 Fix issues from LUS refactor 2022-09-03 10:09:51 -05:00
Garrett Cox c037bfc16b Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-03 09:49:50 -05:00
Garrett Cox b92b1eaee6 Use SohImGui::RequestCvarSaveOnNextTick 2022-09-03 09:33:54 -05:00
Garrett Cox 90bf5988ee Adjust Hooks include 2022-09-03 09:30:53 -05:00
Garrett Cox 8be6f6e441 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes 2022-09-03 09:19:14 -05:00
Garrett Cox ed8966054c Persist item tracker notes 2022-09-03 09:15:05 -05:00
Christopher Leggett e079c254f1 Fixes Link starting with BGS 2022-09-03 09:39:03 -04:00
Christopher Leggett 5421ad27c9 Rando-next: Deku Nut and Seed ammo gives a blue rupee 
Fixes #1390
 2022-09-03 09:24:37 -04:00
lil David f5fae6df32 Reimplement progressive Bombchus 2022-09-03 08:11:51 -05:00
aMannus 8d2f63419f Implement Skip Scarecrow's Song 2022-09-03 14:40:41 +02:00
aMannus 3aefd4c519 gSaveContext access in GameMenuBar.cpp 2022-09-03 12:47:32 +02:00
briaguya 431231f2be Merge pull request #1388 from briaguya-ai/z-to-rando-next 
zhora -> rando-next
 2022-09-03 06:10:09 -04:00
briaguya 007540fb39 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 05:55:40 -04:00
aMannus f1dc980de8 Fixed autobreak after ImGui cleanup 2022-09-03 05:52:01 -04:00