Commit Graph

  • aca720a991 use latest LUS `main` and latest OTRExporter `soh-macready` briaguya 2024-02-08 17:57:49 -0500
  • e0b358a8fa no unicdoe briaguya 2024-02-08 17:30:17 -0500
  • 34648464dd just don't unicode briaguya 2024-02-08 17:29:41 -0500
  • 6f4bd261d9
    Merge eae4c23102 into be8dcfda05 Manuel Alfayate Corchete 2024-02-08 22:56:17 +0100
  • eae4c23102 Remove the remains of GLEW usage on the rest of operating systems. vanfanel 2024-02-08 22:51:56 +0100
  • cd782dde06 Base dialogue off of ruto's letter flag Taw 2024-02-08 11:53:48 -0800
  • d3dc6438db Code Clean Up -Reverted z_parameter.c to the latest commit on develop and added in logic to add left over rupees to the players balance. It has parity with the previous logic, but isn't as dumb. You could tell I had no idea what I was doing a few months ago when I wrote it. -Added reward checkboxes to the save editor. -Added in a new custom message, but the logic has not been implemented yet. -Made fee part of savecontext. I can't recall why, but I'll leave it. Maybe I can use it later for randomizer. -Several placeholders added with comments stating as such. The Pirate's Charm item needs to be implemented. mckinlee 2024-02-08 14:39:24 -0500
  • 46c7ea1dfe [Fixes] Fix for Zora hint dialogue condition with an inverted flag check Taw 2024-02-08 10:56:20 -0800
  • 3b21fafbf2 bad typedef briaguya 2024-02-08 01:53:16 -0500
  • b2743f925c fancy rebase and what not briaguya 2024-02-08 01:29:02 -0500
  • 210272c4c0 fix ref briaguya 2024-02-08 01:23:57 -0500
  • 7b22f9d896 simplify briaguya 2024-02-08 01:18:51 -0500
  • e3faf04517 tcharn't briaguya 2024-02-08 00:59:44 -0500
  • a73aa096cc unicode? briaguya 2024-02-08 00:56:05 -0500
  • 903e4fbdab windows? briaguya 2024-02-07 21:56:53 -0500
  • 37f0a7186b ports... briaguya 2024-02-07 21:49:47 -0500
  • 955de6cd43 link? briaguya 2024-02-07 21:42:19 -0500
  • 1696ff39be CreateGetItemMessage mckinlee 2024-02-07 07:11:01 -0500
  • 605850743e 🪟 briaguya 2024-02-07 02:54:29 -0500
  • df0c331a52 does ci like this? briaguya 2024-02-07 02:35:26 -0500
  • be1f595254 fix strhash64 dupe issue briaguya 2024-02-07 00:16:02 -0500
  • 0f628df44f mutex briaguya 2024-02-06 23:44:09 -0500
  • 884508cf64 fight the linker briaguya 2024-02-06 23:25:07 -0500
  • 1213c63026 don't unload if we didn't load briaguya 2024-02-06 22:00:58 -0500
  • f12aa78fd8 read version from archives again briaguya 2024-02-06 21:53:36 -0500
  • 55b1d64af2
    ci: pin switch docker image to known working version briaguya 2024-02-06 17:41:26 -0500
  • cfe55879ab Add `CVarClear` to appropriate sections of randomizer Locations and Tricks tabs to get around issue with saving blank CVar strings. Malkierian 2024-02-06 14:46:14 -0700
  • 03264c78d9 Case Handling for AMOUNT textbox revamp -What I had originally was just a complete mess. This is a lot more organized and does fix a bug where the wrong textbox was showing when trying to make a deposit with a maxed bank balance. mckinlee 2024-02-06 13:35:18 -0500
  • 2af23eeccf Asthetic Changes -Changed instances of Message_ContinueTextbox to Message_StartTextbox when transitioning into a *AMMOUNT textbox. This way the growing animation for textboxes is used instead. -With the above change it made it where I could consistently set a delayTimer for the overlay to be drawn making it appear around the same time as the textbox text. -I also added a fade in effect to the overlay. This makes it so the overlay doesn't feel so jarring when it appears. mckinlee 2024-02-06 12:41:25 -0500
  • 937feb385a Remove call to Item_Give -No need to manually give the item anymore mckinlee 2024-02-06 10:26:19 -0500
  • 99ea0b08e3 Rename func_80853148 to Player_StartTalking -In PR #3498 I renamed this function for clarity and decided to make a quick seperate PR for this change. mckinlee 2024-02-06 09:59:01 -0500
  • f2448d6b54 Rename func_80853148 to Player_StartTalking -Will be doing a seperate PR for this as well. mckinlee 2024-02-06 09:51:59 -0500
  • 67f7acda50 Make comments presentable. Tina H. (sheepytina) 2024-02-07 01:48:34 +1100
  • d69b7dc169 Added func_80853148 to functions.h -Windows build compiles fine with out this, but it's needed for the others. mckinlee 2024-02-06 09:30:05 -0500
  • 62aa12af42 More Heart Piece Reward Logic -When the player obtains the piece of heart they will now hold the piece of heart over their head. -Additional logic added to ensure the player retargets the banker actor mckinlee 2024-02-06 09:13:05 -0500
  • a54c4713fd Make custom env colour math more closely match vanilla equivalents. Tina H. (sheepytina) 2024-02-06 23:52:54 +1100
  • e5b882cb81 bombchu Tina H. (sheepytina) 2024-02-06 22:39:09 +1100
  • e8bfb1c101 No reason for "reset" to be static. Tina H. (sheepytina) 2024-02-06 22:30:16 +1100
  • 973f5fcfdb Partially fix cosmetics editor getting stuck on sword trails. Tina H. (sheepytina) 2024-02-06 22:14:01 +1100
  • a310d194d4 windows build briaguya 2024-02-06 03:39:04 -0500
  • 0f19eab1f9 clang format lus briaguya 2024-02-06 03:28:11 -0500
  • 5caf52d744 get in game briaguya 2024-02-06 03:23:20 -0500
  • 254fd5b484 Fix type error for custom color in ocarina icon pulsing. Tina H. (sheepytina) 2024-02-06 17:08:04 +1100
  • bcbd18dce4 Fix type/math error for custom color in textbox icon pulsing. Tina H. (sheepytina) 2024-02-06 16:59:46 +1100
  • ecc8964a01 Fix resetting button icon colours in message boxes. Tina H. (sheepytina) 2024-02-06 16:35:15 +1100
  • 51f18607e6 typo fix Taw 2024-02-05 17:38:57 -0800
  • bc1f611e74 Rename new cvars Taw 2024-02-05 17:26:17 -0800
  • bbc12d4853 Lighter colors Taw 2024-02-05 17:10:11 -0800
  • 0b4996089b Fix missing 'to' when searching Taw 2024-02-05 16:51:09 -0800
  • 51bd93f4f1 Add destination highlighting, context hiding, and a single-line toggle Taw 2024-02-05 16:25:57 -0800
  • bd483b8206
    Update soh/soh/z_scene_otr.cpp inspectredc 2024-02-05 23:25:19 +0000
  • cfc8ded726 Updated all UI Elements with new widgets. Added Color Selector Dropdown. Caladius 2024-02-05 15:50:10 -0500
  • a06395708a Moves personal notes to the save file under a new itemTracker save section. Malkierian 2024-02-05 12:19:37 -0700
  • 5ef87d3ab0 Fixes Mirror Shield and MS sheath Patrick12115 2024-02-04 19:08:30 -0500
  • 29bd4f258d Add enhancement to preserve minimap toggle state between areas Taw 2024-02-04 11:50:08 -0800
  • 67bf42cb9f Translations, Formatting, and Additional Dialogue -All translations have been completely redone. -All custom messages have been formatted correctly now. -Added additional dialogue for when a warp transfer can't be done due to maxed bank balance. mckinlee 2024-02-04 04:33:16 -0500
  • 82c772f27b Fixed Crash Patrick12115 2024-02-03 22:58:24 -0500
  • 65ab6cb4d8 dont let k overflow inspectredc 2024-02-03 22:08:13 +0000
  • b39a5081e9 Refined by Archez Patrick12115 2024-02-03 16:43:11 -0500
  • eef3eed4ff I'm bad at merging Patrick12115 2024-02-03 15:38:22 -0500
  • 59b383cc29 Merging issues Patrick12115 2024-02-03 15:31:39 -0500
  • 27c6ad6f8b Merge remote-tracking branch 'upstream/develop' into Leever-Spawn-Adjustment Patrick12115 2024-02-03 15:26:50 -0500
  • e5b4e2eb3c Merge remote-tracking branch 'upstream/develop' into NoMS Patrick12115 2024-02-03 15:25:10 -0500
  • 0e5a3f7929 Merge remote-tracking branch 'upstream/develop' into Fix-Floor-Switches Patrick12115 2024-02-03 15:23:29 -0500
  • f43342fc40 Merge remote-tracking branch 'upstream/develop' into GF-Gate-Guard-Child Patrick12115 2024-02-03 15:22:37 -0500
  • d93a40fad8 Merge branch 'Shops-Always-Open' of https://github.com/Patrick12115/Shipwright into Shops-Always-Open Patrick12115 2024-02-03 15:07:42 -0500
  • c8961eb1bc Merge remote-tracking branch 'upstream/develop' into Shops-Always-Open Patrick12115 2024-02-03 15:07:18 -0500
  • aec9b3119e
    Spacing Patrick12115 2024-02-03 15:04:33 -0500
  • 4dc20aa56f Merge remote-tracking branch 'upstream/develop' into Child-Holds-Hylian-Shield Patrick12115 2024-02-03 01:53:10 -0500
  • 6ef0eed945 Fix neck slider Josh Bodner 2024-02-02 18:48:19 -0800
  • 00e2d88fa9 Tweaks to coloridoscope Garrett Cox 2024-02-02 16:09:36 -0600
  • 4ed78e15f6 Update z_player.c Pepe20129 2024-02-02 22:50:14 +0100
  • 596ea5ebbb Vanilla Behavior Overhaul Garrett Cox 2024-01-08 09:25:47 -0600
  • 603f098841
    Merge branch 'HarbourMasters:develop' into develop-banker mckinlee 2024-02-02 12:08:30 -0500
  • fe9dcf1fc3
    Merge pull request #3900 from garrettjoecox/develop-rando-merge Garrett Cox 2024-02-02 10:45:56 -0600
  • 04c106d8f7 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-merge Garrett Cox 2024-02-02 09:15:34 -0600
  • be8dcfda05
    Fix Internal Resolution format to use %.1f instead of %d (#3899) Ted Newman 2024-02-02 05:38:24 -0800
  • 8c39ec91ca Merge branch 'develop' of https://github.com/A-Green-Spoon/Shipwright into feature/frog-game-difficulty Eric Hoey 2024-02-02 07:56:26 -0500
  • 8bb328fb28 Merge branch 'develop-banker' of https://github.com/mckinlee/Shipwright into develop-banker mckinlee 2024-02-02 03:17:05 -0500
  • a2a195a67f Merge branch 'develop' into develop-banker mckinlee 2024-02-02 03:14:18 -0500
  • d566eb04ad Fix Internal Resolution format to use %.1f instead of %d Taw 2024-02-01 23:34:42 -0800
  • 83da5ee677
    Moar caching (#3896) Garrett Cox 2024-02-02 00:22:44 -0600
  • 922b6702b8 Moar caching Garrett Cox 2024-02-01 22:01:28 -0600
  • 7cd2019ef6
    Fix starting skulltulas (#3876) aMannus 2024-02-02 06:56:35 +0100
  • 8cac9b4264
    Merge pull request #3897 from briaguya-ai/macready-to-dev-2-2 Garrett Cox 2024-02-01 23:45:44 -0600
  • a9d57a95ec Merge branch 'develop-macready' into macready-to-dev-2-2 briaguya 2024-02-02 00:19:13 -0500
  • 4fc75dcca9 New dialogue -Banker advises you of the fee now -Banker speaks to you through the pirate's charm after a warp transfer mckinlee 2024-02-02 00:17:46 -0500
  • 41c2933619
    sccache for windows builds (#3385) briaguya 2024-02-02 00:11:31 -0500
  • aff9f40933
    gc controllers via sdl on linux (#3869) briaguya 2024-02-01 23:55:53 -0500
  • f88343839e
    Item Tracker Text Size Slider (#3856) Patrick12115 2024-02-01 23:47:55 -0500
  • f9c670851c latest from soh-macready branch of otrexporter briaguya 2024-02-01 23:45:46 -0500
  • 511477444e don't bump lus yet briaguya 2024-02-01 23:31:12 -0500
  • f82a75bec8 Merge branch 'develop' into gc-via-sdl briaguya 2024-02-01 23:27:52 -0500
  • a003acf1de use latest lus main briaguya 2024-02-01 23:26:32 -0500
  • cb0598e0c0 Merge branch 'develop' into sccache-in-orig-action briaguya 2024-02-01 23:17:27 -0500
  • 6f18386d6b Merge remote-tracking branch 'upstream/develop' into Item-Tracker-Text-Size Patrick12115 2024-02-01 23:15:43 -0500
  • 1ec9a03dc0 sc briaguya 2024-02-01 23:14:21 -0500
  • 961b2626ad
    Merge controller menus (#3860) Pepe20129 2024-02-02 05:10:46 +0100
  • 81cb745fa4
    Merge branch 'develop' into sccache-in-orig-action briaguya 2024-02-01 22:54:44 -0500
  • a6af709560
    Apply suggestions from code review briaguya 2024-02-01 22:53:09 -0500