bc6333aedf
Merge commit 'cf0d078a1e13fc9a3f0e290126e738976744c715'
2023-12-26 12:15:45 -06:00
b7278c3d04
Squashed 'deps/nostalgia/' changes from c90a8449..050339ba
...
050339ba [nostalgia] Update developer-handbook
45ec39f7 [ox/std] Add Result::orVal
319fbb26 [nostalgia] Add .lldbinit
f43d97a1 [nostalgia] Add missing type descriptors
a0974637 [nostalgia] Add missing test tilesheets
git-subtree-dir: deps/nostalgia
git-subtree-split: 050339ba09966cb9fa04747ee7bad3258bd42e55
2023-12-23 19:12:16 -06:00
d40d017757
Merge commit 'b7278c3d04920a4fe55abd8d7ad0727f6ecde21a'
2023-12-23 19:12:16 -06:00
2036ec55cb
Squashed 'deps/nostalgia/' changes from 5b167fd5..c90a8449
...
c90a8449 [olympic/turbine] Fix some broken CMake vars
95dcd6be [teagba] Fix not to rely on TURBINE_BUILD_TYPE
git-subtree-dir: deps/nostalgia
git-subtree-split: c90a8449be5f49268748a7ae7ebfa86c83d51001
2023-12-23 15:31:11 -06:00
6e13f1c089
Merge commit '2036ec55cb40bb5067eacd40d7e137142cb80a30'
2023-12-23 15:31:11 -06:00
f1b60ef29c
Squashed 'deps/nostalgia/' changes from 9cb6bd4a..5b167fd5
...
5b167fd5 [nfde] Bump minimum CMake for NFDE to silence CMake warning
a701a241 [imgui] Add target_include_directories for ImGui
9907bb8f [nostalgia] Allow building Studio mods without Studio app
git-subtree-dir: deps/nostalgia
git-subtree-split: 5b167fd53bd513a3a071b81fcc3b74b011d48e31
2023-12-23 15:03:19 -06:00
2a9e07fecf
Merge commit 'f1b60ef29c73953025f28aa2bd0df2720a9aeecc'
2023-12-23 15:03:19 -06:00
77e2c3f6a2
[imgui] Add target_include_directories for ImGui
2023-12-23 14:35:12 -06:00
7323a5ce9f
[nostalgia] Allow building Studio mods without Studio app
2023-12-23 14:34:32 -06:00
587dd92414
Squashed 'deps/nostalgia/' content from commit 9cb6bd4a
...
git-subtree-dir: deps/nostalgia
git-subtree-split: 9cb6bd4a32e9f39a858f72443ff5c6d40489fe22
2023-12-23 14:17:05 -06:00
05ee5d874d
Merge commit '587dd924142c959b812ca340eab52af35ac4096c' as 'deps/nostalgia'
2023-12-23 14:17:05 -06:00
