Commit Graph

  • a42eb5a46e More rupee names aMannus 2022-09-19 13:21:48 +0200
  • 4747410759 Fail magic effects if magic is not acquired David Chavez 2022-09-19 13:02:14 +0200
  • cd74a780d3 Woops aMannus 2022-09-19 13:01:05 +0200
  • dd3c014c82 Actual fix aMannus 2022-09-19 13:00:44 +0200
  • a690c14e1c Implement speed modifier and fix defese modifier David Chavez 2022-09-19 12:55:04 +0200
  • 360e78ce56 Fix after some ice trap prepwork from earlier aMannus 2022-09-19 12:39:34 +0200
  • adcb8a6b65 Some fixes while testing CC connection David Chavez 2022-09-19 11:49:53 +0200
  • ef46f4b8d6
    Merge pull request #1512 from briaguya-ai/ztrnnn briaguya 2022-09-19 02:54:17 -0400
  • 9ce79dac4c merged? briaguya 2022-09-19 02:44:09 -0400
  • 8e21cda00b
    Merge pull request #1511 from briaguya-ai/ztornn briaguya 2022-09-19 02:32:39 -0400
  • d13cd7fdf9 manually restore changes to `z_player.c` briaguya 2022-09-19 02:22:07 -0400
  • 95b8ab2a5c Merge branch 'develop-zhora' into ztornn briaguya 2022-09-19 02:05:18 -0400
  • 7e4ab37f18
    Merge pull request #1505 from leggettc18/ice-trap-lock-fixes briaguya 2022-09-19 01:46:48 -0400
  • e338d145c4
    Adds some RANDOTODO comments about cleaning up a couple things. Christopher Leggett 2022-09-19 01:34:07 -0400
  • 16d2ee7c52
    Merge branch 'rando-next' into ice-trap-lock-fixes Christopher Leggett 2022-09-19 01:32:57 -0400
  • 9db3438abd
    Rename pendingIceTraps to pendingIceTrapCount Christopher Leggett 2022-09-19 01:28:05 -0400
  • 07a8bd7c0c
    Adds comment explaining the decision to default ITEM_FROM_NPC. Christopher Leggett 2022-09-19 01:23:40 -0400
  • aa1d03ffb2
    Merge pull request #1508 from briaguya-ai/phantom-bgs-fix briaguya 2022-09-19 01:22:47 -0400
  • 093dd10918
    Merge branch 'rando-next' into ice-trap-lock-fixes Christopher Leggett 2022-09-19 01:16:43 -0400
  • 50ec2b805d use existing check in `z_player` briaguya 2022-09-19 00:59:02 -0400
  • 76d4dbc34f move bgs flag into `MOD_NONE` check in girla briaguya 2022-09-19 00:57:03 -0400
  • 8de105f00a set bgs flag before `Item_Give`ing briaguya 2022-09-19 00:56:34 -0400
  • 86b97ab546 Merge branch 'develop-rachael' into charlie-aim briaguya 2022-09-19 00:36:20 -0400
  • 8a680ed797 move bgs logic for tokensanity into MOD_NONE check briaguya 2022-09-19 00:04:56 -0400
  • 39c80a738b fix bgs check in player briaguya 2022-09-18 23:53:20 -0400
  • 46b2146ddc Add rupoors and cursed heart container Garrett Cox 2022-09-18 22:47:39 -0500
  • e76890a796
    Update XMLs from upstream (#1448) louist103 2022-09-18 23:29:24 -0400
  • 9e0fec081a
    Implements some necessary plumbing and resolves several Ice Trap Softlocks. Christopher Leggett 2022-09-18 21:05:18 -0400
  • 66816205bd
    Merge pull request #1504 from garrettjoecox/1053-fix-bgs-double-text-box briaguya 2022-09-18 20:59:44 -0400
  • 69cbf0548a [#1053] Resolves an issue with shop items and bombchu bowling where BGS would display two message boxes Garrett Cox 2022-09-18 19:48:13 -0500
  • 219dec97ec
    Merge pull request #1329 from garrettjoecox/shopsanity briaguya 2022-09-18 20:19:02 -0400
  • 7abb8b36ac Revert "Fix BGS softlock for shopsanity" Garrett Cox 2022-09-18 19:03:18 -0500
  • 807cb2e876 Merge branch 'cheat-easy-pause-buffer' of github.com:garrettjoecox/OOT into simulated-input-lag-and-pause-buffering Garrett Cox 2022-09-18 17:57:28 -0500
  • 487304303b Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into 579-simulated-input-lag Garrett Cox 2022-09-18 17:50:15 -0500
  • ab31ea1a7d Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into cheat-easy-pause-buffer Garrett Cox 2022-09-18 17:19:53 -0500
  • 7375289342 Add pause input buffering Garrett Cox 2022-09-18 17:19:44 -0500
  • f5cc03bed8 Support tycoon wallet on tracker Garrett Cox 2022-09-18 13:51:59 -0500
  • 5fdb961ea4 Fix BGS softlock for shopsanity Garrett Cox 2022-09-18 13:25:09 -0500
  • 79d5bac1c0
    Fixes build on non-switch platforms. Christopher Leggett 2022-09-18 12:47:37 -0400
  • f83708640f
    Greatly improves saving speed on the Switch. Christopher Leggett 2022-09-18 12:30:28 -0400
  • 526aa951cd
    Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Garrett Cox 2022-09-18 09:45:18 -0500
  • cf616b83ee
    Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Garrett Cox 2022-09-18 09:45:09 -0500
  • 42edeb25a6 Replace magic numbers in message handler Garrett Cox 2022-09-18 09:44:35 -0500
  • d95e4d4994 Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM Garrett Cox 2022-09-18 09:30:51 -0500
  • 2e274e8ea0 Typo PurpleHato 2022-09-18 00:11:03 +0200
  • d9a9370e0d Rando: Junk Hint missing french translation PurpleHato 2022-09-17 23:55:19 +0200
  • 109ff2fc40
    Merge branch 'HarbourMasters:develop-zhora' into shooting-gallery-difficulty Oliver Schall 2022-09-17 23:29:21 +0200
  • 42f1b7d619 Fix unused dynamic link shadow for possible future enhancement rozlette 2022-09-16 17:45:33 -0500
  • 90e9c95267 Implement reverse controls David Chavez 2022-09-16 23:55:50 +0200
  • 49b3323fb2 Changed spaces to tabs in OTRExporter/Main.cpp Dan Lilja 2022-09-16 23:16:47 +0200
  • 1d5795c294 Implement no_z and clean up David Chavez 2022-09-16 22:24:57 +0200
  • 61b29476e3 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-16 14:51:09 -0500
  • f51228c1c4 Implement defense modifier David Chavez 2022-09-16 21:19:05 +0200
  • bc15483edc Use std::format and implement wallmaster David Chavez 2022-09-16 21:08:57 +0200
  • 77ec3954dc Various changes from PR feedback Garrett Cox 2022-09-16 11:29:17 -0500
  • e2e0a070ea
    Fixes copying save files on the switch (#1478) Christopher Leggett 2022-09-16 12:23:31 -0400
  • 426bdf6688 A few changes around merchant messages Garrett Cox 2022-09-16 10:55:13 -0500
  • 08f9b06e90
    Merge pull request #1488 from garrettjoecox/non-warp-song-render-fix briaguya 2022-09-16 11:20:54 -0400
  • c2c6955b90 [#1434] Renders non-warp songs more consistently with warp songs Garrett Cox 2022-09-16 08:59:22 -0500
  • 7e4f2ecc20 Use EnGirlAShopItem enum instead of raw hex values Garrett Cox 2022-09-16 08:52:25 -0500
  • 86cc209122 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-16 08:30:57 -0500
  • b02de14e3d
    removes assert from Wii U solution and uses that instead. Christopher Leggett 2022-09-15 19:40:22 -0400
  • b2b475ad4c Fix spacing David Chavez 2022-09-15 23:52:05 +0200
  • fabe7a3e83 Address PR comments David Chavez 2022-09-15 23:49:43 +0200
  • 66d39be480 player louis 2022-09-15 17:15:49 -0400
  • d53c8588e2
    Fix: Unbreak Wii U sliders (#1486) aMannus 2022-09-15 22:48:51 +0200
  • 1b705c418b #elseif -> #elif aMannus 2022-09-15 22:06:36 +0200
  • 194d473a82 Unbreak Wii U sliders aMannus 2022-09-15 21:34:04 +0200
  • 7ffc724ad8
    Enable CrowdControl on windows (#33) David Chavez 2022-09-15 20:39:56 +0200
  • 8503b26413
    Add no UI functionality (#32) David Chavez 2022-09-15 18:23:24 +0200
  • 5c26a3dc48
    Implement cucco storm (#31) David Chavez 2022-09-15 18:05:17 +0200
  • 8cb7f810ea
    Implement pacifist mode (#30) David Chavez 2022-09-15 18:05:01 +0200
  • b247c75789 missed some changes louis 2022-09-15 11:50:18 -0400
  • 1c3d7f92b6
    Merge pull request #1477 from louist103/format-rando-1 briaguya 2022-09-15 09:05:19 -0400
  • dbbf563287 Remove (debug?) reference to jsjutanShadowTex in LUS rozlette 2022-09-15 02:05:11 -0500
  • 19942ae77b Add hack to load bss texture in ovl_En_Jsjutan rozlette 2022-09-15 01:33:57 -0500
  • 58cfe16b6f
    Merge branch 'develop-zhora' into develop-zhora InfoManiac742 2022-09-14 17:30:57 -1000
  • cd977df15f
    Fixes copying save files on the switch Christopher Leggett 2022-09-14 22:37:29 -0400
  • c6ea367856 format louist103 2022-09-14 22:37:05 -0400
  • 5db05c584a [#1336] Fix issues with gFasterHeavyBlockLift Garrett Cox 2022-09-14 19:02:39 -0500
  • 9a5b00b08a Made path to version file portable Dan Lilja 2022-09-14 23:28:33 +0200
  • fd731cb3f7 Removed creation of version file from other places Dan Lilja 2022-09-14 21:42:47 +0200
  • 46351dac63 Added creation of version file to OTRExporter Dan Lilja 2022-09-14 21:42:05 +0200
  • 77800ce273 Remove fix to random color code MoriyaFaith 2022-09-14 14:24:16 -0400
  • a99fe0a762 Remove things not related to Trails MoriyaFaith 2022-09-14 14:19:37 -0400
  • 38c375d503 only change MoriyaFaith 2022-09-14 13:58:57 -0400
  • 8fa9baaaf6 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity Garrett Cox 2022-09-14 12:23:47 -0500
  • ac5b5ebc4c restored previous removal of sword blur code MoriyaFaith 2022-09-14 11:43:32 -0400
  • 978ddcc5a6
    Merge pull request #1471 from HarbourMasters/develop-zhora briaguya 2022-09-14 10:58:59 -0400
  • 154fd9b29f
    Merge branch 'HarbourMasters:develop-zhora' into trail_rework MoriyaFaith 2022-09-14 09:54:37 -0400
  • f5c535f014
    [APPIMAGE] Disable AppImageLauncher integration qurious-pixel 2022-09-13 18:27:32 -0700
  • 941cf65227
    use strnlen for c string empty check (#1352) briaguya 2022-09-13 21:12:03 -0400
  • e1f95a5ad9
    ImGui Switch/Wii U slider fixes (#1371) aMannus 2022-09-14 02:47:00 +0200
  • 18a26b480e
    Use Color_RGB8 CVars in z_message_PAL (#1372) lilDavid 2022-09-13 19:45:51 -0500
  • 67bbeca809
    Another fix for getting items near critters. (#1332) Christopher Leggett 2022-09-13 20:45:23 -0400
  • 2665013056
    Update z_file_choose.c briaguya 2022-09-13 20:41:25 -0400
  • eda5a6ac91
    Fix blocks not being pushed all the way (#1363) Josh Bodner 2022-09-13 17:38:26 -0700
  • 08a5b36fac Add support for the 'Vanilla Logic' option Nick Michael 2022-09-13 22:22:44 +0100
  • e95fa4e4d3
    Merge branch 'HarbourMasters:develop-zhora' into shooting-gallery-difficulty Oliver Schall 2022-09-13 22:20:05 +0200
  • 43cde7eccd
    Merge pull request #1467 from HarbourMasters/develop-zhora briaguya 2022-09-13 11:37:14 -0400