Commit Graph

  • cec0bc6fca
    Merge pull request #999 from dcvz/rachael-zhora David Chavez 2022-08-02 20:15:26 +0200
  • bd9c6e7e9f Some more styling aMannus 2022-08-02 20:08:55 +0200
  • 53229f0905 Merge branch 'develop-rachael' into rachael-zhora David Chavez 2022-08-02 20:05:40 +0200
  • 18013e1ae0 Do this in Rachael instead Josh Bodner 2022-08-01 20:46:50 -0700
  • 8aa20e1732
    Merge pull request #1007 from briaguya-ai/zhora-to-rnext-merge briaguya 2022-08-02 10:40:33 -0700
  • f7abf79bf3 update rando tooltips to utilize auto newlines briaguya 2022-08-02 13:26:26 -0400
  • d1ddc2a0c3 Merge branch 'develop-zhora' into zhora-to-rnext-merge briaguya 2022-08-02 13:02:13 -0400
  • e869624258 Moar styling aMannus 2022-08-02 17:34:02 +0200
  • f6ec8cd20c [WIP] Pixel depth reading David Chavez 2022-08-02 17:08:34 +0200
  • cb43a35aec More styling aMannus 2022-08-02 16:58:59 +0200
  • cdef05a871
    Merge pull request #987 from aMannus/better-rando-settings-padding briaguya 2022-08-02 07:45:51 -0700
  • 61c68666d6
    Closer align Makefiles & Dockerfiles (#748) David Chavez 2022-08-02 16:22:20 +0200
  • be874b6a9e
    Resolve merge conflicts with develop-rachael Christopher Leggett 2022-08-02 10:12:52 -0400
  • 866e31b3c8 Bit of cleanup David Chavez 2022-08-02 16:11:01 +0200
  • c45ec92448
    Revert goron's back to spinny behavior with smooth transitions. Christopher Leggett 2022-08-02 10:08:08 -0400
  • e6fa79cbd2 Draw directly to screen David Chavez 2022-08-02 15:36:23 +0200
  • 646237c4ce
    Merge pull request #921 from PurpleHato/RandoItemTrackerNotesSpace briaguya 2022-08-02 05:22:29 -0700
  • 2824fffbcd Fix depth clipping mode David Chavez 2022-08-02 14:17:53 +0200
  • c404d95b67 Adressed review comments aMannus 2022-08-02 13:38:17 +0200
  • e479cb424b Moved logic rules dropdown aMannus 2022-08-02 12:35:52 +0200
  • 44522e6518 merge rando-next aMannus 2022-08-02 12:31:24 +0200
  • bd2f686995 More padding/styling/layout aMannus 2022-08-02 12:27:28 +0200
  • 491fe8e84d
    Merge pull request #985 from aMannus/rando-no-logic-option briaguya 2022-08-02 03:25:03 -0700
  • 412264050a
    Merge pull request #746 from Sarge-117/rando-quest-item-fanfares briaguya 2022-08-02 03:24:36 -0700
  • bf6ef1344e
    Merge pull request #915 from aMannus/rando-enhancements-menu briaguya 2022-08-02 03:23:59 -0700
  • f57cc7ba46 Fix merge conflict David Chavez 2022-08-02 11:44:35 +0200
  • 85dd025bea Merge branch 'develop-zhora' into feature/metal David Chavez 2022-08-02 11:42:25 +0200
  • 768c8f8e5b Tighten up memory consumption David Chavez 2022-08-02 11:34:35 +0200
  • 696b2507c7 precompute pipeline states David Chavez 2022-08-02 11:25:35 +0200
  • e7db56a1ce Slight cleanup David Chavez 2022-08-02 11:12:04 +0200
  • 3e90cf1814 Clean up states and caching pools David Chavez 2022-08-02 10:54:08 +0200
  • e7a83446bf Dynamic pipeline states David Chavez 2022-08-02 10:38:53 +0200
  • ad6affe5e6 Fix paren Josh Bodner 2022-08-02 00:21:09 -0700
  • 852c6ee377 Save after getting items as well Josh Bodner 2022-08-02 00:05:55 -0700
  • a4f2d4c11f Don't save in cutscenes Josh Bodner 2022-08-01 22:46:18 -0700
  • ac8335e99e
    Prevents blocking Song of Time check by shielding. Christopher Leggett 2022-08-02 00:13:18 -0400
  • 06f28d7b27 Do this in Rachael instead Josh Bodner 2022-08-01 20:46:50 -0700
  • bb8152b376
    Replaces string literal for BaseGameOverrides with const variable. Christopher Leggett 2022-08-01 23:16:16 -0400
  • 480053dfaa
    Exposes FormatCustomMessage and uses it in FormatJsonHintText. Christopher Leggett 2022-08-01 23:05:29 -0400
  • f2d2244b47 Update tooltip Josh Bodner 2022-08-01 19:59:42 -0700
  • afcf5a5217 Merge branch 'develop-zhora' into slowwalk Josh Bodner 2022-08-01 19:57:16 -0700
  • eae97cff79
    Addresses most of bria's comments. Christopher Leggett 2022-08-01 21:44:28 -0400
  • 4d30cc50a1
    Adds newlines to the ends of some files. Christopher Leggett 2022-08-01 21:21:29 -0400
  • bfdf814a1f
    Implements new getItem table in game. Christopher Leggett 2022-08-01 21:03:58 -0400
  • 5c27dd3f4c fix windows deprecation with shuffle Baoulettes 2022-08-02 02:16:35 +0200
  • ea560dd2ed Change Random logic and fix default filechoose Baoulettes 2022-08-02 02:02:35 +0200
  • e7d7c450c8 Merge branch 'develop-zhora' into chore/align-makefiles David Chavez 2022-08-02 00:59:27 +0200
  • a276d2e266 Use existing split string method David Chavez 2022-08-01 12:51:50 +0200
  • 3c000dd759 Store RGBA Cvar as JSON object David Chavez 2022-08-01 10:26:49 +0200
  • 5f1af23973 Fix kaleido link David Chavez 2022-08-01 23:19:04 +0200
  • 70e5388db1
    Merge branch 'HarbourMasters:develop-zhora' into CosmeticEditorZhora Baoulettes 2022-08-01 23:17:50 +0200
  • 4ed82c71dc Fix c++20 clang issue David Chavez 2022-08-01 09:18:48 +0200
  • 3e8f0b4b53
    Merge branch 'develop-zhora' into develop-zhora Nycz 2022-08-01 22:26:38 +0200
  • 678f9fb77d Update z_play.c Nycz 2022-08-01 22:19:28 +0200
  • 9b5cd67f27 First pass of UX changes aMannus 2022-08-01 20:36:16 +0200
  • ed3a43309d Add Randomize per sections Baoulettes 2022-08-01 20:35:07 +0200
  • cb79df75d6
    Resolve merge conflicts from develop-rachael Christopher Leggett 2022-08-01 12:07:20 -0400
  • 44a2c3868c Removed Ironman preset aMannus 2022-08-01 14:50:58 +0200
  • 7b1b362e5a More styling & layout changes aMannus 2022-08-01 13:23:21 +0200
  • 6360fe3aef Use only one Dockerfile for Switch & Linux David Chavez 2022-08-01 12:24:08 +0200
  • 9bbf8633d4 Fixed deku stick on B and horse swordless aMannus 2022-07-28 21:48:51 +0200
  • edc8aa63fa Revert "Revert "Fixed deku stick on B and horse swordless"" aMannus 2022-08-01 09:31:18 +0200
  • 3c81416142 Revert "Fixed deku stick on B and horse swordless" aMannus 2022-08-01 09:31:04 +0200
  • 5eed8d242d Fix c++20 clang issue David Chavez 2022-08-01 09:18:48 +0200
  • 6a5429d6f7 Adressed review comments aMannus 2022-08-01 09:06:19 +0200
  • f7b8ad7eee Some more padding aMannus 2022-08-01 08:50:11 +0200
  • e0b3e2d6c4
    Merge branch 'develop-zhora' into develop Dog 2022-07-31 20:58:23 -0700
  • 7a80cbcecf LUS Cleanup: Console class is now in the Ship namespace Kenix3 2022-07-31 23:36:21 -0400
  • 2b17adb021
    Update soh/src/code/z_parameter.c Jeffrey Crowell 2022-07-31 23:27:04 -0400
  • 7559367d63
    Update soh/src/code/z_parameter.c Jeffrey Crowell 2022-07-31 23:26:59 -0400
  • 4a87ed709b
    Adds ItemTableManager class. Christopher Leggett 2022-07-31 23:26:48 -0400
  • 5fe839a91b LUS Cleanup: Utils.cpp is now in namespace Ship. Kenix3 2022-07-31 23:22:02 -0400
  • 332f1b27df LUS Cleanup: Make ControlDeck a member of Window Kenix3 2022-07-31 23:14:54 -0400
  • b3f7bd9a8b
    Merge branch 'develop-zhora' into remember-save-location InfoManiac742 2022-07-31 19:36:17 -0700
  • 5f39293344
    Update ImGuiImpl.cpp InfoManiac742 2022-07-31 16:35:46 -1000
  • 6d963fa760 Refactor and don't save in grottos Josh Bodner 2022-07-31 19:32:41 -0700
  • 9389ceb8c1
    Speed up lifting silver rocks and obelisks by 5x (#953) Garrett Cox 2022-07-31 21:09:30 -0500
  • b4f4e36acb
    [macos] Disable buggy resolution scaling (#982) David Chavez 2022-08-01 04:08:10 +0200
  • d332c3d9d6
    Randomizer Allows Skull Kid to accept Mask after receiving an ice trap. (#963) Christopher Leggett 2022-07-31 21:58:13 -0400
  • b59c9cdf02
    Randomizer: Fixes LACS and Prelude checks under certain conditions (#961) Christopher Leggett 2022-07-31 21:57:30 -0400
  • 8c25e9a992
    Added line break (#958) aMannus 2022-08-01 03:54:26 +0200
  • 4f29833476
    Adds beta quest Gameshark cheat. (#975) Kenix3 2022-07-31 21:52:10 -0400
  • d648c7275c
    Hide Dpad in minimal UI (#955) Garrett Cox 2022-07-31 20:51:36 -0500
  • a1ed35e5bd
    Fixed slowdown on dodongo (#945) KiritoDev 2022-07-31 20:49:54 -0500
  • 206f63f9e6
    Fix build link in README (#944) InfoManiac742 2022-07-31 18:48:43 -0700
  • 7a45380123
    Automatically break long tooltip lines (#925) Josh Bodner 2022-07-31 18:40:26 -0700
  • 99ecccfaab
    Save scarecrow songs as OcarinaNotes (#918) GaryOderNichts 2022-08-01 03:39:24 +0200
  • 7dd6f59b8b
    TWEAK: added 360hz support (#896) PurpleHato 2022-08-01 03:38:40 +0200
  • 361a986b8e
    Add bottle swipes to Fast Drops; rename to Skip Pickup Messages (#847) vaguerant 2022-08-01 11:37:47 +1000
  • b98c8b4abb
    Minor enhancement: Allow toggling on equipment screen (#813) Sarge-117 2022-07-31 18:35:05 -0700
  • 582f084973
    Use tex sizes from texture rather than hardcoded values (#610) David Chavez 2022-08-01 03:32:40 +0200
  • 574307c5b1 Change DetailedControlEditor::DrawOcarinaMapping to more general purpose DrawMapping lilDavid 2022-07-31 20:21:51 -0500
  • 2f9874c68f
    Cleanup. Christopher Leggett 2022-07-31 19:31:22 -0400
  • 1fb1e12fbe use RGB Cvar for all Colors Baoulettes 2022-08-01 00:36:04 +0200
  • 803dbc7cee Define ocarina note colors with existing Color_RGB8 struct lilDavid 2022-07-31 16:52:36 -0500
  • 9a964fe71f Merge branch 'develop-zhora' into CosmeticEditorZhora Baoulettes 2022-07-31 23:41:44 +0200
  • f1e886c901 Merge branch 'develop-zhora' of https://github.com/lilDavid/Shipwright into customizable_ocarina lilDavid 2022-07-31 16:35:14 -0500
  • 47ad3bdc47 Fixed linux compile issue Nicholas Estelami 2022-07-31 15:32:08 -0400
  • 9d12813282 Fixed merge/rebase issues Nicholas Estelami 2022-07-31 14:50:28 -0400
  • 3bb234e6a6 Fixed merge issues. Nicholas Estelami 2022-07-25 23:11:45 -0400