9f51ca6e04
Merge commit '9caa925f20058a4f586b28fabbcbdff04e9b9016'
2023-12-29 00:37:47 -06:00
fd990b18b3
[jasper/world] Fix build for Nostalgia update
Build / build (push) Successful in 2m24s
2023-12-26 12:17:19 -06:00
cf0d078a1e
Squashed 'deps/nostalgia/' changes from 050339ba..e7a66390
...
e7a66390 [nostalgia/core/opengl] Fix duplicate and missing symbol
ffdc0ddb [nostalgia/core] Add support for specifying palette banks
e941781f [ox/std] Cleanup Result::copyTo variants
b869f490 [ox/std] Add or_value to Optional, Result
caf8d93c [nostalgia] Delete .gitlab-ci.yml
afbf2caf [nostalgia] Remove conan from devenv
20914eaa [nostalgia] Add Gitea action file
c5f76ff5 [nostalgia/core] Add setBgBpp function
git-subtree-dir: deps/nostalgia
git-subtree-split: e7a663901a4db72b647263c9de2ec4a45dd2e5e5
2023-12-26 12:15:45 -06:00
bc6333aedf
Merge commit 'cf0d078a1e13fc9a3f0e290126e738976744c715'
2023-12-26 12:15:45 -06:00
fa3ab5fca3
[jasper] Remove .gitlab-ci.yml
Build / build (push) Successful in 2m23s
2023-12-24 21:45:19 -06:00
d315b70118
[jasper] Add Gitea workflow
Build / build (push) Successful in 2m16s
2023-12-24 02:48:50 -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
a991133224
[jasper] Reorder developer-handbook
2023-12-23 17:44:48 -06:00
17cccf4a1e
[jasper] Update Nostalgia developer-handbook.md reference to copy in repo
2023-12-23 17:34:45 -06:00
54fe3ac63e
[jasper] Fix GBA build
2023-12-23 16:56:54 -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
cba69a4875
[jasper] Fix GBA build
2023-12-23 15:12:53 -06:00
95c099d6ac
[jasper] Fix pull for Nostalgia
2023-12-23 15:06:02 -06:00
82bd92fe78
Update liccor file
2023-12-23 15:05:38 -06:00
c041532a7a
[jasper] Enable Nostalgia Studio modules build
2023-12-23 15:05:18 -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
24be3b58db
[jasper] Add Makefile commands for managing nostalgia subtree
2023-12-23 14:55:21 -06:00
2c5dfe35c9
Update liccor file for new project
2023-12-23 14:41:39 -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
624498de7d
Initial commit
2023-12-23 14:16:05 -06:00
