Commit Graph

  • c4f9209f1f skip ExtractAssets, if assets.zip exists Thomas Hiller 2022-12-08 11:05:00 +0100
  • 2a502b5042 fix: correctly parse custom nocturne warp text briaguya 2022-12-08 03:19:01 -0500
  • 25bad78b22 Merge commit 'refs/pull/2108/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 03:36:22 -0300
  • f06ef628fd fix object spawn Adam Bird 2022-12-08 01:25:13 -0500
  • 903804725d fix: ensure `play` isn't null when reading from it briaguya 2022-12-08 00:41:56 -0500
  • e988861e2a Merge commit 'refs/pull/2066/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:20:57 -0300
  • 8b4a5ca995 Merge commit 'refs/pull/2050/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:14:51 -0300
  • 601b8e5635 Merge commit 'refs/pull/1781/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:14:25 -0300
  • 32e78989f8 Merge commit 'refs/pull/2108/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:13:46 -0300
  • 6d2c9b58c2 Merge commit 'refs/pull/1898/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:13:09 -0300
  • 639e6d2249 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:06:24 -0300
  • 760b79a623 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-08 02:05:39 -0300
  • 1dc0f054aa Add two silly options Garrett Cox 2022-12-07 20:23:37 -0600
  • 68683dafde Fix exploded rupee color in shooting gallery Garrett Cox 2022-12-07 19:40:36 -0600
  • 7fb0bb940d Comment out options that haven't been implemented Garrett Cox 2022-12-07 13:38:44 -0600
  • 2efdb496fd Implement charged sword spins Garrett Cox 2022-12-07 13:19:24 -0600
  • ee64dd83fe Implement trails cosmetics Garrett Cox 2022-12-07 12:43:50 -0600
  • 244a6f48ee adjust some comments and alignment Garrett Cox 2022-12-07 10:14:29 -0600
  • 5b7b66661d Attempt to fix linux error Garrett Cox 2022-12-07 00:49:04 -0600
  • 2733965034 Add navi cosmetics Garrett Cox 2022-12-07 00:31:29 -0600
  • 18efe20180 Add iron knuckles cosmetics Garrett Cox 2022-12-06 20:46:42 -0600
  • cf212bf84a Add metal trap and red ice Garrett Cox 2022-12-01 16:14:17 -0600
  • c75c823cfd Add slingshot Garrett Cox 2022-12-01 14:56:04 -0600
  • 4d3a459347 Fix hilts and sword during ganon cutscene Garrett Cox 2022-12-01 14:06:10 -0600
  • 36254814bc Fix from upstream pulls Garrett Cox 2022-11-29 21:33:52 -0600
  • eaa8c28c36 A few more silly things Garrett Cox 2022-11-26 21:30:31 -0600
  • ca7f0aff8b Remove old title fire colors Garrett Cox 2022-11-26 17:03:40 -0600
  • d384fc302e Implement file choose color Garrett Cox 2022-11-26 15:58:40 -0600
  • d6a07278de Tweaks to life meter Garrett Cox 2022-11-26 14:33:19 -0600
  • 1b328f323b Implement keese cosmetics Garrett Cox 2022-11-21 12:13:27 -0600
  • 0bd03271d3 Implement arrow cosmetics Garrett Cox 2022-11-21 11:46:34 -0600
  • b982376d23 Nest RGBA values under Value key Garrett Cox 2022-11-21 10:17:22 -0600
  • 7e7384c1ab Workaround for cvar_clear not working correctly Garrett Cox 2022-11-21 09:54:23 -0600
  • de4abdd2d6 Cosmetic Editor v3 Garrett Cox 2022-11-14 19:54:04 -0600
  • 025e18e7e5
    clear the rando generating cvar on launch to prevent softlocking generating a new seed (#2109) Adam Bird 2022-12-07 18:17:05 -0500
  • b593e27384
    ER - Shabom timer fix (#2110) aMannus 2022-12-08 00:16:08 +0100
  • 924e9147aa
    Update OTRGui to extract MQ roms with the correct name (#2114) Adam Bird 2022-12-07 16:40:12 -0500
  • 902991cdbd support mq export on old export method Adam Bird 2022-12-07 15:27:52 -0500
  • ffd7d4f42f correctly export mq otrs and handle outside soh folder properly Adam Bird 2022-12-07 15:16:21 -0500
  • 16ac212027
    Merge branch 'develop' into camera-dist-slider frizzle101101 2022-12-07 15:04:52 -0500
  • 2f284cc326 add copy ROM Thomas Hiller 2022-12-07 14:37:04 +0100
  • e48cd72268 remove git source; remove ROM Thomas Hiller 2022-12-07 14:36:03 +0100
  • c9bd5a5748 fix ROM path Thomas Hiller 2022-12-07 11:58:35 +0100
  • cf99a1d03b fix ROM path Thomas Hiller 2022-12-07 11:28:09 +0100
  • cac7507719 re-add ROM Thomas Hiller 2022-12-07 11:21:20 +0100
  • 1268f477ea change Stable to stable Thomas Hiller 2022-12-07 10:48:59 +0100
  • 32fa73d18c remove ROM Thomas Hiller 2022-12-07 10:40:54 +0100
  • 27317e5808 add dbus session Thomas Hiller 2022-12-07 10:36:01 +0100
  • 0391d9f200 fix path to yaml file Thomas Hiller 2022-12-07 10:32:44 +0100
  • 4f9a843468 add flatpak build Thomas Hiller 2022-12-07 10:30:16 +0100
  • bfb27adc97 ER - Shabom timer fix aMannus 2022-12-07 10:01:42 +0100
  • 2bb5459d16 adjust french translation Adam Bird 2022-12-07 03:03:40 -0500
  • 05a7c89395 add 5.0.2 Thomas Hiller 2022-12-07 08:53:11 +0100
  • d1289ff0eb Merge remote-tracking branch 'upstream/develop-flynn' into flatpak Thomas Hiller 2022-12-07 08:48:45 +0100
  • 034742274f
    Removes commented out code. Christopher Leggett 2022-12-07 02:22:47 -0500
  • 0c077943a9 remove non-working switch details Adam Bird 2022-12-07 02:20:49 -0500
  • 59141b9d96 Remove changed whitespace Josh Bodner 2022-12-06 23:04:22 -0800
  • e0ac344cee Remove old checks Josh Bodner 2022-12-06 23:02:52 -0800
  • 9ceca0b462 Merge branch 'develop' into gameplay_stats_1.1 Sarge-117 2022-12-06 22:56:17 -0800
  • b63f880b2c Trigger autosave after rupee decrement is complete instead of omitting it entirely Josh Bodner 2022-12-06 22:53:54 -0800
  • 3247e736d3
    Removes magic numbers. Christopher Leggett 2022-12-07 01:26:48 -0500
  • 85cf7437a3 clear the rando generating cvar on launch to prevent softlocking generating a new seed Adam Bird 2022-12-07 01:16:40 -0500
  • 93407fd5f0
    Merge pull request #9 from RaelCappra/fix-invalid-seq Christopher Leggett 2022-12-07 01:05:29 -0500
  • 2dfd7e1257 fix actor spawn params Adam Bird 2022-12-07 00:58:08 -0500
  • 4217700245
    Merge branch 'develop' into translate-press-start Amaro Martínez 2022-12-07 00:42:55 -0500
  • 31947cd51b
    Copy cleanups (#1932) louist103 2022-12-07 00:28:35 -0500
  • a14fb50f7a add lake hylia water control system Adam Bird 2022-12-07 00:21:44 -0500
  • 8337e4e24f
    Rando: Entrance Tracker v1 (#2005) Adam Bird 2022-12-06 23:44:14 -0500
  • 161a2301a9 rename variables Adam Bird 2022-12-06 23:27:57 -0500
  • 7f47f42251
    Merge branch 'develop-flynn' into dont-autosave-shops Josh Bodner 2022-12-06 19:46:12 -0800
  • 760bee8d3f
    Merge branch 'develop' into randoCopies1 louist103 2022-12-06 22:18:17 -0500
  • f9fe3f8fb3
    Merge Flynn Charlie into `develop` briaguya 2022-12-06 21:51:53 -0500
  • 4f109178ff Merge branch 'develop-flynn' into flynn-to-dev briaguya 2022-12-06 21:29:27 -0500
  • ed19d36b5c
    Update from develop-flynn Amaro Martínez 2022-12-06 20:50:31 -0500
  • ce021513fb
    Merge branch 'develop' into develop-flynn Amaro Martínez 2022-12-06 20:49:11 -0500
  • 27f05a268e Merge branch 'develop-flynn' into flynn-to-dev briaguya 2022-12-06 20:48:58 -0500
  • 183836ff5f Merge branch 'develop' into gameplay_stats_1.1 Sarge-117 2022-12-06 17:40:31 -0800
  • cdb48b9752 ?? RaelCappra 2022-12-06 22:29:54 -0300
  • 4b5c423c8a Merge commit 'refs/pull/1942/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-12-06 22:28:15 -0300
  • b565810c95 Merge remote-tracking branch 'origin/develop' into entranceTracker Adam Bird 2022-12-06 20:25:12 -0500
  • 00cbd347b2
    bump version (#2104) 5.0.2 briaguya 2022-12-06 20:21:38 -0500
  • 12abf5eb37 bump version briaguya 2022-12-06 20:20:05 -0500
  • 77123196d1
    fix lake hylia water level raised flag not being set in rando (#2103) Adam Bird 2022-12-06 20:09:05 -0500
  • 25f89fdc15 Check Tracker - Fixes a bug where Locations would incorrectly say Vanilla due to the first check in the area being a non-MQ check sonoftunk 2022-12-06 19:47:53 -0500
  • 52b896271c
    Fix Ganondorf boss battle ending (MQ only) (#2072) Amaro Martínez 2022-12-06 19:24:09 -0500
  • ca98e81615 Check Tracker - Fixes a bug where Link's Pocket item wasn't acting as checked for area item count sonoftunk 2022-12-06 19:03:40 -0500
  • bc749faadb Check Tracker - Fixes a regression from f9362994 which broke showing checks based on settings. sonoftunk 2022-12-06 18:58:42 -0500
  • 6c2a3542be fix lake hylia water level raised flag not being set in rando Adam Bird 2022-12-06 18:44:42 -0500
  • d9f3844b2d
    [Feature] Entrance Rando v2 (#2071) Adam Bird 2022-12-06 18:37:50 -0500
  • dd8a30a750 Location Tracker - Updates Eyedrops to use RandomizerInf instead of Chest sonoftunk 2022-12-06 18:10:41 -0500
  • 056b746d87 Merges origin/develop into Location Tracker to correct merge conflicts from Enum changes sonoftunk 2022-12-06 18:06:53 -0500
  • 2edd4677ef Merges origin/develop into Randomizer Location Exclusion List - Fixes Merge conflict caused by this PR and another PR both adding MQ dungeon count enums. sonoftunk 2022-12-06 17:36:56 -0500
  • 7f4a19461c
    ADD: Rando German Custom Messages (#2102) PurpleHato 2022-12-06 22:54:54 +0100
  • e8eae2b5c1 Merge branch 'develop' into gameplay_stats_1.1 Sarge-117 2022-12-06 13:06:37 -0800
  • a817d5798d TWEAK: Forgot a small breakline PurpleHato 2022-12-06 22:04:36 +0100
  • f61b6bb170 ADD: Rando German Custom Messages PurpleHato 2022-12-06 21:55:36 +0100
  • b9cfa90ca6 works! but laggy MelonSpeedruns 2022-12-06 15:19:30 -0500
  • b8465a9ef9
    TWEAK: Rando french typos PurpleHato 2022-12-06 21:00:55 +0100
  • 447f7149a0 Use enums for 100 GS shuffle lil David 2022-12-06 13:22:14 -0600
  • 86781b07c3 add french translations for warp hints Adam Bird 2022-12-06 14:19:29 -0500