624 Commits

Author SHA1 Message Date
4ad295d005 Merge commit '9c712cc38ae706b021807b271899bce56c234fa5' 2024-02-11 17:30:45 -06:00
56f9d7a463 Squashed 'deps/nostalgia/' changes from ee051184..4e50889b
4e50889b [ox/model,ox/preloader] Add ability to handle inline arrays

git-subtree-dir: deps/nostalgia
git-subtree-split: 4e50889b5cb05833e644b98140908253ef5f53c1
2024-02-11 17:24:22 -06:00
4c0aa60a52 Merge commit '56f9d7a4634c9de9b09df390c4385c67ab646607' 2024-02-11 17:24:22 -06:00
ace68f7c1d Squashed 'deps/nostalgia/' changes from 59fa3907..ee051184
ee051184 [ox] Add ability for ModelValue to represent inline arrays, add to preloader

git-subtree-dir: deps/nostalgia
git-subtree-split: ee051184786d03fe909da752d5b40e80f690a177
2024-02-04 10:21:12 -06:00
d9be861ec4 Merge commit 'ace68f7c1d870ed53e69c55ba53709a9425388be' 2024-02-04 10:21:12 -06:00
8e0467ca5f Squashed 'deps/nostalgia/' changes from 10a12f2a..59fa3907
59fa3907 [keel] Update pack for Preloader changes
c55994f6 [ox/std] Add Vector::capacity
e81d28a6 [ox] Fix various preloader problems
0626c2a8 [ox/fs] Add comparison operator for FileAddress

git-subtree-dir: deps/nostalgia
git-subtree-split: 59fa39070f0c93be71060afb2584608e90cef84f
2024-02-01 21:07:56 -06:00
4d5f1c0392 Merge commit '8e0467ca5fdb3f983738a97c17cba742a0d233fd' 2024-02-01 21:07:56 -06:00
0d61e5a064 Squashed 'deps/nostalgia/' changes from 28b1c6dc..10a12f2a
10a12f2a [nostalgia/core] Add getTileCnt to header
2667be88 [nostalgia/core] Add largestPage function for Palette
5972d8ac [nostalgia/core] Fix TileSetEntry model
9c026e1a [nostalgia/core/studio] Add function to remove unused data from TileSheets
1dff26d8 [nostalgia/core] Add getTileCnt and fix getTileIdx
ff2eb5b1 [olympic/keel] Remove const r-value funcion from AssetRef

git-subtree-dir: deps/nostalgia
git-subtree-split: 10a12f2ab20199df580da5bd7d8d22bae0a58cf0
2024-01-31 23:18:13 -06:00
d588d822af Merge commit '0d61e5a064382a7076b62d32b25c70298ee0706e' 2024-01-31 23:18:13 -06:00
0572723474 Squashed 'deps/nostalgia/' changes from b75bbc4d..28b1c6dc
28b1c6dc [ox/preloader] Fix case where alignOf always used NativePlatSpec
ef9cb8be [olympic/modlib] Add ListBox to ImGui util
0d106bde [ox/oc] Fix objects to always write when members of arrays

git-subtree-dir: deps/nostalgia
git-subtree-split: 28b1c6dcf4b2d7d1e3c50850f5886ab8d85c9c96
2024-01-31 23:13:34 -06:00
d75dead89d Merge commit '057272347486efe5046691f32f51604e3a594e6a' 2024-01-31 23:13:34 -06:00
cfc27a384b Squashed 'deps/nostalgia/' changes from f128664a..b75bbc4d
b75bbc4d [olympic,nostalgia] Change order of oxModelFieldRename args
227dd68a [ox/model] Change order of oxModelFieldRename args
02db760b [olympic] Add more ImGui helpers, studio::Editor::pushCommand
09c57545 [ox/std] Add Vector::at

git-subtree-dir: deps/nostalgia
git-subtree-split: b75bbc4d200c0f4187f5c4068ba686dad34820cd
2024-01-28 18:05:09 -06:00
bc7bbb57c8 Merge commit 'cfc27a384b00388fc1ce30ac47c266ddd1f8e6f1' 2024-01-28 18:05:09 -06:00
5896e43a61 [jasper/project] Update type descriptors 2024-01-28 12:07:22 -06:00
e733bc930f [jasper/world] Double the dimensions of collision tiles 2024-01-28 12:05:46 -06:00
aa1f063a6d [jasper/world] Add WorldObjectEditor
All checks were successful
Build / build (push) Successful in 2m44s
2024-01-28 00:00:22 -06:00
db978290f3 Squashed 'deps/nostalgia/' changes from 124c7029..f128664a
f128664a [olympic/studio] Add ig::IndentStackItem
e84df780 [glutils] Add ProgramSource::vboLen
caa59f37 [nostalgia/core] Add functions for mapping tile idx to subsheet
1cf09433 [nostalgia/core/studio] Cleanup TileSheetEditor with new GlUtils helpers
9948346c [ox/model] Fix clangd false alarm
aa8200be [glutils] Add helper functions for setting up shaders

git-subtree-dir: deps/nostalgia
git-subtree-split: f128664a81b817aaf066de02cc3a09650958ace9
2024-01-27 23:55:20 -06:00
ec099aa386 Merge commit 'db978290f3465d2da30a27a98b12face50bbe091' 2024-01-27 23:55:20 -06:00
ae1f8ce11a Squashed 'deps/nostalgia/' changes from 5d1f680a..124c7029
124c7029 [olympic/studio] Change Studio modules to pass StudioContext instead of turbine::Context

git-subtree-dir: deps/nostalgia
git-subtree-split: 124c7029bda328e9ddc208b00e53a2e6452f2ede
2024-01-20 15:41:04 -06:00
9f50acc411 Merge commit 'ae1f8ce11a81624f376be3a3dd56e80ba479dd89' 2024-01-20 15:41:04 -06:00
6640e00ad9 Squashed 'deps/nostalgia/' changes from c2e34b64..5d1f680a
5d1f680a [nostalgia/core] Cleanup TileSheetEditor with new ImGui util functions

git-subtree-dir: deps/nostalgia
git-subtree-split: 5d1f680a513788d9cedac5b711d68eb085d780a6
2024-01-20 15:02:16 -06:00
e9add7d68a Merge commit '6640e00ad9ee5b731a2ddb06da31436463c3ae65' 2024-01-20 15:02:16 -06:00
2abbc258a5 Squashed 'deps/nostalgia/' changes from 5848bc8e..c2e34b64
c2e34b64 Merge commit 'a9128caf4ddd187f14496b84242dfe07ee9a6467'
173d3f4b [olympic/studio] Add PushButton, PopupBtns, ComboBox, and IDStackItem to ImGui utils
8a29c095 [olympic/studio] Fix imguiutil.hpp name, add StudioContext::tctx

git-subtree-dir: deps/nostalgia
git-subtree-split: c2e34b64568172a12d25ca4b54796d2d4a56a652
2024-01-20 15:00:40 -06:00
ca4d4c26e3 Merge commit '2abbc258a55c77250c398481515beb16b957784c' 2024-01-20 15:00:40 -06:00
c06fc277e8 [ox/fs] Add FileAddress::operator==(FileAddress) 2024-01-19 20:22:52 -06:00
a9128caf4d Squashed 'deps/nostalgia/' changes from e3675759..5848bc8e
5848bc8e [nostalgia/core/studio] Change Subsheet Editor button position
7ba66787 [nostalgia/core/studio] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: 5848bc8eb7917de8a4a504426404e2f9f5e08aa9
2024-01-19 01:09:23 -06:00
a9c6adb8d2 Merge commit 'a9128caf4ddd187f14496b84242dfe07ee9a6467' 2024-01-19 01:09:23 -06:00
563d86fabc [olympic/studio] Add PushButton, PopupBtns, ComboBox, and IDStackItem to ImGui utils 2024-01-19 01:09:10 -06:00
2ab3fd016f [olympic/studio] Fix imguiutil.hpp name, add StudioContext::tctx 2024-01-19 00:15:28 -06:00
5649e72126 Squashed 'deps/nostalgia/' changes from 5433fd9b..e3675759
e3675759 [olympic/studio] Fix NewMenu not to overwrite existing files or create a file without name
2bc2003c [nostalgia/core/studio] Add key shortcuts for switching Palette pages
b31062e6 [nostalgia] Update liccor file
e4285bd4 [nostalgia/studio] Tweak background color of TileSheet editor
a76638cc [olympic/studio] Make Project::romFS return a reference

git-subtree-dir: deps/nostalgia
git-subtree-split: e367575974a65633d4ad1e1335b2f24d8d0c2649
2024-01-18 00:30:54 -06:00
16b290b9e5 Merge commit '5649e72126d23e422a8eae29a0a2a2f7c8597f7d' 2024-01-18 00:30:54 -06:00
6a10c6ffb9 Squashed 'deps/nostalgia/' changes from b46cb65b..5433fd9b
5433fd9b [nostalgia/core] Add new version of Palette with pages

git-subtree-dir: deps/nostalgia
git-subtree-split: 5433fd9b1dd9238260be0a37317610c467fd0206
2024-01-17 01:40:45 -06:00
14dc8fe295 Merge commit '6a10c6ffb97306c5514e1f9ad9b3426c75008182' 2024-01-17 01:40:45 -06:00
ab89463b0f Squashed 'deps/nostalgia/' changes from 89fab5cc..b46cb65b
b46cb65b [nostalgia/studio] Add version
877349df [nostalgia/core/studio] Increase max tilesheet export size, fix input handling when popups open
5418c062 [olympic] Change olympic::s_version to olympic::appVersion
dd9c1100 [glutils] Update copyright for 2024
db82aee7 [teagba] Update copyright for 2024
edf15858 [teagba] Update copyright for 2024
d1efbb2f [ox] Update copyright for 2024
051623f4 [olympic,nostalgia] Update copyright for 2024
055d64b1 [olympic] Add support for an AppLib app specific version
de9f8426 [ox/std] Add error.hpp include to memory.hpp
200e5867 Add .idea to .gitignore
f1609519 [olympic] Cleanup
e452d9db [nostalgia] Add python3-mypy to Debian deps
43a87b60 [nostalgia] Ensure pkg-gba reads .current_build without a new line
8acc6244 [olympic/keel] Improve error clarity on pack some common failures
bd2aeee2 [ox/claw] Improve error clarity when loading ModelObjects

git-subtree-dir: deps/nostalgia
git-subtree-split: b46cb65b7f5b1ea17c115fcb31a6baff323ea1a3
2024-01-05 22:12:08 -06:00
107e3dd32b Merge commit 'ab89463b0f88f3f2191cf3f85e0e18bea39e9d36' 2024-01-05 22:12:08 -06:00
2da5a6f024 [jasper] Update copyright notice 2024-01-01 16:11:34 -06:00
9b8fdcc970 [nostalgia] Ensure pkg-gba reads .current_build without a new line 2023-12-30 13:59:10 -06:00
3a1b75c9ee [olympic/keel] Improve error clarity on pack some common failures 2023-12-30 13:58:42 -06:00
a59a2236fb [ox/claw] Improve error clarity when loading ModelObjects 2023-12-30 13:57:51 -06:00
d9cb493cf9 Squashed 'deps/nostalgia/' changes from 7c824e91..89fab5cc
89fab5cc [ox/fs] Remove stdc++fs from library list on Linux
1c06ea67 [nostalgia] Add links to Tonc and GBATEK to developer-handbook
6b948ee0 Merge commit '932c3e57e93d63dc98c454015afea941416ff423'
72dddcae [ox] Fix TypeDescWriter segfault

git-subtree-dir: deps/nostalgia
git-subtree-split: 89fab5cc208729a9ef6564d6b4172a0c9e0cd3bb
2023-12-30 13:56:23 -06:00
8c0a37eb44 Merge commit 'd9cb493cf9ca88ac77364b3a3c3ca1e86932841c' 2023-12-30 13:56:23 -06:00
6ded93f51b [jasper/project] Add missing and remove old type descriptors
All checks were successful
Build / build (push) Successful in 2m21s
2023-12-29 19:38:41 -06:00
932c3e57e9 Squashed 'deps/nostalgia/' changes from a0c81463..7c824e91
7c824e91 [nostalgia] Remove Jenkinsfiles

git-subtree-dir: deps/nostalgia
git-subtree-split: 7c824e910c61383b3124cd563c4b08f7717eaec3
2023-12-29 18:44:06 -06:00
080b5ba132 Merge commit '932c3e57e93d63dc98c454015afea941416ff423' 2023-12-29 18:44:06 -06:00
b95fc11ddb [ox] Fix TypeDescWriter segfault 2023-12-29 18:42:59 -06:00
b859a339a6 [jasper] Remove Jenkinsfiles
All checks were successful
Build / build (push) Successful in 2m35s
2023-12-29 02:28:02 -06:00
536e4540cb [jasper] Fix build
All checks were successful
Build / build (push) Successful in 2m19s
2023-12-29 00:39:57 -06:00
9caa925f20 Squashed 'deps/nostalgia/' changes from e7a66390..a0c81463
a0c81463 [nostalgia/core/studio] East const some function args
d5b232f5 [olympic/studio] Fix array bounds issue
c79fe3be [buildcore] Make CMake configure failure trigger failed return code
1df4e780 [olympic/studio] Add new project menu, make file creation open file
ffbdb09c [olympic/turbine/glfw] Add shift key support
b35a956e [olympic/studio] Cleanup unused expression
d3847caa [olympic/studio] Make Project::writeObj only write descriptor if it does not already exist or if debug build
ae066a91 [olympic/studio] Fix Project::writeObj to ensure parent directory of file exists
67543af8 [ox/oc] Remove some unnecessary code
6b774ec2 [ox/oc] Fix array writing to write all values
4b9758f4 [nostalgia/core] Move most TileSheet member functions out of class
bf12b15f [nostalgia/sample_project] Update some tilesheets to version 4 format
a7328eb5 [nostalgia/core/studio] Reduce indent for Subsheet editor
b52124a0 [nostalgia/core/studio] Revert new subsheet index increment to happen after index assignment
eae9972f [nostalgia/sample_project] Add missing type descriptors
d83e3929 [nostalgia/core] Cleanup, revert CompactTileSheet version to 1
e2d0a784 [olympic/keel] Cleanup
f0882142 [nostalgia/core/studio] Change TileSheets to back to MC
6a2954f8 [nostalgia/core] Remove id from TileSheetV3::Subsheet, add TileSheetV4
9c19655c [nostalgia/core] Fix build, add SubSheet ID to SubSheet Editor view
087c834b [nostalgia/core/studio] Fix Add SubSheet to increment idIt before using it
79bdbf2e [nostalgia/core] Add id to TileSheetV3::SubSheet model
2bdc3def [nostalgia/core/opengl] Implement flip X and flip Y for BG tiles

git-subtree-dir: deps/nostalgia
git-subtree-split: a0c8146396a9e9c0dc48a2564f4e9870a212ed59
2023-12-29 00:37:47 -06:00
9f51ca6e04 Merge commit '9caa925f20058a4f586b28fabbcbdff04e9b9016' 2023-12-29 00:37:47 -06:00
fd990b18b3 [jasper/world] Fix build for Nostalgia update
All checks were successful
Build / build (push) Successful in 2m24s
2023-12-26 12:17:19 -06:00