Commit Graph

  • e6798d9861
    bump lus and create fb call (#4060) Archez 2024-04-20 11:04:11 -0400
  • 067782fa91
    clean up cmake configure files (#4002) Archez 2024-04-20 11:03:41 -0400
  • d08d5a54c9
    Fix Pause Warp Enhancement (#4036) inspectredc 2024-04-20 16:01:16 +0100
  • 4a576f45ee
    Fix and Clean Up Swap Age Logic (#4061) develop-macready inspectredc 2024-04-20 15:43:35 +0100
  • b045689df1
    Step 1 of CVar macro/sectionalizing: Randomizer Settings (#3206) Malkierian 2024-04-20 07:29:19 -0700
  • 2aa2092c27
    filter randomizer checks in tracker (#4021) Jamie Klassen 2024-04-20 10:27:13 -0400
  • 28a2cc925e
    Merge pull request #114 from briaguya-ai/vb-tower-escape-no-new-should Garrett Cox 2024-04-20 09:23:14 -0500
  • 4d87e6d86b
    Merge branch 'HarbourMasters:develop' into bump-macports briaguya 2024-04-20 10:19:46 -0400
  • 5a22bc836f reorganise conditions into one statement inspectredc 2024-04-20 14:31:05 +0100
  • a5f732b345 Split and clean up swap age logic inspectredc 2024-04-20 14:07:31 +0100
  • 058fbf79b0
    Merge d7defa53a7 into 3e32d05173 louist103 2024-04-20 10:50:06 +0100
  • d461f71495
    Merge 06763b7341 into 3e32d05173 inspectredc 2024-04-20 10:48:28 +0100
  • 9cc187b21c bump lus and create fb call Adam Bird 2024-04-20 01:30:03 -0400
  • dd87494a39
    Merge bd73faaba9 into 43e8eec6bd Christopher Leggett 2024-04-20 01:09:34 +0000
  • bd73faaba9
    Merge branch 'develop-rando' of https://github.com/HarbourMasters/Shipwright into rando-silver-rupee-shuffle Christopher Leggett 2024-04-19 21:09:22 -0400
  • d99a63b2b3
    Merge db677ec700 into 3e32d05173 Eric Hoey 2024-04-19 19:50:34 -0500
  • 428f9724cd
    Merge 23570e2963 into 43e8eec6bd Pepe20129 2024-04-19 19:15:35 -0400
  • 3b0548f585 vb tower escape briaguya 2024-04-19 18:05:38 -0400
  • ab9932d1de
    Merge pull request #113 from briaguya-ai/treasure-chest-game-location-access Garrett Cox 2024-04-19 15:31:54 -0500
  • d3beac7337 fix: gift from sages location access briaguya 2024-04-19 16:29:37 -0400
  • ed0ef62c0c fix: add location access for treasure chest game items briaguya 2024-04-19 16:15:15 -0400
  • e8ecebd176
    Merge 770653b2f4 into 3e32d05173 Miles Acquaviva 2024-04-19 12:30:00 -0500
  • 0bde9f1fca Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes Garrett Cox 2024-04-19 12:29:10 -0500
  • 43e8eec6bd
    Replace some printfs with spdlogs (#4058) Garrett Cox 2024-04-19 12:28:38 -0500
  • 565a62a518
    Merge pull request #4059 from Malkierian/dev-to-dev-rando-4-19 Garrett Cox 2024-04-19 12:27:50 -0500
  • f4fc3662b6 dev -> dev-rando Malkierian 2024-04-19 09:50:17 -0700
  • dc7516401d
    Merge 69f842cadb into 3e32d05173 mckinlee 2024-04-19 11:37:57 -0400
  • 31c8ce523e
    Merge 7c79fbd41f into 3e32d05173 Pepe20129 2024-04-19 10:33:11 -0500
  • 39a35aa5f0 Replace some printfs with spdlogs Garrett Cox 2024-04-19 10:25:36 -0500
  • 3e32d05173
    macready -> dev briaguya 2024-04-19 11:27:05 -0400
  • 2216b68111 fix: add include missed in merge conflict resolution briaguya 2024-04-19 11:06:52 -0400
  • 9696f74b5c Merge branch 'develop-macready' into macready-to-dev briaguya 2024-04-19 09:57:29 -0400
  • 32bf8cc53c
    fix wii u ci (#4056) briaguya 2024-04-19 09:42:41 -0400
  • 02f7310c16
    Add keyring to check for placing Gerudo Fortess Keys in Any Dungeon or Overworld. (#4055) Malkierian 2024-04-19 06:42:26 -0700
  • bfe13906e9
    Make equip swap work on pause any cursor (#4052) inspectredc 2024-04-19 14:42:12 +0100
  • 32288be744
    Save in-game language setting (#4026) Amaro Martínez 2024-04-19 08:41:55 -0500
  • 19be6e9b99
    Trackers MQ Cleanup (#4009) Malkierian 2024-04-19 06:41:46 -0700
  • 0b8cc71d0d
    fix actor init flow with object loading (#3987) Archez 2024-04-19 09:41:04 -0400
  • 47c983d024 try just not running apt update briaguya 2024-04-19 08:05:01 -0400
  • 7b14c28ec8 get visibility into the sources briaguya 2024-04-19 07:51:09 -0400
  • 6c384c3cb6 Finish glitch aiding cutscenes toggle Garrett Cox 2024-04-18 21:52:38 -0500
  • abdbe25c8a Migrate purple poe faster fight Garrett Cox 2024-04-18 21:36:10 -0500
  • 1683617210 Migrate rainbow bridge Garrett Cox 2024-04-18 21:13:40 -0500
  • 4c6cf9c1e2 Add keyring to check for placing Gerudo Fortess Keys in Any Dungeon or Overworld. Malkierian 2024-04-18 19:04:53 -0700
  • edf6d9334a Migrate ganon trials Garrett Cox 2024-04-18 20:42:25 -0500
  • c27f364df7 Add scene command parsers Pepe20129 2024-04-18 17:37:56 +0200
  • 54b1505137
    vb gerudo (#111) briaguya 2024-04-17 21:17:00 -0400
  • f6a583446b
    vb bombchu bowling (#110) briaguya 2024-04-17 20:49:29 -0400
  • a4a832938c restructure some trials, conditionalAlwaysHints and hint_list stuff Pepper0ni 2024-04-17 11:37:08 +0100
  • 84db4c8ab8
    vb beehives (#109) briaguya 2024-04-16 21:02:16 -0400
  • 60d74f720a
    vb richard (#108) briaguya 2024-04-16 20:28:20 -0400
  • 63afaa3cc9
    vb ocarina memory (#107) briaguya 2024-04-16 20:18:26 -0400
  • 7876d9e91d
    Fix save bleed bug with Silver Rupee Counts. Christopher Leggett 2024-04-16 20:07:44 -0400
  • f02cb56d0c
    Fix bug with uncollected silver rupees getting killed when room is cleared. Christopher Leggett 2024-04-16 19:44:53 -0400
  • c46efe5c0d fix some issues, still linker bs Pepper0ni 2024-04-15 21:34:31 +0100
  • 67b9ca6c74 fail without error, complaining about unrefernced things Pepper0ni 2024-04-15 20:49:07 +0100
  • ced34ab68a
    [Fix] Disable Lod Applies To Everything (Macready) (#4034) inspectredc 2024-04-15 17:00:04 +0100
  • a60321efa3 static assertion failed: T must be an integral type or an enum. Pepper0ni 2024-04-14 14:03:04 +0100
  • c8994e0a94 Add temporary model to the skeleton key Pepe20129 2024-04-13 21:57:23 +0200
  • ae864b41b9 Re-run build Pepe20129 2024-04-12 21:30:13 +0200
  • 1c5f2a6747 Re-run build Pepe20129 2024-04-12 21:27:34 +0200
  • 2eb36573ee Merge branch 'develop-rando' into infinite_upgrades_develop-rando Pepe20129 2024-04-12 21:24:51 +0200
  • 7c79fbd41f Change the branch criteria to not having a tag Pepe20129 2024-04-12 20:57:34 +0200
  • 31db01be19 Update z_title.c Pepe20129 2024-04-12 20:23:17 +0200
  • e27cc0aac9 Change the branch criteria to starting with `develop` Pepe20129 2024-04-12 19:40:41 +0200
  • 9efaf28142 Add git info to title screen & gameplay stats Pepe20129 2024-04-12 19:14:37 +0200
  • cf657aac4f Make equip swap work on pause any cursor inspectredc 2024-04-12 16:13:44 +0100
  • 6e5aa32dd2 commit in case anyone looks Pepper0ni 2024-04-11 19:25:23 +0100
  • b9f5778339 expression error does not name a type Pepper0ni 2024-04-11 17:37:59 +0100
  • 43777c9259 Merge branch 'develop' of https://github.com/A-Green-Spoon/Shipwright into feature/frog-game-difficulty Eric Hoey 2024-04-10 18:35:22 -0400
  • db677ec700 Merge branch 'develop' of https://github.com/A-Green-Spoon/Shipwright into feature/boomerang-aiming-reticle Eric Hoey 2024-04-10 18:33:29 -0400
  • e5f1c9b446 Merge branch 'develop' of https://github.com/A-Green-Spoon/Shipwright into feature/bridge-always-down Eric Hoey 2024-04-10 18:31:35 -0400
  • 07c3499323 forgot to add Pepper0ni 2024-04-10 23:22:36 +0100
  • d75b9c463f TEXT_BEAN_SALESMAN_BUY_FOR_10 Pepper0ni 2024-04-10 23:16:18 +0100
  • 485b92c1ce stuck on wierd errors Pepper0ni 2024-04-10 23:09:23 +0100
  • 4a25a07a72
    Adds remaining code for Master Quest Rupees to work Christopher Leggett 2024-04-10 14:09:10 -0400
  • 5f2c44a212
    Merge 62495f4ebe into 897d3efbd0 Jérémy Lugand 2024-04-10 07:48:54 -0400
  • 7742006531 Added functionality to ocarina HUDs to reflect custom controls FrankJilek 2024-04-10 02:50:44 -0500
  • f3273e7627
    vb treasure chest game (#103) briaguya 2024-04-10 00:31:45 -0400
  • bbbd2520b1
    vb lh sun (#106) briaguya 2024-04-09 23:57:07 -0400
  • fe231147d5
    vb underwater item (#104) briaguya 2024-04-09 23:46:11 -0400
  • ca3ecab835
    Merge branch 'develop-rando' of https://github.com/HarbourMasters/Shipwright into rando-silver-rupee-shuffle Christopher Leggett 2024-04-09 18:09:36 -0400
  • b973c8026d
    Merge branch 'HarbourMasters:develop' into shipicon DarkMicro 2024-04-09 12:10:49 +0200
  • 36a462d667 Merge branch 'develop-rando' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes Garrett Cox 2024-04-08 11:03:50 -0500
  • 67ee5f8d0e
    Merge pull request #4045 from HarbourMasters/develop Garrett Cox 2024-04-08 16:02:22 +0000
  • 9c9fc49d32
    vb horseback archery (#102) briaguya 2024-04-08 11:59:48 -0400
  • 6d77bbd4a9
    vb skull rewards (#101) briaguya 2024-04-08 11:55:16 -0400
  • 89f150bb8e Few more cleanups, plus clarifying comment. Malkierian 2024-04-07 21:41:20 -0700
  • 109375dc58
    Merge 1ff878f59f into 897d3efbd0 MoriyaFaith 2024-04-08 00:35:00 -0400
  • 38513c1c7c Change some c-style casts to `static_cast`. Malkierian 2024-04-07 15:15:11 -0700
  • 435cdfcb3e All new conditional statements around `GameInteractor::IsSaveLoaded()` were inverted. Fixed that. Malkierian 2024-04-07 15:11:56 -0700
  • e163d5bc3d
    Fix switch puzzle locking issues (#4027) inspectredc 2024-04-07 22:28:20 +0100
  • d68bf1a309 fix actor init flow with object loading Adam Bird 2024-02-29 11:55:29 -0500
  • 897d3efbd0
    rip out unused types (#4041) briaguya 2024-04-07 17:02:57 -0400
  • cd27c4ba7b upstream ZAPDTR briaguya 2024-04-07 16:30:36 -0400
  • 9b0e12e68b Merge branch 'develop' into test-rip-out-unused briaguya 2024-04-07 16:04:45 -0400
  • bebd44b81d latest lus main briaguya 2024-04-07 16:03:15 -0400
  • 5f11afce5e Linux doesn't like the ISO stuff louist103 2024-04-07 14:28:21 -0400
  • 168323ebc9
    bump LUS (#4042) briaguya 2024-04-07 14:27:50 -0400
  • 1d8ddd7d5f another update briaguya 2024-04-07 14:17:07 -0400