shipdev

izzy/shipdev

Fork 0

mirror of https://github.com/izzy2lost/shipdev.git synced 2026-07-05 15:19:25 -07:00

Commit Graph

Select branches

Hide Pull Requests

develop

uwp

uwp-foxtrot

uwp-1.1.3

uwp-1.1.5

f9a4070225 Merge pull request #2920 from Archez/fix-granny-unshuffled Christopher Leggett 2023-05-27 15:18:33 -04:00
f25c200526 Merge pull request #2890 from Archez/support-thieves-hideout-keyring Christopher Leggett 2023-05-25 21:06:52 -04:00
cab90e9ac6 Removed unused variable. Malkierian 2023-05-25 16:59:53 -07:00
d0c09394ca Re-added removal of empty sceneTimestmps objects for saving and loading, significantly reducing sohStats size. Malkierian 2023-05-25 16:57:27 -07:00
015c30d3b6 Merge pull request #2 from leggettc18/gf-keyring Adam Bird 2023-05-25 15:57:56 -04:00
718ded7c44 fix: use blue potion refill for granny shop item when unshuffled Adam Bird 2023-05-25 15:47:51 -04:00
f6b9c227d7 Fixes bad Key Ring Count under certain conditions. Christopher Leggett 2023-05-25 15:42:22 -04:00
13513345bf Remove magic numbers and fix formatting. Christopher Leggett 2023-05-25 15:35:38 -04:00
8f5538a700 Adds validation to GF Key Ring and Key Ring Count settings. Christopher Leggett 2023-05-25 14:50:28 -04:00
1fa99fd50a What a nightmare that was. Malkierian 2023-05-24 13:00:35 -07:00
b46d6e2d19 Update README.md Bytenex 2023-05-24 16:35:38 +02:00
ab4ad42486 Update README.md Bytenex 2023-05-24 10:34:10 +02:00
fe6705cc4d Merge pull request #2906 from HarbourMasters/develop-spock Christopher Leggett 2023-05-23 09:18:15 -04:00
e88adbe672 Version Bump (#2916) Christopher Leggett 2023-05-22 21:34:18 -04:00
dddd3b14aa Add back missing Greg timestamp (#2911) aMannus 2023-05-22 16:56:44 +02:00
f34df2f064 remove what i assume to be accidentally copied stuff from a diff (#2909) briaguya 2023-05-22 09:33:31 -04:00
f005bd3b7f add skeleton unregistration to actors that manage their own skeletons (#2908) Rozelette 2023-05-22 08:20:06 -05:00
5de1240391 Cleanup gameplay stats code/UI and support RTA timing (#2862) Garrett Cox 2023-05-21 22:35:56 +00:00
7962e0e6d6 Add Scene Specific Checks to Dirt Path Fixes (#2907) Patrick12115 2023-05-21 18:12:25 -04:00
cf711d9164 Initialize gSlotAgeReqs[SLOT_TRADE_CHILD] and gItemAgeReqs[ITEM_MASK_BUNNY] on load initialization according to gMMBunnyHood and gTimelessEquipment to prevent bunny hood from being unequipped from adult equips on first load. (#2904) Malkierian 2023-05-21 09:13:38 -07:00
cf42057842 Fix: seed srand on launch and fix spoiler log for seed testing generation (#2902) Adam Bird 2023-05-20 16:25:29 -04:00
0b47a19c2c Mask Sale Fix (#2900) Malkierian 2023-05-20 09:05:47 -07:00
4d02d89e03 Fixes buying songs crash on Switch (#2899) Christopher Leggett 2023-05-20 09:24:02 -04:00
8d0b83b691 Merge branch 'HarbourMasters:develop' into sectional-saves Malkierian 2023-05-19 14:56:19 -07:00
f2f5a75cb0 Custom message improvements (#2892) Christopher Leggett 2023-05-17 22:24:24 -04:00
30cc61abce fix search rom extension oversight (#2891)
AltoXorg Christopher Leggett briaguya
2023-05-18 10:22:57 +08:00
b361d5ede1 Use UTF-8 for MSVC and enable visual styles for Windows (#2888) Amaro Martínez 2023-05-17 21:21:26 -05:00
099d9cd0fd Threaded save was causing issues for old oot-save.sav conversion. Added an option just for that instance to run SaveManager::SaveFileThreaded outside of a thread. Everything else still runs threaded. (#2894) Malkierian 2023-05-17 12:51:17 -07:00
5244cda90e expose thieves hideout selection for keyrings in randomizer settings Adam Bird 2023-05-16 17:40:50 -04:00
4cf3172a3d Fixed trying to emplace in sectionRegistry without index. Malkierian 2023-05-15 17:40:10 -07:00
1a9ef29ac5 Added function to get sectionID for a specified section name, returning -1 if section name not registered. Malkierian 2023-05-15 17:32:49 -07:00
50fbe5d00c Modified sectional saving to utilize an integer ID for calling specific sections to cut down on string copying. Utilizes enum values for non-mod sections to allow for cross-project use of those IDs, and sets up AddSaveFunction to add mod sections after that using max value enum. Malkierian 2023-05-15 17:21:14 -07:00
4bc0d7d60d v3 >:( Malkierian 2023-05-13 18:41:10 -07:00
b5740bc878 v2 Malkierian 2023-05-13 18:35:27 -07:00
374301db9b Formatting and whitespace cleanup. Malkierian 2023-05-13 18:29:05 -07:00
7861b4c092 Missed baseBlock -> saveBlock change in WiiU/Switch file writing block XD. Malkierian 2023-05-13 12:33:10 -07:00
22531fed27 A little more code clarification. Malkierian 2023-05-13 11:47:22 -07:00
e2177d7392 Added sanity check to clearing sectionBlock["data"] to only be for randomizer and only when the save file is not randomizer (to clear the existing structure from the loaded spoiler log). Malkierian 2023-05-13 11:45:20 -07:00
550c10b1c3 Little bit of code clarification. Malkierian 2023-05-13 11:41:28 -07:00
dbe672444c Changed string paramaters for save functions to proper const pointer type. Malkierian 2023-05-13 11:26:30 -07:00
42b35634a5 Fixed residual values in global save block causing new files to save all sections previously loaded for metadata initialization, regardless of that section's execution during the save process. Malkierian 2023-05-12 15:18:26 -07:00
685925cbb8 Moved sohStats to its own section, and moved the saving and loading to its own registered load and save functions within gameplaystats.cpp. Required making a new loader version for base without sohStats loading code. Malkierian 2023-05-12 13:23:50 -07:00
2ae713464d Moved sohStats to separate section, load and save code now in gameplaystats.cpp. Still needs new load version for base? Malkierian 2023-05-11 12:02:04 -07:00
2a8810d6a5 Merge branch 'HarbourMasters:develop' into sectional-saves Malkierian 2023-05-11 09:56:08 -07:00
7dff8b6efc Spock Bravo -> Develop briaguya 2023-05-11 00:15:37 -04:00
d8891f1fe4 Version Bump (#2867) Christopher Leggett 2023-05-10 21:57:22 -04:00
85385db099 Use OnGameFrameUpdate for rainbow tick instead of relying on ImGui hidden window (#2872) Garrett Cox 2023-05-11 01:48:01 +00:00
d1c930b5e5 reserved thread count (#2868) briaguyaandbriaguya 2023-05-10 21:32:15 -04:00
6d4761f349 Fix several enemy ID's for Hyper Rush (#2871) aMannus 2023-05-11 02:44:40 +02:00
07bfba0162 Preliminary work on persistent save data json block. Malkierian 2023-05-10 14:10:13 -07:00
23d89122b3 CC: No longer rely on received parameter to be 0 (#2870) aMannus 2023-05-10 15:15:33 +02:00
2ea72f835a Cleanup cvars that are set on boot (#2863) Garrett Cox 2023-05-10 13:08:35 +00:00
a72997f12b RANDO: Fix logic with OGC and mixed entrance pools (#2830) Christopher Leggett 2023-05-09 23:41:45 -04:00
c70bdb7700 improve built in extraction detection (#2865) Adam Bird 2023-05-09 23:39:57 -04:00
72358eb4d7 fix for day/night textures (#2853) briaguyaandbriaguya 2023-05-09 23:33:27 -04:00
b887d38f5f bump LUS for thread stuff (#2866) briaguyaandbriaguya 2023-05-09 23:04:02 -04:00
23d40c1ca5 Fixed small error in CC .cs file (#2858) aMannus 2023-05-09 02:58:42 +02:00
caf8f1badc fix own dungeon items not using rando GI item when boss rooms are shuffled (#2859) Adam Bird 2023-05-08 15:44:50 -04:00
77987a42cf Bump LUS (#2855) Kenix3 2023-05-07 23:01:12 -04:00
b166bdd3fc Reverts part of PR #2851 that required OTR regen. (#2856) Christopher Leggett 2023-05-07 22:54:54 -04:00
f5aacaf38b fix build (#2852) briaguyaandbriaguya 2023-05-07 20:48:55 -04:00
fac898d759 Add stdint headers (#1) (#2832) LutzxandChristopher Leggett 2023-05-08 01:23:12 +01:00
91bd693ff6 Bump LUS version (#2849) Kenix3andbriaguya 2023-05-07 20:18:54 -04:00
f31a841789 ZAPD Update (#2851)
louist103 Christopher Leggett briaguya
2023-05-07 19:58:50 -04:00
dd43719a14 Spock -> develop briaguya 2023-05-06 16:38:50 -04:00
778f548b01 Move Game Saving to Separate Thread (#2820) MalkierianandChristopher Leggett 2023-05-05 14:20:34 -07:00
81372c092d CrowdControl 2.0 compatibility & category tweak (#2814) aMannus 2023-05-05 23:18:29 +02:00
79a10c62ef remove tts hotkey for linux and update readme (#2833) Adam Bird 2023-05-05 02:38:54 -04:00
5f0f2731ee udpate mac launch script to set SHIP_HOME (#2831) Adam Bird 2023-05-05 02:34:07 -04:00
f9cfcde627 Lus updates (#2835) Kenix3andChristopher Leggett 2023-05-04 23:56:57 -04:00
1fbec4c69c Merge pull request #2829 from HarbourMasters/develop-spock Christopher Leggett 2023-05-04 08:52:50 -04:00
c3ba15ed57 fix: don't crash when changing margins (#2828) briaguyaandbriaguya 2023-05-04 00:35:56 -04:00
d025ca0d90 TWEAK: Rupee dash duplication (#2815) PurpleHatoandbriaguya 2023-05-04 06:31:52 +02:00
071a2d0418 Merge pull request #2826 from HarbourMasters/develop-spock Christopher Leggett 2023-05-03 23:00:45 -04:00
c02dcb598a fix: properly load textures for debug text (#2775) briaguyaandbriaguya 2023-05-03 22:23:50 -04:00
176650cb3a GCC 13 support (#2780) GaryOderNichts 2023-05-04 03:55:49 +02:00
7d0515c501 fix: properly load custom models on scene transition (#2779)
briaguya Nicholas Estelami briaguya
2023-05-03 21:54:23 -04:00
f81b042843 Tweak: Reset trade item cycling when pausing or changing pages (#2808) Adam Bird 2023-05-03 21:45:41 -04:00
2845a29e28 more mq only texture lookup fixes (#2803) Adam Bird 2023-05-03 21:35:08 -04:00
f27ef0ec3b fix: extractor dialog No selection (#2798) AltoXorg 2023-05-04 09:29:50 +08:00
f9a696e9bd add back missing early break/return for bottle filling (#2817) Adam Bird 2023-05-03 21:26:03 -04:00
c3c97f207f Fix: add header to align soh.otr file assets and fix asset crash for Mac (#2819) Adam Bird 2023-05-03 20:58:41 -04:00
4980ae8dcc Lus updates (#2822) Kenix3andbriaguya 2023-05-03 20:46:26 -04:00
859bf856b8 remove 100 character limit to baseRomPath (#2801) AltoXorg 2023-05-01 07:52:37 +08:00
dac90bb9eb fix mq dungeons crashing by not using mq textures (#2764) Adam Bird 2023-04-27 23:30:14 -04:00
3f896f126f bump version (#2752) briaguya 2023-04-27 20:21:55 -04:00
4166dbf907 spockalicious (#2751) +5
briaguya Rozelette Christopher Leggett Kenix Nicholas Estelami David Chavez briaguya KiritoDv briaguya Ralphie Morell MelonSpeedruns Adam Bird inspectredc Patrick12115 Lywx
2023-04-27 19:20:41 -04:00
2af99dfc3a ci: don't build/ship OTRGui (#2748) briaguya 2023-04-26 22:21:31 -04:00
6d2fd664fb fix: support building for switch on selfhosted runners (#2747) briaguya 2023-04-25 19:28:41 -04:00
000a5d28f3 Add version info and other details to windows exe properties (#2743) Adam Bird 2023-04-25 10:36:35 -04:00
aea46e7cb2 Implement built in Extractor for Windows (#2730)
louist103 briaguya Adam Bird Adam Bird
2023-04-25 00:01:17 -04:00
44d3f1ccbb fix: update xml resolution for FireTempleBigVerticalFlame to match dlist resolution (#2741) briaguya 2023-04-24 14:44:30 -04:00
bd3ee64d81 improve ci compat by not using touch on windows (#2740) briaguya 2023-04-24 01:23:19 -04:00
9be85df4b2 bump lus (#2739) briaguya 2023-04-23 22:29:56 -04:00
d0041d28ea Implement patches for authentic texture overflows (#2737) Adam Bird 2023-04-23 19:42:59 -04:00
5324dfae67 clean up build info on logo screen (#2736) briaguya 2023-04-23 19:13:51 -04:00
25ceca0fbf Enhancement: Aiming reticle for the bow/slingshot (#2715) RaelCappraandbriaguya 2023-04-22 22:59:34 -03:00
c4b90d0bfe chore: add mods dir for windows (#2735) briaguya 2023-04-22 20:06:00 -04:00
512336f858 bump lus (#2733) briaguya 2023-04-22 02:08:30 -04:00
42ff9742ed Tweak: Unique GetItemEntry for Progressive Bombchus with particle effects (#2732) Adam Bird 2023-04-21 19:01:19 -04:00