be7dd92971
Merge commit 'b0726568df6aaa37390906ca44ff1eee11735f98'
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
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
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'
Build / build (push) Successful in 1m32s
2025-06-21 08:48:13 -05:00
a32a0a067a
Merge commit '7688c05bac8c20bc267cae62ec78d55e5d0c493b'
2025-05-31 02:14:15 -05:00
b6f1bdbbcd
Merge commit '47eee1d56d591e3631d16e95a78ea3629ee312ee'
Build / build (push) Successful in 1m28s
2025-05-30 23:38:53 -05:00
08236fc790
Squashed 'deps/nostalgia/' changes from 312097a7..8419b137
...
8419b137 [turbine,studio] Fix some popup window resize weirdness, cleanup some function names
ed1160ec [nostalgia] Update release notes
1e217780 [nostalgia/gfx/studio/tilesheet] Ensure config file has a Claw header
78379f58 [studio] Add ability to remember recent projects in config
4322f720 [keel] Fix ox::Result<DstType> convert(Context &ctx, ox::BufferView const&src)
26f1a605 [ox/std] Make Vector::remove take a MaybeView_t
c4c1d477 [keel] Cleanup ox::Error(0) instance
fab012d3 [ox] Cleanup all ox::Error(0) instances
git-subtree-dir: deps/nostalgia
git-subtree-split: 8419b137e5dec1dabc15a0d34c7ce729970c3b7f
2025-05-24 01:44:07 -05:00
50dbf02ad9
Merge commit '08236fc790e711afe886b6ef545511d35e4e5c6c'
2025-05-24 01:44:07 -05:00
e90dd88747
Squashed 'deps/nostalgia/' changes from cb304ecf..312097a7
...
312097a7 [ox/std] Fix implementation of std cmp functions
a40198ab [nostalgia] Update release-d2025.05.2 release notes
52d8c0bd [nostalgia/gfx] Replace static_cast compare with std::cmp_equal
c19d7f4e [nostalgia] Add .vs and cmake-build-* to .gitignore
159b7e7e [buildcore] Make pybb cmake_build specify --config debug/release
c93eec4f [teagba] Make cstart.cpp only compile if GCC
e7e7a223 [nostalgia/sample_project] Make sample_project exempt from autocrlf
26d5048e [ox/fs] Fix new build error in MSVC (VS 17.14)
3b8f97cc [nostalgia/gfx] Cleanup
f1e68e0a [nostalgia/gfx/studio/tilesheet] Fix overrun errors when switching subsheets, clear selection on switch
d6e4ab7a [keel] Cleanup
git-subtree-dir: deps/nostalgia
git-subtree-split: 312097a7991194ce36e7c2e357e7e3a51d916767
2025-05-23 03:23:17 -05:00
2d9f39000f
Merge commit 'e90dd887477452922f783535edb3d4c55e9a0d2c'
2025-05-23 03:23:17 -05:00
935ddb87fd
[nostalgia/gfx/studio] Cleanup
Build / build (push) Successful in 1m29s
2025-05-17 23:35:10 -05:00
ebef57a28b
[nostalgia/gfx/studio] Add type specific navigateTo functions
Build / build (push) Has been cancelled
2025-05-17 23:26:23 -05:00
a4a00c99d0
Squashed 'deps/nostalgia/' changes from 3ccadba2..cb304ecf
...
cb304ecf [applib] Cleanup
ea173777 [ox/std] Make StringViewCR honest
c424bde0 [nostalgia] Style cleanup
ee7d5c6d [nostalgia/gfx] Cleanup
99247cee [nostalgia/gfx/test] Cleanup
7b8ddc18 [nostalgia/gfx] Consolidate implementations into single files, remove unnecessary function exports
a6814030 [studio/applib] Cleanup
9937a010 [turbine] Cleanup
abcf2adc [nostalgia/gfx] Cleanup
05f90235 [nostalgia/gfx] Cleanup
5ba0bcf9 [turbine] Consolidate some files that didn't have sensible distinctions
git-subtree-dir: deps/nostalgia
git-subtree-split: cb304ecf2852db37a7aa7ca3bfc9d28877d5c1bd
2025-05-17 17:48:31 -05:00
5c9ab7ae08
Merge commit 'a4a00c99d05441f5db491e06186039f817cb5c81'
Build / build (push) Has been cancelled
2025-05-17 17:48:31 -05:00
2cb6ab87d9
Merge commit 'bf686590afc88aaa9fe3b0a202f5afe0553154c1'
2025-05-16 21:22:49 -05:00
e2ca6389a9
Squashed 'deps/nostalgia/' changes from 0de428a2..00e52b64
...
00e52b64 [nostalgia] Make pkg-dmg more versatile
ae404879 [nostalgia/gfx] Add navigateTo handler to TileSheetEditor
84b612c6 [studio/modlib] Give navigateTo a default argument
3c2a6b04 [studio/applib] Make navigateTo handle UUID paths
626da322 [ox/std] Add StringParam(IString const&) constructor
git-subtree-dir: deps/nostalgia
git-subtree-split: 00e52b649141b3daffd9a10b0320b142499c536f
2025-05-15 22:27:30 -05:00
3b2d04003f
Merge commit 'e2ca6389a9ffdfc23325faf7d73779887917680d'
2025-05-15 22:27:30 -05:00
6e1ff6ddef
[nostalgia/gfx] Add navigateTo handler to TileSheetEditor
2025-05-15 20:39:50 -05:00
d848f78fc9
[studio/modlib] Give navigateTo a default argument
2025-05-15 20:39:01 -05:00
75c99e59f5
[studio/applib] Make navigateTo handle UUID paths
2025-05-15 20:38:27 -05:00
545fc83cab
[ox/std] Add StringParam(IString const&) constructor
2025-05-15 20:37:44 -05:00
71b1e79d61
Squashed 'deps/nostalgia/' changes from 26fe266b..0de428a2
...
0de428a2 [studio/applib] Cleanup
8a52df4f [nostalgia/gfx] More cleanup
efec6eb3 [nostalgia/gfx/studio/palette] Add RGB key shortcuts for focusing color channels
56eeb249 [nostalgia/gfx/opengl] More cleanup
ae81f6b3 [ox/std] Make Span::operator[] const
c1108301 [nostalgia/gfx] Cleanup
83fbe6ac [keel,turbine,studio] Fix some install mistakes
80b45283 [nostalgia/gfx] Cleanup
0fa39433 [nostalgia] Add release note about Mac menubar using Cmd
cae75350 [nostalgia] Fix typos in release notes
df878323 [studio] Add build date to About
d585794c [nostalgia/gfx/studio/tilesheet] Fix Insert tile command
20965854 [nostalgia/gfx/studio/tilesheet] Cleanup
02383a4a [ox/std] Cleanup
185a7628 [nostalgia] Make pkg-dmg delete bundle after archive created
b722b4f7 [nostalgia] Update release notes
459ab5aa [studio] Remove ability to re-order Editor tabs
565f621c [nostalgia/gfx/studio/tilesheet] Fix Delete Tile functionality
9589ca91 [keel] Cleanup
164db500 [keel] Cleanup
cbfb167d [nostalgia] Remove unused project directory
e7b83be8 [nostalgia] Update release notes
649da5fc [nostalgia/sample_project] Delete Scenes directory
aa095f76 [studio] Make Delete key initiate deletion of selected directory
bb99c99f [studio] Make deleting a directory close files in that directory
7f0dcdd2 [nostalgia/gfx/studio/tilesheet] Cleanup
6029ad5d [nostalgia/studio] Add command for bundling Mac app
git-subtree-dir: deps/nostalgia
git-subtree-split: 0de428a2e588d3360b98aa7e00c2498d5a54019b
2025-05-14 22:31:06 -05:00
838546c4f9
Merge commit '71b1e79d61c1530fc6a19201600623e2b0394163'
Build / build (push) Successful in 1m34s
2025-05-14 22:31:06 -05:00
8e033b2460
Squashed 'deps/nostalgia/' changes from 9676ea59..26fe266b
...
26fe266b [ox/mc] Fix break from using strnlen_s inappropriately
091eda7b Merge commit 'ce53be92716b0f5201882d6959c398b61c6cc93c'
ac29f7a0 Merge commit 'ec6cf92c4763be5933ee6debbf97bce25b9fcfc9'
eef51a6d [olympic] Improve error handling in file-to-cpp
git-subtree-dir: deps/nostalgia
git-subtree-split: 26fe266b09971d3e638654515f41226afc7f4625
2025-05-07 01:20:37 -05:00
36d95d5a76
Merge commit '8e033b2460904a2ac56e8a40e6293784ad981c78'
Build / build (push) Successful in 1m35s
2025-05-07 01:20:37 -05:00
62a3066c7c
Merge commit 'ce53be92716b0f5201882d6959c398b61c6cc93c'
2025-05-07 00:12:52 -05:00
ce53be9271
Squashed 'deps/nostalgia/' changes from 89ae226b..9676ea59
...
9676ea59 [turbine/glfw] Fix programmatic shutdown to invoke shutdownHandler
de8ac106 [turbine/glfw] Fix closing when no shutdown handler is set
88a6cd59 [turbine/glfw] Treat close window event like other events with regard to a mandatory refresh period
cd43fb7f [turbine,studio] Fix confirm app close pop up to work with Ctrl-Q
136f4224 [nostalgia] Update release notes
e773d6f0 [studio] Rename StudioContext to Context
7da2f68d [nostalgia/sample_project] Add assets
d20889ae [nostalgia/gfx/studio] Update for Ox changes
50c8302f [ox] Rename itoa to intToStr
d8195d30 [olympic,nostalgia] Address unsafe buffer warnings
a8c1387d [ox] Address unsafe buffer warnings
ff1e8f26 [studio] Add popup to warn about UUID duplication
d4329981 [studio,nostalgia] Cleanup
00034543 [studio,nostalgia/gfx/studio] Cleanup
8c6b2234 [olympic/util] Make pkg-gba script check return code of subprocesses
aad4b8a4 [studio] Cleanup
7cab1331 [keel] Add ability to log UUID duplication
640ac85d [nostalgia/gfx/studio/palette] Make page rename dialog accept on enter if input focused
b8d76586 [nostalgia/studio] Update generated icondata.cpp with Clang fix
2503bb3b [nostalgia/sample_project] Update type descriptors
e5dd448f [turbine,studio] Make Studio confirm with user before closing app if any unsaved changes
4770bb6a [olympic/util] Cleanup
c0bac696 [nostalgia/gfx/studio/paletteeditor] Fix color number key range
95f7c334 [studio] Change Studio font
535d8876 [keel] Cleanup
845e4332 [turbine] Fix Mac build
5169a607 [turbine] Disable useless window icon on Mac, it causes GLFW warning
8f03af99 [keel] Style updates
ee63a4a1 [keel] Cleanup
git-subtree-dir: deps/nostalgia
git-subtree-split: 9676ea59787215b01498dfa82f88d426363b3cfd
2025-05-07 00:11:20 -05:00
e2452ab433
Merge commit 'ec6cf92c4763be5933ee6debbf97bce25b9fcfc9'
2025-04-17 20:12:48 -05:00
9ba01b8377
[olympic] Improve error handling in file-to-cpp
2025-04-16 20:11:28 -05:00
09b4a705a9
Squashed 'deps/nostalgia/' changes from ab11b885..3fe62464
...
3fe62464 [nostalgia/sample_project] Add NS_Logo32
db55fc72 [nostalgia/player] Cleanup
20944508 [studio] Cleanup
889bec04 [nostalgia/gfx/studio/tilesheet] Cleanup
ac1e34d4 [nostalgia] Update release notes
55ed75f4 [nostalgia/gfx/studio/tilesheet] Fix selection clearing to work when clicking outside image
2751872c [nostalgia] Cleanup file-to-cpp output
2a3cd35c [nostalgia] Fix release notes version, add d2025.02.1
b66f459f [nostalgia] Cleanup icon rsrc generation
3910f4e7 [nostalgia] Fix debug and gba-run commands in Makefile
c0e96216 [turbine] Make accessor functions take const ref to Context
f9512d72 [turbine/glfw] Fix implicit conversion
b7f2c169 [nostalgia/studio/gfx] Fix typo
1e5057d6 [nostalgia] Add app icon note to release notes
c6255e32 [nostalgia/studio] Add icon 16 src
02230ef6 [turbine,studio,nostalgia/studio] Add support for window icon scaling, expand icons sizes for Nostalgia Studio
9b6b60e4 [turbine] Cleanup
b9a26ab6 [turbine] Fix GLFWimage member init order
a521887d [studio,turbine] Add support for window icons
5ca7e2f2 [ox/fs] Cleanup
125a235d [ox/fs] Cleanup
91a7129f [nostalgia/gfx/keel] Cleanup
df48a232 [nostalgia/studio] Add icon to Windows executable
git-subtree-dir: deps/nostalgia
git-subtree-split: 3fe62464c3ee45055e8c732840f949cdf373ae2a
2025-04-16 19:48:37 -05:00
1e875f8dd7
Merge commit '09b4a705a9251d54e797eb75db1f3d4687829a24'
2025-04-16 19:48:37 -05:00
163819af0f
Merge commit '6bcd6deb76a946e5e4f58c865d12316b7dc4d2a6'
2025-03-27 00:22:15 -05:00
6bcd6deb76
Squashed 'deps/nostalgia/' changes from 646ab128..ab11b885
...
ab11b885 [keel] Add missing new line to log message
36fc25fb [studio] Fix closing tab with unsaved changes
4803cca3 [nostalgia/player] Cleanup
6bd74611 [nostalgia] Update release notes
c3f9cf9a [studio] Fix New Project opening project, disable New if no project open
git-subtree-dir: deps/nostalgia
git-subtree-split: ab11b885e680ee8f0be7ee06f2253ab7ddb726be
2025-03-27 00:22:14 -05:00
c4e6b833f0
Merge commit '54de52e6c55126b4bfd3843fbeac7a1b57cd4e10'
Build / build (push) Successful in 1m54s
2025-02-24 21:48:11 -06:00
54de52e6c5
Squashed 'deps/nostalgia/' changes from fbebf4ef..646ab128
...
646ab128 [nostalgia/gfx] Cleanup
74cf0556 [nostalgia] Cleanup
0d8ba1b1 [nostalgia/gfx] Cleanup formatting mistake
20edbb7f [buildcore] Map aarch64 to arm64
6febc7cc [nostalgia] Fix build
b94d6b50 [nostalgia] Remove scene package, finish stubbing out sound
b3952cab [nostalgia] Add build upload step to CI
2ffc11b0 Merge commit 'e723ead864edb4bc160e4d69713309174ad9e82e'
96cace2c [studio] Cleanup
472f5702 [nostalgia/gfx/studio/tilesheet] Change max export scale to 135
c0ac4345 [studio] Cleanup
git-subtree-dir: deps/nostalgia
git-subtree-split: 646ab1283f1f486d301e742459467e7bbfdfc8f5
2025-02-24 21:48:11 -06:00
0e27cec0f4
[studio] Cleanup
2025-02-22 19:51:55 -06:00
9c63b31df6
Merge commit 'bceb2acc644595f5109d222cc974516a231cfadd'
Build / build (push) Successful in 1m54s
2025-02-22 01:01:21 -06:00
49cc2f492a
[nostalgia,studio] Fix crash that occurred when navigating to file that is not already open
Build / build (push) Successful in 2m0s
2025-02-20 23:57:02 -06:00
611df32bdb
Squashed 'deps/nostalgia/' changes from 26fc5565..d0a32e24
...
d0a32e24 [ox/std] Add Vector::remove
03d4a573 [nostalgia,studio] Add ability to navigate from tile sheet to palette color
a2e41e65 Merge commit '4e94c925686cdda4b1ac777045dd7a17c7dc0329'
40a7caff [ox/std] Make bounds checking its own option enable-able in release builds
git-subtree-dir: deps/nostalgia
git-subtree-split: d0a32e247eb9f5f3847c5d03708b455ee698ea96
2025-02-20 23:38:27 -06:00
77d526d6ac
Merge commit '611df32bdb02e80feecba9e0084a9fa723913c0d'
2025-02-20 23:38:27 -06:00
4e94c92568
Squashed 'deps/nostalgia/' changes from 2a8e3c2d..26fc5565
...
26fc5565 [nostalgia/gfx] Make dangling reference warning suppressions check for GCC 13
388541ce [nostalgia/player] Cleanup
6c194667 [nostalgia] Fix NostalgiaGfx lib name, stub out sound package
62d0579f [ox/fs] Restructure stat error handling to make easier to debug
202595b2 [keel] Fix loading assets by path
cb21ff3f Merge commit 'a6b9657268eb3fe139b0c22df27c2cb2efc0013c'
8459d3ba Merge commit 'c42adc290cd8a27d01bb6d9877032dd2c963a4b7'
8d04af69 Merge commit 'ab760b064fd6a302bad13274e0e02b2b2c957b67'
6c34198f Merge commit '897a59cdad66e593fd45eece9414d8414fa7f1ae'
f63c5816 [studio] Add filepickerpopup.hpp to studio.hpp
git-subtree-dir: deps/nostalgia
git-subtree-split: 26fc5565e86e09c6c51a615683fd9003816a24ac
2025-02-20 20:11:03 -06:00
7a890653ee
Merge commit '4e94c925686cdda4b1ac777045dd7a17c7dc0329'
2025-02-20 20:11:03 -06:00
b6826f4aa4
[ox/std] Make bounds checking its own option enable-able in release builds
Build / build (push) Successful in 1m49s
2025-02-20 20:05:07 -06:00
f83bf5bd3b
[ox/fs] Restructure stat error handling to make easier to debug
2025-02-19 21:47:47 -06:00
