Commit Graph

  • b038ba517c
    Merge branch 'HarbourMasters:develop' into openclose_disp_macro Baoulettes 2022-07-04 17:06:48 +0200
  • c319631b16 Fix matrix not using macros Baoulettes 2022-07-04 17:06:03 +0200
  • 0ba9e7b1aa
    Merge branch 'develop' into tokenpatch vaguerant 2022-07-05 00:59:40 +1000
  • a31be1f3d1
    Update to latest `docking` imgui (#582) David Chavez 2022-07-04 16:54:09 +0200
  • e5b59742ae change sunset in save editor so dampe is out briaguya 2022-06-30 09:58:16 -0400
  • 8615418630 missed a couple spots briaguya 2022-06-29 20:09:06 -0400
  • b8602994fb change name based on PR comment briaguya 2022-06-29 08:19:30 -0400
  • 923bf3b0e4 special char doesn't work with default imgui font briaguya 2022-06-28 10:13:55 -0400
  • 21142bdb26 command on mac briaguya 2022-06-28 09:21:57 -0400
  • 5ce2ecd6c8 Update README.md briaguya 2022-06-28 08:57:42 -0400
  • b730af5e8a implement reset briaguya 2022-06-28 08:15:26 -0400
  • f9b831d5c0 add menu from https://github.com/PurpleHato/Shipwright/tree/ResetMenu briaguya 2022-06-28 07:31:02 -0400
  • e7c2aff97e Fix audio, boot commands, and save staes. louist103 2022-06-27 20:48:40 -0400
  • 668f9bee10 Fix testing masks of DPad rozlette 2022-06-27 17:09:04 -0500
  • 818d5f90a8
    Add toggles for disabling heart drops and random drops (#507) earthcrafterman 2022-07-04 10:42:43 -0400
  • 30010cf8b5
    [MISC] Fix typo qurious-pixel 2022-07-04 06:49:31 -0700
  • b6bd3a5cab
    Merge pull request #267 from aMannus/zelda-escape-cutscene-skip briaguya 2022-07-04 09:40:21 -0400
  • df88913e16 Fixed typo in comment aMannus 2022-07-04 15:13:11 +0200
  • fc49b6d2dd Made if statement more readable aMannus 2022-07-04 15:08:45 +0200
  • b701a42097 Controller Navigation Fix-Up Live session user 2022-07-04 06:05:31 -0700
  • 9296a5244f Streamlined OoT cutscene skip for future additions aMannus 2022-07-04 14:53:35 +0200
  • 9e55e01555 Trying to use iron knuckle death effects aMannus 2022-07-04 14:29:21 +0200
  • 26f2cb5d88
    Merge pull request #274 from briaguya-ai/fix-epona-spawn-checks briaguya 2022-07-04 08:06:00 -0400
  • fa6846bfc6 don't autospawn epona if we don't have the song/ocarina briaguya 2022-07-04 08:04:10 -0400
  • a9496c6085
    Merge pull request #273 from briaguya-ai/fix-hint-text-that-breaks-geneation briaguya 2022-07-04 06:22:15 -0400
  • 31d952bcd2 another hint line that breaks autonewline logic briaguya 2022-07-04 06:21:28 -0400
  • a83dc8b963 Merge branch 'pr/416' into spirit-temple-cs-skips-testing aMannus 2022-07-04 11:45:48 +0200
  • f2e47733da Revert one line to match original aMannus 2022-07-04 11:41:02 +0200
  • 54ca16ada4 Cleaned up and fixed zelda escape skip aMannus 2022-07-04 11:39:37 +0200
  • 6e62be8ee1
    Merge pull request #272 from briaguya-ai/fix-pulseaudio briaguya 2022-07-03 22:24:07 -0400
  • de13987566 remove one hardcoded samplerate briaguya 2022-07-03 22:15:16 -0400
  • d218f7c003 update tlength briaguya 2022-07-03 21:55:39 -0400
  • 18a9aeea0a pulseaudio values tuned for n64 audio at 44.1khz briaguya 2022-07-03 21:48:00 -0400
  • 49251ee122
    Merge pull request #271 from briaguya-ai/the-real-bottle-fix briaguya 2022-07-03 21:03:40 -0400
  • 80eb5906bd the real bottle fix briaguya 2022-07-03 21:01:27 -0400
  • 1c90f998f8
    Merge pull request #270 from briaguya-ai/fix-colorstack-crash briaguya 2022-07-03 19:39:26 -0400
  • 575aa3ba1c make the colors work again briaguya 2022-07-03 19:38:30 -0400
  • 33a172fa0c move color push/pop to stop crash briaguya 2022-07-03 19:28:38 -0400
  • 4154e9484f
    Merge pull request #269 from briaguya-ai/fix-pulseaudio briaguya 2022-07-03 19:18:41 -0400
  • 9886686f45 spaces/tabs briaguya 2022-07-03 19:16:55 -0400
  • 62d83a6969 use pulseaudio defaults briaguya 2022-07-03 19:12:10 -0400
  • 210c7b30f4 Merge branch 'pr/416' into zelda-escape-cutscene-skip aMannus 2022-07-04 00:50:22 +0200
  • 4697e829b5 Better implementation for specific rando cutscene skips aMannus 2022-07-04 00:47:34 +0200
  • 0a90e00c8b First attempt skip cs after nabooru defeat aMannus 2022-07-04 00:36:57 +0200
  • 8ae0c23145
    Merge pull request #268 from PurpleHato/ItemTracker briaguya 2022-07-03 18:23:04 -0400
  • a8007b3d16 ADD: ChromaKey text PurpleHato 2022-07-04 00:21:31 +0200
  • 2a87ad706d Added flags cutscene before nabooru fight aMannus 2022-07-04 00:20:11 +0200
  • d28e997cac
    Merge pull request #16 from briaguya-ai/background-color PurpleHato 2022-07-04 00:17:45 +0200
  • 2c50eb8384 colors briaguya 2022-07-03 18:16:03 -0400
  • 373d804fde TWEAK: Color on wallet PurpleHato 2022-07-03 23:55:08 +0200
  • 37b9a25c87
    Merge pull request #15 from briaguya-ai/songs-and-names PurpleHato 2022-07-03 23:45:13 +0200
  • 2b9591a8f3 songs and names briaguya 2022-07-03 17:43:59 -0400
  • 09d6593238 ADD: More spacing logic PurpleHato 2022-07-03 23:16:45 +0200
  • 597488a752
    Merge pull request #14 from briaguya-ai/groupy-group PurpleHato 2022-07-03 23:15:21 +0200
  • c1d2582ad2 use groups instead briaguya 2022-07-03 17:13:27 -0400
  • 2a1851ccfb ADD: Ammo Option PurpleHato 2022-07-03 22:55:02 +0200
  • f9cdf5e6e8 FIX: Light Arrow PurpleHato 2022-07-03 22:41:23 +0200
  • c8b98adc3c
    Merge pull request #264 from leggettc18/rando_prelude briaguya 2022-07-03 16:39:25 -0400
  • 1d03d891f8 TWEAK: Spacing PurpleHato 2022-07-03 22:37:28 +0200
  • d209e922c1 ADD: default case for items PurpleHato 2022-07-03 21:41:55 +0200
  • b33cad06e5 ADD: X Spacing + Placeholders for song PurpleHato 2022-07-03 21:32:28 +0200
  • 73a74d88f8 Added cutscene skip for zelda escaping aMannus 2022-07-03 20:16:02 +0200
  • 3270221ac6
    Fixes some vanilla bugs introduced by rando code. Christopher Leggett 2022-07-03 12:16:54 -0400
  • 7a013b491a FIX: Use DrawItem instread of DrawUpgrade... b-baka! PurpleHato 2022-07-03 16:09:49 +0200
  • 4846178369
    Add Imgui include path for better imports David Chavez 2022-07-03 16:06:42 +0200
  • 5f00e14adb TWEAK: Wallet check PurpleHato 2022-07-03 16:03:44 +0200
  • 050d3ac492 ADD: Wallter (crash for now) PurpleHato 2022-07-03 15:59:20 +0200
  • b0111fec0c
    Merge pull request #13 from briaguya-ai/this-is-all-i-did PurpleHato 2022-07-03 14:04:59 +0200
  • 56b62b9445
    Merge branch 'ItemTracker' into this-is-all-i-did PurpleHato 2022-07-03 14:04:49 +0200
  • 5bbcd04cd1 ADD: GS Count PurpleHato 2022-07-03 14:03:38 +0200
  • 3512c2cd45 not the cleanest code ever but it's working briaguya 2022-07-03 07:30:00 -0400
  • eb78c4ca7b this is all i did briaguya 2022-07-03 07:04:23 -0400
  • f6e6abae60
    Merge pull request #265 from Dog/testing-out-item-replacement briaguya 2022-07-03 05:35:31 -0400
  • b96b5a2460 Merge branch 'develop' into tokenpatch Vague Rant 2022-07-03 17:33:40 +1000
  • 7836d9f9d3 swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things. Dog 2022-07-02 21:46:08 -0700
  • fd69ce2609
    Improved prelude after time travel fix Christopher Leggett 2022-07-02 22:26:39 -0400
  • 4f15e8deae
    Merge pull request #262 from Dog/testing-out-item-replacement briaguya 2022-07-02 21:16:18 -0400
  • 7c97ed1315
    Merge pull request #263 from briaguya-ai/ganon-text-formatting briaguya 2022-07-02 21:10:06 -0400
  • 907a186ea0 ganon hint text logic briaguya 2022-07-02 21:07:13 -0400
  • e25f5ee2ef Autoskip the tower cutscene if settings call for tower collapse. Dog 2022-07-02 17:58:10 -0700
  • fce9cdf49c format ganon text/hint text briaguya 2022-07-02 20:46:35 -0400
  • 9b24c27d15 ADD: AMMO Count PurpleHato 2022-07-03 02:37:40 +0200
  • 8df8c122cd
    Merge pull request #261 from leggettc18/rando_prelude briaguya 2022-07-02 19:45:46 -0400
  • ba052311f0
    Merge pull request #260 from Dog/testing-out-item-replacement briaguya 2022-07-02 19:27:41 -0400
  • ce0b415a47
    Merge branch 'testing-out-item-replacement' of https://github.com/briaguya-ai/Shipwright into rando_prelude Christopher Leggett 2022-07-02 19:13:37 -0400
  • 8f5f136d26
    Update z_message_PAL.c Dog 2022-07-02 15:53:18 -0700
  • e28a69c8d0
    Update soh/soh/OTRGlobals.cpp Dog 2022-07-02 15:52:34 -0700
  • 7c05533855 Adding ganon flavor text Dog 2022-07-02 15:44:00 -0700
  • aa7a1a062d TEST: Text for item PurpleHato 2022-07-02 22:38:20 +0200
  • bd1f833acc
    Merge pull request #250 from leggettc18/rando-shadow-lore-prompt-skip briaguya 2022-07-02 13:17:21 -0400
  • dae9e59429
    Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case. Christopher Leggett 2022-07-02 13:03:26 -0400
  • 0e4de3af31
    Fixes skipped text so it only applies to shadow temple. Christopher Leggett 2022-07-02 12:55:18 -0400
  • 9097cfcf6a
    Merge pull request #259 from briaguya-ai/fast-owl briaguya 2022-07-02 11:59:04 -0400
  • c50f2e19e7 skip owl flight cutscenes in rando briaguya 2022-07-02 11:57:19 -0400
  • 7faebdcf51
    Merge pull request #258 from aMannus/ganondrof-cutscene-skip briaguya 2022-07-02 10:43:07 -0400
  • 2cc2371fb7 Update z_boss_ganondrof.c aMannus 2022-07-02 16:23:51 +0200
  • 0476c3a017 Skip ganondrof cutscene aMannus 2022-07-02 16:16:21 +0200
  • 01b0e6d123
    Merge pull request #257 from briaguya-ai/no-chime-on-load briaguya 2022-07-02 09:45:32 -0400
  • a39b04a5cb uncomment briaguya 2022-07-02 09:45:01 -0400
  • dea36d8d65 no chime on load briaguya 2022-07-02 09:37:42 -0400