Commit Graph

  • 59d897829e Merge remote-tracking branch 'upstream/rando-next' into ryan-test Ryanoberlein 2022-08-04 18:10:15 -0400
  • 5bb0964625
    Update z_kaleido_item.c InfoManiac742 2022-08-04 12:07:19 -1000
  • 8504e4fb52 Merge remote-tracking branch 'upstream/develop-zhora' into ryan-test Ryanoberlein 2022-08-04 17:49:59 -0400
  • f0d2cf05bf Update windows note on using VSC David Chavez 2022-08-04 23:44:02 +0200
  • 5c3aa0d3f2 entrance rando seed gen Ryanoberlein 2022-08-04 17:37:57 -0400
  • 708fd6141c Delete stray macos toolchain file David Chavez 2022-08-04 23:36:16 +0200
  • d397c1d871
    Increment version 3.0.1 Kenix3 2022-08-04 17:35:49 -0400
  • 2f5f089e7f
    Increment version Kenix3 2022-08-04 17:35:32 -0400
  • 2d97834f5f
    Fix typo in BUILDING.md David Chavez 2022-08-04 23:34:30 +0200
  • facd1723f8
    don't use signed ints for epochs (#1044) briaguya 2022-08-04 17:32:23 -0400
  • 562bbcc338 Handle audio thread properly GaryOderNichts 2022-08-03 02:30:39 +0200
  • 73f8bc89ab
    Merge branch 'HarbourMasters:develop-zhora' into CosmeticEditorZhora Baoulettes 2022-08-04 16:11:00 +0200
  • 19a35ba173 Fix merge issues David Chavez 2022-08-04 15:22:39 +0200
  • ab5771dc25 Merge branch 'develop-zhora' into feature/cmake David Chavez 2022-08-04 15:19:07 +0200
  • 0ec35787f6 Fix build type David Chavez 2022-08-04 15:00:14 +0200
  • a2d1783faa Try experimental multithreading David Chavez 2022-08-04 14:49:19 +0200
  • 3e75a07cf6 Make navigating more clear for Windows David Chavez 2022-08-04 14:48:45 +0200
  • 60e0bd8cf4
    Add more details on developing SoH David Chavez 2022-08-04 14:38:42 +0200
  • ccb49ded90 Add more updates David Chavez 2022-08-04 14:10:33 +0200
  • 0d0b516e71 Update gitignore David Chavez 2022-08-04 13:58:45 +0200
  • ed506fc67b [windows] Extract assets before building David Chavez 2022-08-04 12:01:39 +0200
  • 08d54b2227 Fix macOS release build issue David Chavez 2022-08-04 11:33:47 +0200
  • 655590e55a Add release builds in Jenkins David Chavez 2022-08-04 11:01:00 +0200
  • 6f678c6255 replace Release with CMAKE_BUILD_TYPE in ExtractAssets Thomas Hiller 2022-08-04 13:25:02 +0200
  • fe4eaed9b1 Fix crash in release screen drawables David Chavez 2022-08-04 12:08:16 +0200
  • 06f931ce6d Fix linker flags David Chavez 2022-08-04 11:56:51 +0200
  • ebca137813 Fix Xcode project after merge David Chavez 2022-08-04 11:41:41 +0200
  • a0a0c4ef62 Merge branch 'develop-zhora' into feature/metal David Chavez 2022-08-04 11:37:11 +0200
  • 963831f05d Small improvements on depth buffer David Chavez 2022-08-03 10:02:40 +0200
  • 0712398944 Document clean command David Chavez 2022-08-04 10:54:46 +0200
  • c0780c5965 Add missing step for generating assets before building David Chavez 2022-08-04 10:29:30 +0200
  • e0329744f1 Extra big warning about ninja tools David Chavez 2022-08-04 10:15:54 +0200
  • 92334c949b Rely on Ninja’s multithreadedness David Chavez 2022-08-04 10:12:49 +0200
  • ad4d58f569 Revert "Use ninja to build directly" David Chavez 2022-08-04 10:04:06 +0200
  • c81e5a15fe don't use signed ints for epochs briaguya 2022-08-04 03:51:49 -0400
  • fc66066fb9 remove assets_created; copy oot.otr file Thomas Hiller 2022-08-04 08:39:31 +0200
  • 59ea48168a only toggle menu with controller when controller nav enabled briaguya 2022-08-04 02:26:58 -0400
  • 12ba418e66
    Update z_en_ru1.c InfoManiac742 2022-08-03 19:22:29 -1000
  • 5c8a07455c
    Update z_en_ru1.c InfoManiac742 2022-08-03 19:14:55 -1000
  • 59c264131c Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next InfoManiac742 2022-08-03 21:48:30 -0700
  • ada7d5aecf Update z_en_ru1.c InfoManiac742 2022-08-03 21:48:22 -0700
  • 03dd22daa0
    Merge branch 'rando-next' into childgear MoriyaFaith 2022-08-04 00:29:14 -0400
  • 2d22099805
    Merge pull request #1039 from HarbourMasters/develop-zhora briaguya 2022-08-03 21:02:29 -0700
  • 5f913cb9bf
    Merge pull request #1037 from briaguya-ai/rachael-to-zhora Kenix3 2022-08-03 23:18:24 -0400
  • 1da655adb5
    Resolve merge conflicts with develop-zhora Christopher Leggett 2022-08-03 23:13:53 -0400
  • 739434e3e4 Merge branch 'develop-rachael' into rachael-to-zhora briaguya 2022-08-03 23:01:11 -0400
  • 78ad282056
    Fix Navi HUD text regression (#1020) vaguerant 2022-08-04 12:47:54 +1000
  • d61d4e508a
    fix same name controller entry being unselectable (#1031) Baoulettes 2022-08-04 04:45:02 +0200
  • bd86c792c3
    Moves release version text (#1028) Ada 2022-08-04 03:44:43 +0100
  • dffcbb035e
    Fixes glitchy dungeon maps. (#1032) Christopher Leggett 2022-08-03 22:43:55 -0400
  • d370acbd90 Fixes more strdup problems and finalized removal of GameSetting. Kenix3 2022-08-03 22:42:07 -0400
  • 0f7a88bd5a
    This should fix (all?) 60fps interpolation issues left. (#938) Kenix3 2022-08-03 22:36:13 -0400
  • 2f5bd9ac03 LUS Cleanup: Removes GameSettings class. Moves code to Imgui. Kenix3 2022-08-03 22:05:09 -0400
  • 46c44cbe02 don't update epochs briaguya 2022-08-03 21:44:24 -0400
  • 97adc4a7f2 Changes string.h include in CVar.cpp Kenix3 2022-08-03 20:16:17 -0400
  • 6190388164 Now using posix strdrup on non-msvc builds. Kenix3 2022-08-02 23:20:17 -0400
  • 8c9d067657 LUS Cleanup: CVars functions are now consistent Kenix3 2022-08-02 22:25:27 -0400
  • 6d3d5e7da5 LUS Cleanup: Removes unnecessary ModManager class. Kenix3 2022-08-03 21:22:07 -0400
  • a00b49f563 don't update epochs briaguya 2022-08-03 21:44:24 -0400
  • db575798ba Add tip about VSC David Chavez 2022-08-04 03:43:36 +0200
  • 48f841dde1 LUS Cleanup: Removes unnecessary ModManager class. Kenix3 2022-08-03 21:22:07 -0400
  • 9bd344f7e4 Last Fix I Swear MoriyaFaith 2022-08-03 21:18:11 -0400
  • 3d7521f1a7 Update macos requirements David Chavez 2022-08-04 03:15:38 +0200
  • edcd39da97 Use ninja to build directly David Chavez 2022-08-04 02:52:14 +0200
  • 212d774613 Clean up unnecessary compiler checks. Kenix3 2022-08-03 20:56:04 -0400
  • e68fac14c8 Uses correct audio player per platform now. Kenix3 2022-08-03 20:40:33 -0400
  • 7675309e3f Moves specific audio player header file include to after the definition of AudioPlayer class in AudioPlayer.h Kenix3 2022-08-03 20:20:15 -0400
  • 4ce19e1448 LUS Cleanup: Only including the correct audio player header file. Kenix3 2022-08-03 20:04:29 -0400
  • fd379896d6 LUS Cleanup: Clean up hooks system. Kenix3 2022-08-02 23:14:25 -0400
  • c696430e1b Fix Equipment Not Greying Out at the Right Time MoriyaFaith 2022-08-03 21:09:23 -0400
  • 98bd09cb79 Clean up unnecessary compiler checks. Kenix3 2022-08-03 20:56:04 -0400
  • e49fe05964 Remove custom gcc mac toolchain David Chavez 2022-08-04 02:49:49 +0200
  • 004e6238f3 Uses correct audio player per platform now. Kenix3 2022-08-03 20:40:33 -0400
  • 85ddb4d026 Update instructions to use multiple cores David Chavez 2022-08-04 02:32:22 +0200
  • 021c5fd40b Moves specific audio player header file include to after the definition of AudioPlayer class in AudioPlayer.h Kenix3 2022-08-03 20:20:15 -0400
  • 248b5cbf43 Changes string.h include in CVar.cpp Kenix3 2022-08-03 20:16:17 -0400
  • 8431cddb14 LUS Cleanup: GameOverlay and moves various GUI related files to it's own filter. Kenix3 2022-08-02 23:32:37 -0400
  • 476e202b14 LUS Cleanup: Only including the correct audio player header file. Kenix3 2022-08-03 20:04:29 -0400
  • 5e8168fc92 Remove Makefiles & VS solutions David Chavez 2022-08-03 17:37:37 +0200
  • 6c9a763c21 Update randomizer.cpp MoriyaFaith 2022-08-03 19:51:01 -0400
  • 6da4d6f172 changed name of cheat MoriyaFaith 2022-08-03 19:49:46 -0400
  • 5f7c215b77 Finished up ChildGear MoriyaFaith 2022-08-03 19:43:22 -0400
  • 25b9f9dfac
    Fixes glitchy dungeon maps. Christopher Leggett 2022-08-03 19:17:58 -0400
  • 0846eba43b
    fix same name controller entry being unselectable Baoulettes 2022-08-03 23:42:12 +0200
  • de43b17aa4 Moves release version text Ada 2022-08-03 21:50:31 +0100
  • 9db463e8cb Fixes biggoron time being 0 days by default Ada 2022-08-03 21:31:09 +0100
  • 4025e388c9 Hopefully fix jenkins errors aMannus 2022-08-03 22:24:57 +0200
  • d354d479e9 Fixed new enhancements aMannus 2022-08-03 22:02:48 +0200
  • ca96b05230
    Add ninja to macOS requirements David Chavez 2022-08-03 21:52:12 +0200
  • dd64d96bfc Fixed merge conflict mistake aMannus 2022-08-03 21:39:50 +0200
  • 60a42dfbdd More styling, added closing buttons to windows aMannus 2022-08-03 19:47:48 +0200
  • c7a62b809b Implemented padding helpers aMannus 2022-08-03 15:29:53 +0200
  • 6e3fa4ac43 Some more styling aMannus 2022-08-02 20:08:55 +0200
  • 12332a7881 Moar styling aMannus 2022-08-02 17:34:02 +0200
  • 7b45e47a48 More styling aMannus 2022-08-02 16:58:59 +0200
  • c93074d275 More padding/styling/layout aMannus 2022-08-02 12:27:28 +0200
  • 559526085e First pass of UX changes aMannus 2022-08-01 20:36:16 +0200
  • 59a7bf2e06 Merge branch 'customizable_ocarina' of https://github.com/lilDavid/Shipwright into customizable_ocarina lilDavid 2022-08-03 14:31:10 -0500
  • 3880ead80e Fix text label in DetailedControlEditor::DrawMapping lilDavid 2022-08-03 14:31:04 -0500
  • 44366581b6 Revert "Revert "merge zhora-dev"" aMannus 2022-08-03 21:29:25 +0200