Commit Graph

  • e0d6445f24 remove unused cow stuff briaguya 2022-08-06 18:14:01 -0400
  • 46c3541458 seems to be working, still needs cleanup briaguya 2022-08-06 18:07:16 -0400
  • 07d2e43b04 z_play integration Ryanoberlein 2022-08-06 17:55:54 -0400
  • ea909b748e Add super basic custom messages for keysanity, not pretty... Garrett Cox 2022-08-06 16:51:58 -0500
  • 33c576f8e9 Remove file copy David Chavez 2022-08-06 23:37:17 +0200
  • 49cb9c9cf2 Generate assets first on Jenkins David Chavez 2022-08-06 22:45:50 +0200
  • f885195fc9 Apply trade item timer disabling consistently lilDavid 2022-08-06 16:01:29 -0500
  • 7cfe21f865 Fix non-randomizer carpenter's son despawning lilDavid 2022-08-06 15:58:57 -0500
  • c8289f5946 Skip lines in Adult Trade Shuffle description lilDavid 2022-08-06 15:38:32 -0500
  • 7ef3fff869
    add soh icon for Windows (#1060) th-2021 2022-08-06 22:19:06 +0200
  • 627641c008 Ignore build.c David Chavez 2022-08-06 22:16:39 +0200
  • 8ee597298c Change cursor sound and add files to build system lilDavid 2022-08-06 15:01:35 -0500
  • 194c4f4e52
    Adds new files to CMakeLists. Christopher Leggett 2022-08-06 15:54:19 -0400
  • 8aba2b6323 Merge branch 'keysanity' of github.com:garrettjoecox/Shipwright into keysanity Garrett Cox 2022-08-06 14:18:50 -0500
  • 77f2e56039 Support starts with and more options on ganons boss key Garrett Cox 2022-08-06 14:07:46 -0500
  • f41b939a71 Only show adult trade items in the save editor if they're shuffled lilDavid 2022-08-06 12:56:29 -0500
  • 6603a9a474 Add adult trade shuffle to randomizer lilDavid 2022-08-05 23:49:32 -0500
  • ba160cf997
    merge in develop-zhora Christopher Leggett 2022-08-06 12:26:38 -0400
  • 9062eaaca5
    Should fix switch build pt 2 Christopher Leggett 2022-08-06 12:21:11 -0400
  • 43461cec69
    Should fix switch build Christopher Leggett 2022-08-06 12:15:27 -0400
  • f3ba33f1ab Some scale stuff incomming, barebone. Baoulettes 2022-08-06 17:03:44 +0200
  • 58f654dc2d Revert change in shuffle cows logic, adding back in the giving twice Garrett Cox 2022-08-06 09:42:58 -0500
  • 0ec2e03fc6 Fixed compilation issues Kevin Alexis Contreras 2022-08-06 09:28:15 -0500
  • 7d38b957f2 Fixed conflicts again Kevin Alexis Contreras 2022-08-06 09:19:19 -0500
  • 80fd1995c0 add a command to copy the otr to the build dir briaguya 2022-08-06 05:37:37 -0400
  • 04598c0f0c formatting briaguya 2022-08-06 05:18:00 -0400
  • 5c97462b70 add version requirements in building.md briaguya 2022-08-06 05:15:46 -0400
  • 1b8168cfbb
    Merge pull request #1067 from garrettjoecox/shuffleCowsFix briaguya 2022-08-06 04:50:59 -0400
  • acb3d14193
    Merge pull request #1 from briaguya-ai/fix-ganon-boss-key Garrett Cox 2022-08-06 03:31:16 -0500
  • 5574442fdc fix ganon's boss key briaguya 2022-08-06 04:30:03 -0400
  • e274530073 Fix cows giving free bottles, too generous Garrett Cox 2022-08-06 02:43:10 -0500
  • b420638267 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity Garrett Cox 2022-08-06 00:48:55 -0500
  • 1ee89c50e2
    Merge pull request #1066 from briaguya-ai/zhora-to-next briaguya 2022-08-06 01:48:01 -0400
  • 5346217af3 Misc fixes Garrett Cox 2022-08-06 00:29:05 -0500
  • 2d9d67bbd0 Add missing case Garrett Cox 2022-08-05 23:44:53 -0500
  • cc4300ef8b Revert accidental changes Garrett Cox 2022-08-05 23:40:43 -0500
  • 61c88386a1 Merge branch 'develop-zhora' into zhora-to-next briaguya 2022-08-06 00:26:50 -0400
  • 733ce5d28f Use scene enum, handle thieves hideout keys Garrett Cox 2022-08-05 23:26:50 -0500
  • 4a78375c8f And like magic, keysanity working :D Garrett Cox 2022-08-05 23:08:46 -0500
  • 97d363c91e
    Merge pull request #1019 from garrettjoecox/shuffleCows briaguya 2022-08-06 00:03:27 -0400
  • 3767980049 Merge branch 'develop-zhora' into slowwalk Josh Bodner 2022-08-05 20:17:52 -0700
  • 14d468ae46 Enable SPD logging in libultra David Chavez 2022-08-06 04:50:47 +0200
  • 9a145221ec Remove newline Garrett Cox 2022-08-05 21:02:02 -0500
  • 8e412ca55c removed bloated comments Ryanoberlein 2022-08-05 20:39:02 -0400
  • 9d78bb1b20 fixed py file issue Ryanoberlein 2022-08-05 20:36:25 -0400
  • 8fd9662daa Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into consoleFromSource Garrett Cox 2022-08-05 16:13:37 -0500
  • de34fd7e94 Check coords for other cows rather than falling back Garrett Cox 2022-08-05 16:11:17 -0500
  • 528dbcdc17 More suggested changes Garrett Cox 2022-08-05 14:59:04 -0500
  • 08d5653f50 Small button spacing fix aMannus 2022-08-05 20:19:16 +0200
  • 329b6da88a Change buttons from close/open to > when open aMannus 2022-08-05 20:08:36 +0200
  • 5de662a326 Fix ice traps Garrett Cox 2022-08-05 12:05:22 -0500
  • 6fa0c0392b Better instructions for VS solutions David Chavez 2022-08-05 17:49:38 +0200
  • 85a2e5d9c0
    Merge branch 'HarbourMasters:develop-zhora' into CosmeticEditorZhora Baoulettes 2022-08-05 17:34:12 +0200
  • c996f62819 first scale test Baoulettes 2022-08-05 17:32:51 +0200
  • ed3cddbeaf Add option to shuffle frog song rupees Garrett Cox 2022-08-05 09:52:11 -0500
  • fc2028e118 Tiny code cleanup aMannus 2022-08-05 15:44:37 +0200
  • f92e4be530 Merge branch 'develop-zhora' into soh-f1-menu-rework aMannus 2022-08-05 15:03:20 +0200
  • 30441f21ba Changed button behaviour, more styling aMannus 2022-08-05 14:43:02 +0200
  • 3af0ad96c7 add soh icon for Windows Thomas Hiller 2022-08-05 12:41:22 +0200
  • 11d7a78e62 More changes from suggestions Garrett Cox 2022-08-05 01:38:45 -0500
  • 1ebca42f46
    Move to cmake across all platforms (#363) th-2021 2022-08-05 07:59:19 +0200
  • a65af79380 Merge branch 'develop-zhora' into feature/cmake David Chavez 2022-08-05 07:17:51 +0200
  • 93d0d7443a
    LUS Cleanup: Removes GameSettings class. Moves code to Imgui. (#1036) Kenix3 2022-08-05 01:03:11 -0400
  • d656905491 Update rando_main.cpp Kenix3 2022-08-05 00:53:16 -0400
  • 2cdd52910a Update Directory.h Kenix3 2022-08-05 00:46:03 -0400
  • 3b4d6cf059 Fixes PR. Kenix3 2022-08-05 00:43:09 -0400
  • cc69fc64d0 Update Directory.h Kenix3 2022-08-05 00:37:00 -0400
  • c7f0e2a86d Reverts changes to Directory.h Kenix3 2022-08-05 00:30:31 -0400
  • c23457d666
    Automatically save after every scene transition (#984) Josh Bodner 2022-08-04 21:15:49 -0700
  • ca111fddd4 fixed vcxproj files Ryanoberlein 2022-08-04 23:35:58 -0400
  • e9d1bf2d56 Initial work for keysanity Garrett Cox 2022-08-04 22:28:21 -0500
  • 63ace6a4cc
    Change ItemTableID to be uint16_t so we can use ModIndex for it. Christopher Leggett 2022-08-04 22:50:55 -0400
  • 1789e5dddd Fix ice traps for cow shuffle Garrett Cox 2022-08-04 20:59:46 -0500
  • 5408682e01 Rebase fixes Nicholas Estelami 2022-08-04 21:29:40 -0400
  • 628ff63434 Fixed merge and crash issues, removed old test app Nicholas Estelami 2022-08-04 17:45:23 -0400
  • 42a4c8a79d Fixed merge issues. Nicholas Estelami 2022-07-31 17:04:35 -0400
  • 2f04e8aa1c Fixed merge issues Nicholas Estelami 2022-06-29 23:00:36 -0400
  • 8d2c75feed Removed ExporterTest since it was no longer used. Nicholas Estelami 2022-06-03 20:46:28 -0400
  • 3d7710d3ec Further fixes Nicholas Estelami 2022-06-03 20:08:11 -0400
  • 1af8078fad More compile fixes Nicholas Estelami 2022-06-03 19:52:25 -0400
  • f9adf338ce Fixed another compile error Nicholas Estelami 2022-06-03 19:37:27 -0400
  • dbcc37f06f Another compile fix Nicholas Estelami 2022-06-03 17:43:09 -0400
  • 349737d18f Fixed compile issue Nicholas Estelami 2022-06-03 17:32:54 -0400
  • 775e577c7b Completed Scalar importer/exporter and cleaned up a few other things Nicholas Estelami 2022-06-03 17:23:24 -0400
  • ca378d7305 More reliable multi-threaded file extraction Nicholas Estelami 2022-06-03 16:07:48 -0400
  • 0f3de64156 Fixed rebase issues. Nicholas Estelami 2022-04-26 19:25:26 -0400
  • 37ec29cda8 Removed redundancies in headers. Nicholas Estelami 2022-04-25 01:10:55 -0400
  • 736a1fbc33 Further cleanup, scalar updates. Nicholas Estelami 2022-04-24 17:07:32 -0400
  • d5f5e004da File format updates Nicholas Estelami 2022-04-15 12:39:03 -0400
  • 22aa613257 Cleanup Nicholas Estelami 2022-04-14 21:42:25 -0400
  • dae3c4777b Removed old breakpoint checks and updated build string Nicholas Estelami 2022-04-15 14:52:15 -0400
  • 08373c9b4c File format updates Nicholas Estelami 2022-04-15 12:39:03 -0400
  • f3fdf8f472 Cleanup Nicholas Estelami 2022-04-14 21:42:25 -0400
  • 95d439bb30
    Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge Christopher Leggett 2022-08-03 23:15:52 -0400
  • 587147dc40 Remove count of cows from tooltip Garrett Cox 2022-08-04 19:44:08 -0500
  • ebcf574085 Use Randomizer_GetItemIdFromKnownCheck instead for shuffleCows Garrett Cox 2022-08-04 19:42:58 -0500
  • c73a6035d5 entrance category added Ryanoberlein 2022-08-04 20:40:24 -0400
  • 7364975920 change pr location Ryanoberlein 2022-08-04 19:35:50 -0400
  • 69965b6b87 fixed a build bug Ryanoberlein 2022-08-04 19:19:23 -0400
  • d77470b147
    Merge branch 'develop-rachael' into Aim Ada 2022-08-04 23:41:33 +0100