Commit Graph

  • 812a2729cc cleanup Cardboy777 2022-10-02 01:13:30 -0400
  • d4acc52970 Display correct bow/slingshot model in first/third person Cardboy777 2022-10-01 23:29:32 -0400
  • 360a535f71 undo modifications to item drops Cardboy777 2022-10-01 23:25:53 -0400
  • 59b3432f18 Fix shooting gallery always setting held item to bow, Cardboy777 2022-10-01 20:54:59 -0400
  • 37ffc8b9c8 Fixes Y-Axis inversion in C Up view Ada 2022-10-02 00:10:13 +0100
  • e379637c17 Fixes Y-Axis inversion in C Up view Ada 2022-10-02 00:10:13 +0100
  • 38c064d3c1 Fixes Y axis inversion in C Up view Ada 2022-10-02 00:00:15 +0100
  • 83d1e98091 Add heart line length adjustment and modified magic meter anchoring Andrew Van Caem 2022-10-02 08:29:48 +1100
  • d75b38d457 fix MQ forest louis 2022-10-01 17:49:48 -0400
  • fa65e0b29d fix MQ forest louis 2022-10-01 17:49:48 -0400
  • e4ec609696 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-10-01 18:25:22 -0300
  • f3f357c874
    Merge pull request #1663 from HarbourMasters/develop-zhora louist103 2022-10-01 17:19:12 -0400
  • ec88b90ed8
    [OTR] Initial support for PNG textures (#1634) Garrett Cox 2022-10-01 15:33:29 -0500
  • 9cf6418ee2 Fully working Louis 2022-10-01 15:43:40 -0400
  • 36e40665bb
    fix: don't hardcode path for global.sav (#1656) 4.0.1 briaguya 2022-10-01 13:48:46 -0400
  • 9804035dc0 fix: match auto center option text to behavior briaguya 2022-09-29 23:57:19 -0400
  • 973ec52b2a chore: increment version to bravo briaguya 2022-09-30 01:07:41 -0400
  • d61b398f41 Fix MQ not going away after deleting file louis 2022-10-01 12:53:03 -0400
  • af13595aae fix: disable randomizer cvar when in master quest briaguya 2022-10-01 12:59:10 -0400
  • 2a0a424d91 fix: disable randomizer cvar when in master quest briaguya 2022-10-01 12:59:10 -0400
  • 0abfd3f4dc Fix MQ not going away after deleting file louis 2022-10-01 12:53:03 -0400
  • 97211093f3
    Wii U: Fix overflow for GX2CopySurfaceEx (#1655) GaryOderNichts 2022-10-01 18:06:00 +0200
  • 0e043f2bc3
    Merge branch 'develop' into ice-trap-models Christopher Leggett 2022-10-01 11:44:15 -0400
  • 2151517f44 fix: don't hardcode path for global.sav briaguya 2022-10-01 09:51:54 -0400
  • c0fc819def Cleaned mq meta on delete KiritoDv 2022-10-01 08:51:38 -0500
  • 0f7baaf429 Fixed mq tag on z_file_choose KiritoDv 2022-10-01 08:49:34 -0500
  • fba4839705
    Rando: Add randomized ice trap messages (#1559) aMannus 2022-10-01 15:56:25 +0200
  • 250e1800a5 Wii U: Fix overflow for GX2CopySurfaceEx The max amount of rects is 25, everything larger silently overwrites the stack GaryOderNichts 2022-10-01 14:08:14 +0200
  • aef1765180 Bow as Child/Slingshot as Adult initial work Cardboy777 2022-10-01 05:19:01 -0400
  • 195f67ba98 Updated French aMannus 2022-10-01 10:24:25 +0200
  • edabca2acb Merge commit 'refs/pull/1634/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-10-01 05:18:04 -0300
  • 9c11606577 Minor code optimization aMannus 2022-10-01 09:29:13 +0200
  • 4367f24979 add logging to the null check block briaguya 2022-09-30 22:36:44 -0400
  • 23cc42caaf add logging to method ganon crash is happening in briaguya 2022-09-30 22:23:22 -0400
  • e57515cb15 Merge commit 'refs/pull/1648/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-09-30 22:48:00 -0300
  • c7f11e3042
    Fixes bug with Progressive Magic Meter (and possibly other prog items) Christopher Leggett 2022-09-30 21:00:55 -0400
  • 2af8562ab9
    Removes a function I added and didn't end up using. Christopher Leggett 2022-09-30 19:18:03 -0400
  • 8cbc17beeb Merge branch 'mouse' into experimental RaelCappra 2022-09-30 20:13:01 -0300
  • 5eeddafc3c Trying to avoid cpp code from the dxgi window header RaelCappra 2022-09-30 20:08:14 -0300
  • a276983de4 preprocessor hard RaelCappra 2022-09-30 19:52:17 -0300
  • 21dfc4c43f Merge commit 'refs/pull/1648/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-09-30 19:48:43 -0300
  • 3a4c4f5a6d Merge branch 'mouse' into experimental RaelCappra 2022-09-30 19:48:27 -0300
  • 206473d83a dummy dxgi mouse function RaelCappra 2022-09-30 19:44:01 -0300
  • 66ffd6dbd7 Merge branch 'mouse' into experimental RaelCappra 2022-09-30 19:39:29 -0300
  • fdb6256b1c attempting to clear out this mess RaelCappra 2022-09-30 19:39:19 -0300
  • a1f02d1e4c Fix release config aMannus 2022-10-01 00:17:03 +0200
  • 13b8a88d7d
    Fixes accidental removal of models from non-shop ice traps. Christopher Leggett 2022-09-30 18:10:13 -0400
  • cf6549780f Merge branch 'mouse' into experimental RaelCappra 2022-09-30 19:06:50 -0300
  • 0769684604 Changing to generic window apicall for shield mouse centering RaelCappra 2022-09-30 19:06:36 -0300
  • 717a43a51f
    Implements displaying the trickNames in the shops in-game. Christopher Leggett 2022-09-30 17:59:13 -0400
  • 4a6501bd84 Merge branch 'heads/develop' into random-enemies aMannus 2022-09-30 23:35:18 +0200
  • 4c26fab21f
    Translations for changed Stone/Shard of Agony trick names. Christopher Leggett 2022-09-30 17:13:55 -0400
  • d95e141f8a Move custom PNG handler to OTRExporter process Garrett Cox 2022-09-30 12:06:22 -0500
  • 18b3b2a6d8
    Changes stone of agony trick name. Christopher Leggett 2022-09-30 17:07:19 -0400
  • 87bf91c48e
    Fixes bug where random ice trap model was being changed after seed gen. Christopher Leggett 2022-09-30 17:03:16 -0400
  • a9576764a1
    Adds trickNames to spoiler_log and reverts previous commit. Christopher Leggett 2022-09-30 15:35:15 -0400
  • 6196749935
    Prevent models from being written to spoiler_log that will never be shown. Christopher Leggett 2022-09-30 15:17:49 -0400
  • 0636d60799
    Fixes incorrect models appearing in shops Christopher Leggett 2022-09-30 14:51:27 -0400
  • 03babe7d43
    Fixes incorrect model being drawn for some ice traps. Christopher Leggett 2022-09-30 14:40:25 -0400
  • 15e22349df
    Fixes Master Quest on Mac and Linux (#1641) Ada 2022-09-30 19:24:59 +0100
  • 886cc8b05b
    Fix some formatting. Christopher Leggett 2022-09-30 14:19:23 -0400
  • d3b50abb7d
    Adds model json tag for shopsanity items Christopher Leggett 2022-09-30 14:18:44 -0400
  • 2e571653c6
    Saves and Loads Ice Trap models from the save file Christopher Leggett 2022-09-30 14:11:25 -0400
  • a73f95113e
    Fixes some related compiler errors. Christopher Leggett 2022-09-30 13:52:10 -0400
  • 3e7583c23b
    Parses disguises from spoilerfile and swaps GIData in game Christopher Leggett 2022-09-30 13:35:08 -0400
  • be3ecb2f63 Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into develop MelonSpeedruns 2022-09-30 12:22:34 -0400
  • 6c823a23bc
    Whoops, forgot to also put the item in the json. Christopher Leggett 2022-09-30 12:10:21 -0400
  • 8d7a4cd3ba
    Adds Ice Trap Disguises to JSON spoiler_log. Christopher Leggett 2022-09-30 11:45:03 -0400
  • b6e48c2ddd Fixes MQ for Linux Ada 2022-09-30 16:27:36 +0100
  • 7b243720af Minor tweaks Garrett Cox 2022-09-30 08:56:35 -0500
  • a84dee3e23 oops Ada 2022-09-30 13:51:07 +0100
  • 28ccdaeea9 Adds MQ Hashes to MacOS OTR Checks Ada 2022-09-30 13:40:20 +0100
  • 7539a42eb5 Draw straight to screen (again) David Chavez 2022-09-30 14:18:14 +0200
  • c2988359c5 Merge remote-tracking branch 'upstream/develop' into feature/metal David Chavez 2022-09-30 13:59:41 +0200
  • ca28adde6d Add German & small text tweak aMannus 2022-09-30 09:50:26 +0200
  • abce480734 Merge branch 'heads/develop' into random-ice-trap-messages aMannus 2022-09-30 08:43:01 +0200
  • 232c8a6840 update cmake to use forked gamecontrollerdb.txt briaguya 2022-09-30 02:04:33 -0400
  • 8d6c7153f0 chore: increment version to bravo briaguya 2022-09-30 01:07:41 -0400
  • 13663b782b Update randomizer save format Garrett Cox 2022-09-29 22:47:54 -0500
  • e1fcd58a40 fix: match auto center option text to behavior briaguya 2022-09-29 23:57:19 -0400
  • fbd8a206bc Merge remote-tracking branch 'them/develop' into mouse RaelCappra 2022-09-30 00:48:02 -0300
  • f77b06ffe2 removing __THROW from nonlinux assert definition RaelCappra 2022-09-30 00:43:17 -0300
  • ed7e065a7a removing __THROW from nonlinux assert definition RaelCappra 2022-09-30 00:42:37 -0300
  • e921a1c718 Merge commit 'refs/pull/1575/head' of https://github.com/HarbourMasters/Shipwright into experimental RaelCappra 2022-09-30 00:39:37 -0300
  • abcea4e820 Merge branch 'them/develop' into experimental RaelCappra 2022-09-30 00:34:56 -0300
  • 0b2bec0f09 Merge remote-tracking branch 'them/develop' into experimental RaelCappra 2022-09-30 00:33:54 -0300
  • 3b7f067e89 Initial support for PNG textures Garrett Cox 2022-09-29 19:53:37 -0500
  • ac1c3d9c3f Timeless Equipment cleanup Cardboy777 2022-09-28 09:32:21 -0400
  • cd4936c2f5 Keep adult strength as child & prevent equipment greyout Cardboy777 2022-09-28 09:03:57 -0400
  • c7b832a7a6 cleanup some logic with macros Cardboy777 2022-09-27 05:37:29 -0400
  • 78bd3fda62 Add Cheat for disabling age check on equipment... pt 2 Cardboy777 2022-09-27 03:40:39 -0400
  • e949f7731f Add Cheat for disabling age check on equipment Cardboy777 2022-09-26 23:24:06 -0400
  • 8888fb2ec1
    Master Quest (#3) (#1632) 4.0.0 briaguya 2022-09-29 19:07:48 -0400
  • 80c1b1805f Master Quest (#3) louist103 2022-09-28 21:41:28 -0400
  • 170dac0f00 Remove SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE check on Switch David Chavez 2022-09-29 17:46:11 +0200
  • 12413d3f89 Prefix SetupFont for ImGui David Chavez 2022-09-29 08:41:42 +0200
  • dc3c0dd9c8
    disable crit wiggle (#1629) louist103 2022-09-28 20:27:07 -0400
  • 764bb9a0a6 Initial Bombarang draft RaelCappra 2022-09-28 20:04:33 -0300
  • 7475c5cf06 Cmakelists with preprocessor symbols for debug RaelCappra 2022-09-28 20:03:08 -0300
  • 805fde8c3b Set to zero in default preset louis 2022-09-28 17:22:44 -0400