Commit Graph

  • e35e6ae4a3 Add enhancement for making nuts explode bombs, similar to bombchus Garrett Cox 2022-11-03 22:11:41 -0500
  • 553f7b5431 Merge branch 'entranceTracker' of https://github.com/Archez/Shipwright into experimental RaelCappra 2022-11-03 23:57:31 -0300
  • 256ea446d4 Merge commit 'refs/pull/1760/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-03 23:57:26 -0300
  • c4731b2843 initial pass for entrance tracker Adam Bird 2022-11-03 22:55:55 -0400
  • 8f5cc3c45f Merge remote-tracking branch 'origin/develop' into continueEntranceRando Adam Bird 2022-11-03 22:37:28 -0400
  • f39e87c8c1 dont show multi viewport toggle for wiiu Adam Bird 2022-11-03 22:33:20 -0400
  • ab78ace6d7 disable imgui cursor visibility control Alto1772 2022-11-04 09:26:53 +0800
  • 239399c4b4 Merge commit 'refs/pull/1896/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-03 22:14:11 -0300
  • 6f252ff354 Merge commit 'refs/pull/1781/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-03 22:10:49 -0300
  • da28149498 Merge commit 'refs/pull/1720/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-03 22:10:42 -0300
  • 5833d313de Merge branch 'cosmetics-pass' of https://github.com/garrettjoecox/OOT into experimental RaelCappra 2022-11-03 22:09:39 -0300
  • f4263b214e Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-03 22:09:00 -0300
  • 763f3a5760
    Tweaks to chest matches contents setting (#1902) Garrett Cox 2022-11-03 17:07:11 -0500
  • 855c5f24a7 simplify viewport check Adam Bird 2022-11-03 17:43:17 -0400
  • 3fbee24c13
    Merge branch 'develop' of github.com:HarbourMasters/Shipwright into switch-otrpatch-fix Christopher Leggett 2022-11-03 16:28:34 -0400
  • d12693b63e Remove spammy logs David Chavez 2022-11-03 19:15:14 +0100
  • a4697c6fcb
    Change lineup tick default to off (#1899) Garrett Cox 2022-11-03 11:55:40 -0500
  • 75af33a04c
    Fixes choose-quest with missing MQ crash. (#1903) Christopher Leggett 2022-11-03 12:29:25 -0400
  • 69e20088cc Remove TODO David Chavez 2022-11-03 16:44:09 +0100
  • 0504c353a9
    Fixes choose-quest with missing MQ crash. Christopher Leggett 2022-11-03 11:38:38 -0400
  • e1419450f4 Tweaks to chest matches contents setting Garrett Cox 2022-11-03 10:35:33 -0500
  • dd12d34dc5 Add SDL_net to Docker image David Chavez 2022-11-03 16:05:37 +0100
  • 83c9723835 Fix a mutex lock hang David Chavez 2022-11-03 15:41:09 +0100
  • a1ff29c277 Add BUILD_CROWD_CONTROL and enable CC for Linux David Chavez 2022-11-03 15:15:39 +0100
  • 9f81e24ef5 merge and fix changes Alto1772 2022-11-03 19:59:27 +0800
  • 7ec75543e9
    Update debugSaveEditor.cpp blackgamma7 2022-11-03 02:59:29 -0400
  • ac4e4fea23 Expanded Save Editor for Fishing Minigame blackgamma7 2022-11-03 02:53:34 -0400
  • 88d0053119
    Updated Dockerfile to build SDL2_net Dakota Brown 2022-11-03 00:52:32 -0600
  • d36e406803
    Made CrowdControl work on Linux Dakota Brown 2022-11-03 00:40:15 -0600
  • 1c2c5ba281 Change lineup tick default to off Garrett Cox 2022-11-02 23:52:06 -0500
  • 94e0ab7bcb Cosmetic Editor v3 (WIP, things still broken) Garrett Cox 2022-10-19 09:07:01 -0500
  • c3d3c96252 add a toggle for multi viewports in imgui Adam Bird 2022-11-02 23:08:00 -0400
  • c5940905e7
    Add glitch line-up tick option (#1875) Garrett Cox 2022-11-02 21:07:10 -0500
  • 9188eeb446 Switch heldItemId to helditemActionParam Cardboy777 2022-11-02 21:46:45 -0400
  • fa64c5d91d Make Bow/Slingshot fixes permanent, move ammo changes behind cvar Cardboy777 2022-11-02 20:50:36 -0400
  • 3b81fa7204 Merge remote-tracking branch 'upstream/develop' into ChildBowAdultSlingshot Cardboy777 2022-11-02 20:21:03 -0400
  • cdf8140e3b whoops Ralphie Morell 2022-11-02 19:54:05 -0400
  • 4052d473af fixed check not being reached with bgs/knife in inventory Ralphie Morell 2022-11-02 19:42:02 -0400
  • 4156a1d2c7
    Fixes bug preventing name entry with single OTR. (#1894) Christopher Leggett 2022-11-02 18:00:57 -0400
  • 327613f5ce
    Fixes bug preventing name entry with single OTR. Christopher Leggett 2022-11-02 17:46:23 -0400
  • 5aa6dadc09
    Fixes bug with single-OTR + no rando seed not continuing after name entry. Christopher Leggett 2022-11-02 17:36:05 -0400
  • d49a1cd6b3
    Fixes bug with generating seed on the choose-quest screen. (#1892) Christopher Leggett 2022-11-02 17:30:44 -0400
  • 6e9542e681
    Fixes bug with generating seed on the choose-quest screen. Christopher Leggett 2022-11-02 17:14:56 -0400
  • dcd214f851 Merge branch 'develop' into random-enemies aMannus 2022-11-02 21:59:32 +0100
  • e9c4ebf445
    Merge branch 'HarbourMasters:develop' into rando-merchants Ralphie Morell 2022-11-02 16:14:15 -0400
  • 0152c6e580 Merge commit 'refs/pull/1720/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-02 16:05:19 -0300
  • 7ebe5fe694 Fix unprefixed references to functions RaelCappra 2022-11-02 15:46:42 -0300
  • fd013b5bbf Merge branch 'sfx-editor' of https://github.com/garrettjoecox/OOT into experimental RaelCappra 2022-11-02 15:32:26 -0300
  • cd5b407cce
    Missed one condition Dakota Brown 2022-11-02 12:28:31 -0600
  • e5f6b3e0b2 Merge commit 'refs/pull/1760/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-02 15:19:59 -0300
  • 4f8f618309 Merge branch 'cosmetics-pass' of https://github.com/garrettjoecox/OOT into experimental RaelCappra 2022-11-02 15:19:02 -0300
  • 6567d7c8fb Merge branch 'qpa' of github.com:RaelCappra/Shipwright into experimental RaelCappra 2022-11-02 15:12:47 -0300
  • d366d643be
    Apply suggestions from code review RaelCappra 2022-11-02 15:12:09 -0300
  • 3b7b4913eb
    Track keys, heart pieces, and heart containers collected (#1849) Garrett Cox 2022-11-02 13:09:25 -0500
  • 43e4c712e3 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-11-02 15:07:36 -0300
  • 2735a33a79
    Fix tool tip and boolean switch Dakota Brown 2022-11-02 11:53:03 -0600
  • 8c6f17cae3
    Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp Garrett Cox 2022-11-02 12:50:00 -0500
  • 8f151cb2f2
    Making it so that the additional Kokiri Draw and Chests of Agony checkboxes appear for more than a single frame. Dakota Brown 2022-11-02 10:33:26 -0600
  • 897e70b6fc
    Sfx Editor - 3rd Pass (#1873) Garrett Cox 2022-11-02 11:27:05 -0500
  • fab52d323b
    Implement hint for dungeon type on Map get item messages (#1852) Garrett Cox 2022-11-02 11:03:26 -0500
  • 3e44805d43
    Made Chests of Agony option not run every frame Dakota Brown 2022-11-02 09:54:39 -0600
  • fd8a2c9483
    Adds in-game menu for selecting a dungeon quest/randomizer (#1863) Christopher Leggett 2022-11-02 11:50:47 -0400
  • 51dd1c7ff0
    Making the Kokiri draw distance check not run every frame Dakota Brown 2022-11-02 09:46:36 -0600
  • dda4a13bc3
    Implement keyrings (#1869) Garrett Cox 2022-11-02 10:36:02 -0500
  • f9f213ab2e Changes from feedback and prefix external methods with SfxEditor Garrett Cox 2022-11-02 09:56:44 -0500
  • c24a96319f Rename maxKeys to numOfKeysOnKeyring Garrett Cox 2022-11-02 09:17:44 -0500
  • 9a4da31fd0 Track keys, heart pieces, and heart containers collected Garrett Cox 2022-11-02 09:09:28 -0500
  • fb0b71ea54
    Show player state flags on the "Player" tab of Save Editor (#1851) Sarge-117 2022-11-02 06:39:45 -0700
  • 57c1f4dce2
    Fix rando save creation crash due to corrupted hint text (#1846) Adam Bird 2022-11-02 09:37:44 -0400
  • c382f35664
    Apply suggestions from code review David Chavez 2022-11-02 14:37:34 +0100
  • 5b9baa5b5e Cleanup CC David Chavez 2022-11-01 14:56:34 +0100
  • b86ca15cfd Cosmetic Editor v3 (WIP, things still broken) Garrett Cox 2022-10-19 09:07:01 -0500
  • 800144da37
    Merge branch 'develop-zhora' into develop Amaro Martínez 2022-11-01 23:42:23 -0500
  • eefd9c688c Remove colons from shopsanity messages (#1881) lilDavid 2022-11-01 22:10:11 -0500
  • e1a075268f
    zhora -> dev #1886 briaguya 2022-11-02 00:06:21 -0400
  • 9b76c756f5
    Cleaned up a line that I left in from bad attempts Dakota Brown 2022-11-01 21:36:49 -0600
  • 1375b71a15
    Added a feature so that chests only change size/texture if the player has the stone of agony Dakota Brown 2022-11-01 21:30:59 -0600
  • 6b15d306db
    Merge branch 'develop' into zhora-to-dev briaguya 2022-11-01 23:28:37 -0400
  • e40c0238fa
    Remove colons from shopsanity messages (#1881) lilDavid 2022-11-01 22:10:11 -0500
  • 2f96e28135
    fix: show/hide cursors properly (#1829) briaguya 2022-11-01 22:58:09 -0400
  • acd68e4db3 ckarify comments from feedback Adam Bird 2022-11-01 18:48:17 -0400
  • e6a2b148a9 Remove colons from shopsanity messages lilDavid 2022-11-01 16:45:37 -0500
  • 8df1c2f3dd
    Implements backing up from name entry to quest select. Christopher Leggett 2022-11-01 12:48:04 -0400
  • fdc13a3dc6 Merge remote-tracking branch 'origin/develop' into continueEntranceRando Adam Bird 2022-11-01 02:14:11 -0400
  • 85e8eebce3 clarify shuffle dungeon description Adam Bird 2022-11-01 02:13:00 -0400
  • 44a939b820 fix exiting hyrule castle courtyard as child link; move link spawn when exiting ganons castle randomized dungeon Adam Bird 2022-11-01 02:12:40 -0400
  • 0838e0223d
    Fixes potential issue if the first OTR in list failed to load on Switch. Christopher Leggett 2022-10-31 20:31:52 -0400
  • 54640fac6e
    Merge branch 'develop' of github.com:HarbourMasters/Shipwright into choose-quest Christopher Leggett 2022-10-31 19:31:03 -0400
  • a58bb4bc86
    Merge branch 'develop' into develop-zhora InfoManiac742 2022-10-31 13:22:31 -1000
  • e6150ea8da
    Add cheat: hookshot everything (#1874) Garrett Cox 2022-10-31 16:28:03 -0500
  • 6c30d7a435
    Fix Piece of Heart sound (#1862) (#1876) mergify[bot] 2022-10-31 22:23:41 +0100
  • f64c4476c3
    Merge branch 'develop' of github.com:HarbourMasters/Shipwright into choose-quest Christopher Leggett 2022-10-31 13:50:11 -0400
  • cc2b1027eb
    Potentially fix switch OTR patching. Christopher Leggett 2022-10-31 13:35:46 -0400
  • 6d0ab48664 Merge remote-tracking branch 'upstream/develop' into single_use_items_from_inventory Sarge-117 2022-10-31 10:30:04 -0700
  • 087f42a826
    Fixes crash with toggling walk speed. (#1877) Christopher Leggett 2022-10-31 12:39:43 -0400
  • 8580582ea1
    Fixes crash with toggling walk speed. Christopher Leggett 2022-10-31 11:36:42 -0400
  • d0aca993f8
    Fixes custom hud colors and d-pad navigation. Christopher Leggett 2022-10-31 11:05:27 -0400
  • c462fe2b2c Merge commit 'refs/pull/1869/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-10-31 10:14:56 -0300
  • 6c0cb58dec Merge commit 'refs/pull/1873/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-10-31 10:05:54 -0300
  • 1b8361d665 Merge commit 'refs/pull/1760/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-10-31 10:00:17 -0300