Commit Graph

  • d96feaf4a4 Tidy up chain platform cutscene check Sarge-117 2022-09-06 14:00:09 -0700
  • 5b4ce49688 Base whats in the bazaar shop on entranceIndex instead of age Garrett Cox 2022-09-06 15:59:09 -0500
  • 21bf25bc7d Clean up chain platform cutscene check Sarge-117 2022-09-06 13:42:17 -0700
  • 100d83151e Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-06 12:43:13 -0700
  • b1bf7689ec PoC using description, options, and defaults from 3drando rather than in our randomizer.cpp Garrett Cox 2022-09-06 14:32:02 -0500
  • 9e6defe1b5 Fix merge mistake Sarge-117 2022-09-06 12:21:06 -0700
  • d02114a9d8 Handle shop items in SaveManager Garrett Cox 2022-09-06 13:36:56 -0500
  • b02ab9185d Rename randomizerMerchantPrices to merchantPrices Garrett Cox 2022-09-06 13:32:59 -0500
  • b2f4d5e95a Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-06 13:30:49 -0500
  • 32f27128a0 Missed a couple Sarge-117 2022-09-06 11:14:26 -0700
  • 99b9531cfd Merge branch 'zhora-magic-arrows' into rando-enhanced-magic-arrows Sarge-117 2022-09-06 11:10:46 -0700
  • 37acd52016 Clarify var names and comments Sarge-117 2022-09-06 11:05:52 -0700
  • 5991be8256 Remove !=0 from cvar check Sarge-117 2022-09-06 10:57:08 -0700
  • a73729b9b1 Clarify var names and comments Sarge-117 2022-09-06 10:40:26 -0700
  • a999a51998 Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows Sarge-117 2022-09-06 08:50:37 -0700
  • 678054973b Merge branch 'develop-zhora' into feature/crowd-control David Chavez 2022-09-06 17:19:32 +0200
  • f471780fbd boxes louis 2022-09-06 10:32:59 -0400
  • 0683b30bf2
    Merge pull request #4 from leggettc18/pr/garrettjoecox/1329 Garrett Cox 2022-09-06 09:06:48 -0500
  • 2e5775a255 Enhancement: Ask to Continue After Saving lilDavid 2022-08-23 18:18:13 -0500
  • 428ab59c18 wiiu: package SoH as a homebrew bundle GaryOderNichts 2022-09-06 11:50:27 +0200
  • 3b844375b7
    Add missing pendingFlags (#1414) aMannus 2022-09-06 11:27:26 +0200
  • acaf4e6bcc
    Fixes sold out items not getting overwritten by the randomized info. Christopher Leggett 2022-09-06 02:42:55 -0400
  • 62bb38ac30 Move flag descriptions to header file Garrett Cox 2022-09-06 00:46:31 -0500
  • 8d75603e4b
    Merge pull request #1425 from garrettjoecox/1471-fix-shooting-gallery-rando-check briaguya 2022-09-06 01:30:37 -0400
  • 4d9bf936b1
    Fixes order of operations so Rupees will be spent. Christopher Leggett 2022-09-06 01:12:11 -0400
  • d2682998c4
    Merge pull request #1423 from garrettjoecox/fix-for-scrubs-being-disabled briaguya 2022-09-06 01:05:16 -0400
  • 5d38b23850
    Implements items selling out and fixes issues with purchasing some items. Christopher Leggett 2022-09-06 00:58:36 -0400
  • db9f608177 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-05 21:41:18 -0700
  • a99330a8a5 Fix #1417 Garrett Cox 2022-09-05 23:28:32 -0500
  • c9c648322d Fix for a single zeroed merchantPrice entry Garrett Cox 2022-09-05 22:30:39 -0500
  • 0ab4f21382 Fix issue when merchantPrices is empty Garrett Cox 2022-09-05 22:14:39 -0500
  • 351edf3a3c fixed zora river decoupling Ryanoberlein 2022-09-05 23:07:43 -0400
  • c0b3f229fa
    Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem. Christopher Leggett 2022-09-05 20:39:52 -0400
  • 885d6dc6c2
    Merge pull request #1422 from garrettjoecox/scrubs-trials-persist briaguya 2022-09-05 19:41:58 -0400
  • 803ef49f6d
    Merge pull request #1416 from aMannus/rando-skip-mask-shop-fix briaguya 2022-09-05 19:27:00 -0400
  • bafd016cd9
    Merge pull request #1413 from aMannus/rando-key-colors-default briaguya 2022-09-05 19:09:37 -0400
  • 670a41bd08 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-05 15:33:15 -0500
  • 96a3354d45 Remove trialsRequired persisting in save manager Garrett Cox 2022-09-05 15:12:30 -0500
  • 1c13fdec5f Add trials required and merchant prices to save file instead of loading from active spoiler log Garrett Cox 2022-09-05 14:55:34 -0500
  • 1359f1012e Update randomizer save format Garrett Cox 2022-09-05 13:23:16 -0500
  • fb5aff393a tooltip line break aMannus 2022-09-05 16:54:02 +0200
  • 9afe3ca746 Fix gerudo keys, add disabled checkbox aMannus 2022-09-05 16:48:59 +0200
  • 39852c9278 Fix Sold Out bug aMannus 2022-09-05 11:46:50 +0200
  • da7dc55317 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-04 20:18:54 -0700
  • d69ebeba85 Reverted incorrect change from merge Oliver Schall 2022-09-05 01:31:38 +0200
  • 5aaaccb72d Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-04 15:36:12 -0700
  • 983ab139d5 Add another flag to skip mask shop aMannus 2022-09-05 00:35:56 +0200
  • 87a78cf87c
    Merge pull request #1405 from PurpleHato/TrackerAmmoFix briaguya 2022-09-04 18:35:46 -0400
  • c933280aea Add missing pendingFlags aMannus 2022-09-04 23:38:04 +0200
  • fc9adcace3 Fix windows. louist103 2022-09-04 17:14:16 -0400
  • fe413fd675 Set key colors to be on by default aMannus 2022-09-04 23:09:17 +0200
  • 45fc416963 Swap german and french translations for shop messages Garrett Cox 2022-09-04 15:25:37 -0500
  • ad1e051b59 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-04 15:23:18 -0500
  • a6937e9850 added hovertext for the number display PurpleHato 2022-09-04 21:31:50 +0200
  • adb7ce773e
    Merge pull request #3 from leggettc18/pr/garrettjoecox/1329 Garrett Cox 2022-09-04 14:30:47 -0500
  • f282e25c16 Move all merchant messages to be generated on file load Garrett Cox 2022-09-04 13:53:59 -0500
  • 47c7d3f061 always display XX/YY when in ammo/capacity mode PurpleHato 2022-09-04 20:39:56 +0200
  • e11ca62ee1 small tweaks and rename PurpleHato 2022-09-04 20:09:48 +0200
  • 2c241d5fe8 Merge branch 'rando-next' into TrackerAmmoFix PurpleHato 2022-09-04 19:57:56 +0200
  • 7a222f9d0f
    Merge pull request #20 from garrettjoecox/item-tracker-count-adjustments PurpleHato 2022-09-04 19:39:01 +0200
  • 6bf886ecae Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options Garrett Cox 2022-09-04 11:55:40 -0500
  • 8206559924 Add Items submenu to Enhancements > Gameplay lil David 2022-09-01 07:53:15 -0500
  • 9e617f8923
    Implement's Tycoon Wallet. Christopher Leggett 2022-09-04 12:32:07 -0400
  • ed78fc0018 comment out call to thing that doesn't exist for now briaguya 2022-09-04 11:12:43 -0400
  • b210690234 include in project briaguya 2022-09-04 10:47:47 -0400
  • d600489666 just nogdi briaguya 2022-09-04 10:27:34 -0400
  • 5e514e5d12 i really don't want to set up a windows vm on my laptop briaguya 2022-09-04 08:38:06 -0400
  • f2781f8cf3 lean and mean? briaguya 2022-09-04 08:31:14 -0400
  • 6a375c396d move stuff out of header? briaguya 2022-09-04 08:24:39 -0400
  • 3a1d16b530 include order? briaguya 2022-09-04 08:13:41 -0400
  • b9259842e8 lean and mean briaguya 2022-09-04 08:00:19 -0400
  • 2c63321638
    Merge pull request #1407 from garrettjoecox/item-tracker-notes-fix briaguya 2022-09-04 07:47:01 -0400
  • 1bbde39439 Ensure itemTrackerNotes vector is not fully empty Garrett Cox 2022-09-04 02:03:16 -0500
  • 347154c4d1 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-03 22:31:21 -0700
  • 9a32b83fa1 fixed epona cutscene issues Ryanoberlein 2022-09-03 23:50:12 -0400
  • 6439c45f26
    Merge pull request #1402 from garrettjoecox/beans-obtainability-fix briaguya 2022-09-03 20:04:11 -0400
  • 6dbc292ff3 Fix: changes to please new LUS PurpleHato 2022-09-04 01:22:15 +0200
  • ed96a0c272
    Merge branch 'rando-next' into TrackerAmmoFix PurpleHato 2022-09-04 01:08:26 +0200
  • 27f613b3f8 All color logic for all types PurpleHato 2022-09-04 01:03:28 +0200
  • e55ec29d66
    Merge pull request #1396 from garrettjoecox/item-tracker-notes briaguya 2022-09-03 18:40:32 -0400
  • 8a3d1352d7 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-03 17:39:11 -0500
  • da7462d6e6 made gerudo fortress accessible from desert entrance Ryanoberlein 2022-09-03 18:27:59 -0400
  • d4bc5875d7 tweak on main logic PurpleHato 2022-09-03 23:49:15 +0200
  • 938ecef131 Tooltip wording + line break Sarge-117 2022-09-03 14:27:27 -0700
  • e9822eed62 Add line break in tooltip Sarge-117 2022-09-03 14:25:47 -0700
  • dc4d8e322b Update tooltip Sarge-117 2022-09-03 14:19:59 -0700
  • 27e58842b0 Update tooltip Sarge-117 2022-09-03 14:10:39 -0700
  • 9b841c428a
    Merge pull request #11 from aMannus/rando-magical-arrows Sarge-117 2022-09-03 14:05:49 -0700
  • 4c6aeb9fb0
    Merge branch 'rando-enhanced-magic-arrows' into rando-magical-arrows Sarge-117 2022-09-03 14:05:37 -0700
  • 70ab1406e1 Incorporate magic arrows in rando settings aMannus 2022-09-03 22:56:09 +0200
  • ac830c86d2 Hide randomizer flags when not on a randomizer save Garrett Cox 2022-09-03 15:52:26 -0500
  • 0848144243 Merge branch 'develop-zhora' into 'shooting-gallery-difficulty' Oliver Schall 2022-09-03 22:49:17 +0200
  • 77a5d03019 Hook into file delete and clear notes Garrett Cox 2022-09-03 15:46:33 -0500
  • 72660e2cfd Fix for beans obtainability Garrett Cox 2022-09-03 15:28:59 -0500
  • 377c030469 Fixed capacity on ammmo tracking PurpleHato 2022-09-03 21:57:58 +0200
  • 836129835d backport crash handler louis 2022-09-03 15:57:53 -0400
  • 2b540df7ea Update logic Cvar name Sarge-117 2022-09-03 12:57:46 -0700
  • 4735fc1cad backport crash handler louis 2022-09-03 15:57:05 -0400
  • a260f680d1
    Merge branch 'rando-next' into rando-enhanced-magic-arrows Sarge-117 2022-09-03 12:17:23 -0700
  • d90145da47
    Merge pull request #1391 from aMannus/rando-skip-scarecrow briaguya 2022-09-03 15:04:58 -0400