Commit Graph

  • 669f76d2f4 Implement Enhanced Magic Arrows Sarge-117 2022-08-27 22:49:13 -0700
  • 9c43f7225b
    Adds captilization to French spoilerfile strings. Christopher Leggett 2022-08-27 18:45:21 -0400
  • fafd90482b
    Refactor of some old rando code to use new functions. Christopher Leggett 2022-08-27 18:42:36 -0400
  • 6aaef2179b
    More Cleanup Christopher Leggett 2022-08-27 18:26:25 -0400
  • 0c3accc46a Remove resolved TODO David Chavez 2022-08-27 22:13:07 +0200
  • 404a637ebd
    Removes added function that went unused. Christopher Leggett 2022-08-27 15:56:11 -0400
  • dbd8909d26
    Forgot to limit slider from 1-6 rather than 0-6 Christopher Leggett 2022-08-27 15:53:57 -0400
  • 4d8bfa97c0
    UI Changes (dropdown and slider rather than checkbox and slider) Christopher Leggett 2022-08-27 15:51:14 -0400
  • c54cbe72cc
    Another fix for getting items near critters. Christopher Leggett 2022-08-27 15:07:52 -0400
  • c9755cd05e
    Merge pull request #1330 from leggettc18/malon-missed-check briaguya 2022-08-27 14:43:35 -0400
  • 3d8b8066da
    More comment cleanup Christopher Leggett 2022-08-27 14:33:38 -0400
  • ff0ef4a6b4
    ImGui/Commented out code cleanup. Christopher Leggett 2022-08-27 14:27:02 -0400
  • 1bf8423f75
    Reimplements selecting different amounts of Ganon's Trials. Christopher Leggett 2022-08-27 14:19:37 -0400
  • 65e76dcfee few fix and paper Link Baoulettes 2022-08-27 17:45:09 +0200
  • 928a39fe9e
    More Cleanup Christopher Leggett 2022-08-27 09:30:49 -0400
  • a572c11f4f
    Fixes ice trap gidata not getting cleared after trap is sprung. (#1322) Christopher Leggett 2022-08-27 03:27:20 -0400
  • bf1b327a95
    Cleanup and Documentation Christopher Leggett 2022-08-27 02:50:44 -0400
  • 7fbb381db7
    Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item. Christopher Leggett 2022-08-27 02:25:13 -0400
  • b924d2e91c Undo crouch Josh Bodner 2022-08-26 23:17:31 -0700
  • f27922df17
    Merge pull request #1328 from leggettc18/starting-adult-trade briaguya 2022-08-26 22:43:36 -0400
  • 67a890ed1e Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-08-26 21:41:21 -0500
  • 62aeac51b9
    ACTUALLY fixes adult trade items on save init this time. Christopher Leggett 2022-08-26 22:14:49 -0400
  • a74461272f
    Merge pull request #1327 from leggettc18/starting-adult-trade briaguya 2022-08-26 21:34:55 -0400
  • 9f47099232
    Properly handles starting link with adult trade items. Christopher Leggett 2022-08-26 21:17:12 -0400
  • 05136c13b7
    Fixes Link getting Song as pocket item (#1326) Christopher Leggett 2022-08-26 20:46:19 -0400
  • ef74b7b6e7
    Merge pull request #1325 from aMannus/rando-links-pocket-skull-token briaguya 2022-08-26 20:46:06 -0400
  • 53e1c75ffd
    Fixes Link getting Song as pocket item Christopher Leggett 2022-08-26 20:12:49 -0400
  • af5313d89e
    Add OneHit KO (#27) David Chavez 2022-08-27 02:03:50 +0200
  • 637f089485 some stuff aMannus 2022-08-27 00:42:54 +0200
  • 83abf57766 Add skull token to links pocket aMannus 2022-08-26 23:51:36 +0200
  • 2c4443498b
    Fixes ice trap gidata not getting cleared after trap is sprung. Christopher Leggett 2022-08-26 13:00:52 -0400
  • 007bf8c41e Move GetCheckFromActor to randomizer_identify_actor Garrett Cox 2022-08-26 14:14:39 -0500
  • a1406c002c Implement GetCheckObjectFromActor and use it for scrubs and cows Garrett Cox 2022-08-26 14:02:25 -0500
  • c4191421f9 Move IdentifyScrub and IdentifyCow to randomizer_identify_actor.cpp Garrett Cox 2022-08-26 12:36:37 -0500
  • 06fb3ed885
    Merge pull request #1318 from leggettc18/magic-bean-pack briaguya 2022-08-26 12:18:16 -0400
  • d92841ecf9 Add columns to and refactor some of RandomizerObjects table Garrett Cox 2022-08-26 08:40:24 -0500
  • 4ebcc83161 Code styling aMannus 2022-08-26 15:13:34 +0200
  • 9e6d61d7ec Incompatible checkboxes aMannus 2022-08-26 11:13:11 +0200
  • b43f77caba Columns in childs & code style changes aMannus 2022-08-26 09:56:34 +0200
  • 21b70a8084 Fix incorrect preset value Josh Bodner 2022-08-26 00:53:14 -0700
  • 2dacf70add Clean up presets Josh Bodner 2022-08-26 00:48:42 -0700
  • 53531c4481
    Cleanup Christopher Leggett 2022-08-26 01:17:51 -0400
  • 2d503416ce Rename a few methods and re-order some arguments involving getting item from actor Garrett Cox 2022-08-25 22:28:15 -0500
  • 9148fa5aec
    Adds custom particles to Freestanding Bean Pack item. Christopher Leggett 2022-08-25 20:48:28 -0400
  • 4a51ab3187
    Fixes bug where Bean Pack was also granting blue potion Christopher Leggett 2022-08-25 20:42:34 -0400
  • 71e7fb9d70
    Merge rando-next and rename scrub message table to merchant message table Christopher Leggett 2022-08-25 18:02:00 -0400
  • 89c6b34002 Merge branch 'rando-next' into ryan-test Ryanoberlein 2022-08-25 17:46:27 -0400
  • e9fa231ae6
    Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack Christopher Leggett 2022-08-25 17:45:41 -0400
  • 31c4b683d1
    Merge pull request #1317 from briaguya-ai/no-more-blank-spoilers briaguya 2022-08-25 17:42:09 -0400
  • 0107699a6b more formatting briaguya 2022-08-25 17:29:09 -0400
  • 866cb3166b formatting briaguya 2022-08-25 17:28:46 -0400
  • 0bcc5b1310 no more blank spoilers briaguya 2022-08-25 17:27:37 -0400
  • 90308ee5ac Merge branch 'ryan-test' of https://github.com/Ryanoberlein/Shipwright into ryan-test Ryanoberlein 2022-08-25 17:09:10 -0400
  • f492191625
    Merge pull request #4 from aMannus/entrance-rando-cleanup Ryanoberlein 2022-08-25 17:00:37 -0400
  • 78e506a072
    Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack Christopher Leggett 2022-08-25 16:58:05 -0400
  • f2d36d3076 Merge branch 'rando-next' into entrance-rando-cleanup aMannus 2022-08-25 22:56:07 +0200
  • da07a8f409
    Merge pull request #1300 from aMannus/tokensanity-bgs-fix briaguya 2022-08-25 16:50:21 -0400
  • e139ca275e Entrance rando UI cleanup aMannus 2022-08-25 22:49:09 +0200
  • 1cfa0a9623
    Merge pull request #1264 from garrettjoecox/scrubsanity briaguya 2022-08-25 16:48:28 -0400
  • 5043309c63
    Adds basic german text for bean salesman Christopher Leggett 2022-08-25 16:43:57 -0400
  • dc9eeb18d9 Increase size of randomizerInf Garrett Cox 2022-08-25 15:38:41 -0500
  • 238d6573d5 Merge branch 'rando-next' into entrance-rando-cleanup aMannus 2022-08-25 22:23:26 +0200
  • 60eb1382e0
    Merge pull request #1315 from briaguya-ai/ztorn briaguya 2022-08-25 16:19:06 -0400
  • 7d245d8661 starting to work on horse cutscene issue Ryanoberlein 2022-08-25 16:08:27 -0400
  • 4919bddda2 Merge branch 'develop-zhora' into ztorn briaguya 2022-08-25 16:08:16 -0400
  • c76ff719f4 Fix issue in spoiler generation Garrett Cox 2022-08-25 13:53:04 -0500
  • 1e31d108e6 Various changes from feedback, and use new randomizerInf table Garrett Cox 2022-08-25 13:49:02 -0500
  • 3da197f0cd
    Removes some magic numbers Christopher Leggett 2022-08-25 14:39:12 -0400
  • c2fed1a382
    Fixes Lost Woods Bridge Ice Trap in Rando (#1313) Christopher Leggett 2022-08-25 14:16:43 -0400
  • 936513a9c4 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity Garrett Cox 2022-08-25 13:02:47 -0500
  • 29b9f0b37e Comment aMannus 2022-08-25 19:58:05 +0200
  • 49b48fb7a4 Fix BGS and maps/keys textboxes aMannus 2022-08-25 19:56:34 +0200
  • 9fda6a0764 Merge branch 'rando-next' into tokensanity-bgs-fix aMannus 2022-08-25 19:27:55 +0200
  • efd4ceb636
    Colors keywords in bean salesman text. Christopher Leggett 2022-08-25 12:46:08 -0400
  • 75e2d9a597 Fix CI compilation David Chavez 2022-08-25 15:55:46 +0200
  • 6ab13f389b
    Fixes salesman to properly take 60 rupees from you. Christopher Leggett 2022-08-25 12:43:19 -0400
  • 00838cb5b6
    Adds french text for the bean salesman Christopher Leggett 2022-08-25 12:39:34 -0400
  • ad33aba9ba
    Merge branch 'rando-next' into bombchu-logic lilDavid 2022-08-25 11:23:30 -0500
  • 9f60a97307
    Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix briaguya 2022-08-25 12:23:29 -0400
  • 8a4c196566
    Merge pull request #1312 from garrettjoecox/randomizer-inf briaguya 2022-08-25 12:19:55 -0400
  • c22951353e Renamed function aMannus 2022-08-25 18:04:52 +0200
  • 44a82d05a2
    Fixes Lost Woods Bridge Ice Trap in Rando Christopher Leggett 2022-08-25 12:01:14 -0400
  • ed5a2d8a42
    Merge pull request #1307 from aMannus/rando-menu-tweaks briaguya 2022-08-25 11:57:03 -0400
  • 69157640f6 Removed BGS flag in Item_Give() aMannus 2022-08-25 17:34:45 +0200
  • 5e9d1d61f1 Fix minor thing in sram Garrett Cox 2022-08-25 10:34:39 -0500
  • f7bd48aaca Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf Garrett Cox 2022-08-25 10:27:34 -0500
  • 95372718a3 Transition a few things to randomizerInf flags Garrett Cox 2022-08-25 10:27:31 -0500
  • 90067be132
    Fixes Dungeon Rewards from Song from Impa (#1311) Christopher Leggett 2022-08-25 11:19:17 -0400
  • e0ea13f410
    Fixes Dungeon Rewards from Song from Impa Christopher Leggett 2022-08-25 10:48:32 -0400
  • 9787f9d4f2 Swap hints & item pool aMannus 2022-08-25 16:34:48 +0200
  • 5842beeb55
    Fixes Bean Pack item from chest. Christopher Leggett 2022-08-25 10:11:35 -0400
  • beb9e6009f Fix project generation David Chavez 2022-08-25 15:47:29 +0200
  • a07d9e594d Cleanup more methods David Chavez 2022-08-25 15:45:05 +0200
  • ef1b662bf4
    Finishes wiring up bean salesman settings and text. Christopher Leggett 2022-08-25 09:42:15 -0400
  • e429c4a894 Cleanup imports and exposed properties David Chavez 2022-08-25 15:14:37 +0200
  • 4157b854f4 Remove UI methods from LUS David Chavez 2022-08-25 14:58:13 +0200
  • 4ca146b4e1
    Merge pull request #1299 from aMannus/bgs-dupe-fix briaguya 2022-08-25 07:49:10 -0400
  • 9b972c6e4a
    Merge pull request #1304 from aMannus/item-tracker-v3-ganonkey-fix briaguya 2022-08-25 07:21:45 -0400
  • 60ba292461 Migrate Settings David Chavez 2022-08-25 11:53:59 +0200
  • 7de2c584b4 Rando menu tweaks aMannus 2022-08-25 11:11:24 +0200