Commit Graph

689 Commits

Author SHA1 Message Date
6a0f57994c Merge commit '6b0a56d5d66032c4d150c76c2b6a537930a5c5fa'
All checks were successful
Build / build (push) Successful in 1m31s
2025-08-01 02:53:02 -05:00
6b0a56d5d6 Squashed 'deps/nostalgia/' changes from e38b85b4..31b39982
31b39982 [keel] Fix AssetRef to call incRef on initial creation of ref, not just copy
5476417b [nostalgia] Add release notes for d2025.07.0
e03be694 Merge commit 'b67b95767b7bfcd5f618ebc8e14ddbc83edcbe36'
490c0368 [nostalgia/gfx] Add lists for file extensions
a24fc407 [ox/std] Fix MSVC build

git-subtree-dir: deps/nostalgia
git-subtree-split: 31b39982c5ead87da1727bc1f561b945e4d1e5fb
2025-08-01 02:53:02 -05:00
3aac345637 Merge commit 'b67b95767b7bfcd5f618ebc8e14ddbc83edcbe36'
All checks were successful
Build / build (push) Successful in 1m30s
2025-07-31 00:41:06 -05:00
b67b95767b Squashed 'deps/nostalgia/' changes from f7c3c02c..e38b85b4
e38b85b4 [studio] Eliminate redundant serialization and deserialization

git-subtree-dir: deps/nostalgia
git-subtree-split: e38b85b4f4134af04b9b71caddcd2268f425f5df
2025-07-31 00:41:06 -05:00
8aea7c2ecf [nostalgia/gfx] Add lists for file extensions
All checks were successful
Build / build (push) Successful in 1m31s
2025-07-31 00:39:55 -05:00
e9a7fb1ec8 [ox/std] Fix MSVC build
Some checks failed
Build / build (push) Has been cancelled
2025-07-31 00:38:26 -05:00
375388c0f1 Squashed 'deps/nostalgia/' changes from e27eee50..f7c3c02c
f7c3c02c Merge commit '1bfb7f99c215e2c74556bd3281f44962b8faaa96'
8f0f1fea [nostalgia/gfx/studio] Make editors use Project::loadObj for their primary assets
2f36a3f6 [studio] Add File -> Reload Project menu item
07e5bf90 [keel] Make keel attempt to delete all existing assets when FS is changed
aacff3da [ox/std] Fix UPtr::reset to conform to unique_ptr::reset

git-subtree-dir: deps/nostalgia
git-subtree-split: f7c3c02c4cbe676ea116ea53f1f31b27f668cd98
2025-07-30 01:51:46 -05:00
084baa6005 Merge commit '375388c0f16a0de1b16575578ad49e8318a1c80f'
All checks were successful
Build / build (push) Successful in 1m31s
2025-07-30 01:51:46 -05:00
b1f912445d Merge commit '1bfb7f99c215e2c74556bd3281f44962b8faaa96'
All checks were successful
Build / build (push) Successful in 1m29s
2025-07-30 00:42:42 -05:00
1bfb7f99c2 Squashed 'deps/nostalgia/' changes from c7bc2a95..e27eee50
e27eee50 [teagba] Add set and scroll background offset functions
fd610454 [nostalgia/gfx] Fix compiler warning
e61d4647 [nostalgia/gfx] Fix BG tilesheet loading, add background offset functions
c275c5f5 [hull] Disable building hull for now
fbf49ba5 [ox/std] Add pre- and post-increment operators to Span
92f74b27 [ox/std] Add null check for deallocating in consteval context Vector
934f0c92 [ox/std] Add beginsWith and endsWith variants that that cingle chars
ee9a3e11 [ox/std] Cleanup
16886cdf [hull] Add start on command interpreter
08b9508d [ox/std] Give std::ignore a named type
69bd968f [nostalgia/player] Fix build
4e7dc666 [nostalgia,olympic] Rename string len() functions to size()
bea0cf5a [ox/std] Rename string len() functions to size()

git-subtree-dir: deps/nostalgia
git-subtree-split: e27eee50f05bb437710313430e0d9cef636a66b1
2025-07-30 00:40:03 -05:00
10db939d62 [nostalgia/gfx/studio] Make editors use Project::loadObj for their primary assets 2025-07-30 00:37:59 -05:00
553797fdbd [studio] Add File -> Reload Project menu item 2025-07-30 00:37:23 -05:00
fb0cd99d8c [keel] Make keel attempt to delete all existing assets when FS is changed 2025-07-30 00:36:56 -05:00
a372814e3c [ox/std] Fix UPtr::reset to conform to unique_ptr::reset 2025-07-30 00:29:34 -05:00
ceea6c7b27 [nostalgia/player] Fix build
All checks were successful
Build / build (push) Successful in 1m40s
2025-07-25 22:54:43 -05:00
7f6e734026 [jasper/world/studio] Cleanup
Some checks failed
Build / build (push) Failing after 22s
2025-07-25 22:51:14 -05:00
2863874ae0 [jasper/project] Fill out more facets of player assets 2025-07-25 22:51:02 -05:00
d0277a43fc [jasper/world/studio] Rename string len() functions to size() 2025-07-25 22:49:35 -05:00
aa875e9be2 [nostalgia,olympic] Rename string len() functions to size() 2025-07-25 22:48:08 -05:00
b126a3a859 [ox/std] Rename string len() functions to size() 2025-07-25 22:47:56 -05:00
90613184e0 [jasper] Add make loc command 2025-07-25 22:45:14 -05:00
8a74e044dc Squashed 'deps/nostalgia/' changes from fae1e73e..c7bc2a95
c7bc2a95 [nostalgia/gfx] Style update
7372036a [nostalgia/gfx] Add function missing from header
7461d832 [nostalgia/gfx/studio,studio] Fix CLI tool output to only show usage if no args given
6052798f Merge commit 'dceeaaa9302b7e9ce85fa773fc187bc593f3c93c'
801d35c8 [keel] Make type converters work with functions that take const src arg

git-subtree-dir: deps/nostalgia
git-subtree-split: c7bc2a954fdf435127fb09896f32c5cb23c99f02
2025-07-25 00:32:02 -05:00
f1d4c20c88 Merge commit '8a74e044dc5fa44ba10dbbf7d2812c7070ff4f7c'
All checks were successful
Build / build (push) Successful in 1m30s
2025-07-25 00:32:02 -05:00
6a7226ae68 [jasper/world/studio] Fix build
All checks were successful
Build / build (push) Successful in 1m33s
2025-07-24 02:02:46 -05:00
dceeaaa930 Squashed 'deps/nostalgia/' changes from 671b8eda..fae1e73e
fae1e73e [nostalgia/gfx] Make getSubSheet check root subsheet name
51f2905c [nostalgia/gfx/studio] Make TileSheetEditor use export-tilesheet functions for export, fix exporting Root subsheet
0c866d1b [studio,nostalgia/gfx] Add system for adding sub-commands in Modules, add export-tilesheet command
fdf39d1a [ox/std] Add Result::transformError
a523a75e [ox/std] Add missing include to StringParam
cdaa64ed [ox/clargs] Fix arg parsing for first '-'
37b5fcc0 [teagba] Put parentheses around all registers
f5f2c3be [studio/applib] Make Studio remove files unable to be opened from open file list in config
f6ef2b5a [turbine,nostalgia] Make memory regions cast to bounded ox::Arrays
bf958a4a [teagba] Make memory regions cast to bounded ox::Arrays
6a70e478 [nostalgia/gfx] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: fae1e73e54a420d4b93af67e03144d5442825a11
2025-07-24 01:58:27 -05:00
86860cf27b Merge commit 'dceeaaa9302b7e9ce85fa773fc187bc593f3c93c' 2025-07-24 01:58:27 -05:00
6f80f634b0 [jasper/world/keel] Make convertWorldDocToWorldStatic take a const src
All checks were successful
Build / build (push) Successful in 1m30s
2025-07-23 00:42:41 -05:00
99ee44b838 [keel] Make type converters work with functions that take const src arg 2025-07-23 00:41:33 -05:00
be7dd92971 Merge commit 'b0726568df6aaa37390906ca44ff1eee11735f98'
All checks were successful
Build / build (push) Successful in 1m34s
2025-06-29 17:34:57 -05:00
b0726568df Squashed 'deps/nostalgia/' changes from f847289b..671b8eda
671b8eda [ox/std] Make StringLiteral constructors consteval
952637a1 Merge commit 'cbf4414fcaf00c00a2abf73b5c04a055180ad980'
7569698e [nostalgia,studio] Add FileExts_TileSheet const, and corresponding FilePickerPopup constructor
21713ba9 [ox/std] Fix StringLiteral::operator= to work with DevkitARM
73273b6f [nostalgia/gfx] Add isTileSheet function for checking paths against both file extensions
9f040392 [olympic,nostalgia] Cleanup style
f4f7e5d0 Merge commit '9b5f7886cadc5c3dc826d00fa5b2e71696151dfd'
c27726a4 Merge commit '6bbcae10cc7b21b73171ec0ff196f4baf6304404'
bd24a775 Merge commit '7371df429534f264c179684412f6197f7968ebfa'
4419dff2 Merge commit '7688c05bac8c20bc267cae62ec78d55e5d0c493b'
536999c0 Merge commit '47eee1d56d591e3631d16e95a78ea3629ee312ee'
a5535ef5 Merge commit '08236fc790e711afe886b6ef545511d35e4e5c6c'
a90380f3 Merge commit 'e90dd887477452922f783535edb3d4c55e9a0d2c'
2000b2de [nostalgia/gfx/studio] Cleanup
7d92400f [nostalgia/gfx/studio] Add type specific navigateTo functions

git-subtree-dir: deps/nostalgia
git-subtree-split: 671b8edaadefe1872fb8954ad13d221b24f676c0
2025-06-29 17:33:27 -05:00
d98d78890a [jasper/world] Fix WorldObjectSetEditor to handle .ng and .nts file extensions
All checks were successful
Build / build (push) Successful in 1m45s
2025-06-25 21:32:23 -05:00
43efcbf59f [nostalgia,studio] Add FileExts_TileSheet const, and corresponding FilePickerPopup constructor 2025-06-25 21:30:49 -05:00
07e223937b [ox/std] Fix StringLiteral::operator= to work with DevkitARM 2025-06-25 21:29:41 -05:00
f1ad8567f3 [nostalgia/gfx] Add isTileSheet function for checking paths against both file extensions 2025-06-25 21:03:45 -05:00
9b5f7886ca Squashed 'deps/nostalgia/' changes from 37cfa927..f847289b
f847289b [glutils] Cleanup
94b0020d [nostalgia,olympic] Cleanup
c54c0bad [teagba] Cleanup
b9ffae02 [nostalgia/gfx] Cleanup
003f3e01 [nostalgia] Update release notes
9028e74a [nostalgia/gfx/studio/tilesheet] Disable paste when nothing is selected
f5ccab5f [studio] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: f847289bd493e3318eb6fc1d09ea216e140899aa
2025-06-23 20:49:01 -05:00
2c8a8a4e9f Merge commit '9b5f7886cadc5c3dc826d00fa5b2e71696151dfd' 2025-06-23 20:49:01 -05:00
6bbcae10cc Squashed 'deps/nostalgia/' changes from 857587c1..37cfa927
37cfa927 [nostalgia/gfx] Address a couple of implicit conversions
0efed70b [studio] Fix Studio to clear editor pointers when opening a new project
baf5fa31 [nostalgia] Move d2025.05.2 release notes to d2025.06.0

git-subtree-dir: deps/nostalgia
git-subtree-split: 37cfa927d1d63390d91a6c4b98021023552dd980
2025-06-21 14:29:47 -05:00
d4201a7183 Merge commit '6bbcae10cc7b21b73171ec0ff196f4baf6304404' 2025-06-21 14:29:47 -05:00
7371df4295 Squashed 'deps/nostalgia/' changes from e78c4050..857587c1
857587c1 [studio] Cleanup
eb3d53c9 [studio] Cleanup
14d58f3f [studio] Fix Navigation shortcuts for non-Mac systems
5f239790 [studio,nostalgia/gfx/studio/tilesheet] Fix copy/cut/paste enablement when there is no selection
58e0ecb4 [studio] Make FilePickerPopup accept on double click of a file
8838bf42 [studio] Fix to properly copy file that has the same name as deleted file
bddc544d [nostalgia] Update release notes
a9437191 [studio,turbine] Add support for mouse back/forward buttons
9d8da7cc [ox/std] Make strToInt return error for empty string
394b568e [studio] Add Back/Forward navigation
78e9f70d [nostalgia] Update release notes
12e5623f [ox/logconn] Add exception handling for logger thread
cfdfb0a8 [studio] Fix file deletion to close file even if not active
56e66530 [studio] Cleanup
7415ce4b [nostalgia/gfx/studio] Cleanup
05f42150 [olympic] Add new loc command to Makefile
8ea2bc69 [nostalgia] Update release notes
c7809241 [studio] Add [DEBUG] tag to About in debug builds
8c538560 [nostalgia/gfx/studio/palette] Make RGB key shortcuts work when color channel inputs are focused
c3e75bdb [nostalgia/gfx/studio/tilesheet] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: 857587c18b4695eacd31457e3c30b4971b4e46e8
2025-06-21 08:48:13 -05:00
ba524fc733 Merge commit '7371df429534f264c179684412f6197f7968ebfa'
All checks were successful
Build / build (push) Successful in 1m32s
2025-06-21 08:48:13 -05:00
9b57d61ed0 [jasper/world] Update coding style
All checks were successful
Build / build (push) Successful in 1m47s
2025-06-19 21:25:05 -05:00
7688c05bac Squashed 'deps/nostalgia/' changes from e1cfcc8b..e78c4050
e78c4050 [nostalgia/gfx] Cleanup
6b7c5d89 [nostalgia] Update release notes
a33a73d7 [nostalgia/gfx/studio/palette] Add preview to color editor

git-subtree-dir: deps/nostalgia
git-subtree-split: e78c4050462c2ae4fa4347af7f1236763d2b8f8f
2025-05-31 02:14:15 -05:00
a32a0a067a Merge commit '7688c05bac8c20bc267cae62ec78d55e5d0c493b' 2025-05-31 02:14:15 -05:00
8173c95fc5 [jasper/world/studio] Simplify Person template
All checks were successful
Build / build (push) Successful in 1m28s
2025-05-31 00:51:30 -05:00
e5eafba951 [jasper/project] Flesh out side view of player 2025-05-31 00:51:21 -05:00
47eee1d56d Squashed 'deps/nostalgia/' changes from 8419b137..e1cfcc8b
e1cfcc8b [nostalgia] Update release notes
514cb978 [nostalgia/gfx/studio/tilesheet] Fix draw command to work on same pixel after switching subsheets
4b5218c4 [nostalgia/gfx] Cleanup
2ca77173 [keel] Add isUuidUrl function
cce5f52f [nostalgia/gfx/studio/tilesheet] Fix manual redo of draw actions, fix drawing to pixel 0, 0 as first action
b5599329 [studio/modlib] Fix headerizeConfigFile to handle slashes in file name
d8f847d7 [studio/applib] Move popup types into their own directory

git-subtree-dir: deps/nostalgia
git-subtree-split: e1cfcc8b5fec39173fe9608099cae29a441ddb51
2025-05-30 23:38:53 -05:00
b6f1bdbbcd Merge commit '47eee1d56d591e3631d16e95a78ea3629ee312ee'
All checks were successful
Build / build (push) Successful in 1m28s
2025-05-30 23:38:53 -05:00
b27ec952f0 [jasper/project] Exclude project files from autocrlf
All checks were successful
Build / build (push) Successful in 1m29s
2025-05-24 01:52:20 -05:00
992d6c2291 [jasper/world/studio] Headerize config file
All checks were successful
Build / build (push) Successful in 1m29s
2025-05-24 01:49:00 -05:00
7ed540a583 [jasper/world/studio] Update for turbine change
All checks were successful
Build / build (push) Successful in 1m33s
2025-05-24 01:45:20 -05:00