610 Commits

Author SHA1 Message Date
36d95d5a76 Merge commit '8e033b2460904a2ac56e8a40e6293784ad981c78'
All checks were successful
Build / build (push) Successful in 1m35s
2025-05-07 01:20:37 -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
c7bfcd1647 [jasper/project] Remove ng files
All checks were successful
Build / build (push) Successful in 2m25s
2025-05-07 00:18:31 -05:00
5c125bda26 [jasper/world] Update for new Olympic changes 2025-05-07 00:15:14 -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
d4d6b1ba35 [jasper] Add generate-studio-rsrc to Makefile
All checks were successful
Build / build (push) Successful in 1m33s
2025-04-17 20:20:14 -05:00
311a25e90d [jasper] Fixes for Olympic update 2025-04-17 20:20:08 -05:00
ec6cf92c47 Squashed 'deps/nostalgia/' changes from 3fe62464..89ae226b
89ae226b [keel] Improve correctness
477834ac [keel] Cleanup
97b707b6 [keel] Fix MSVC build
e86180e8 [nostalgia/core/keel] Consistency cleanup
035ba881 [keel,nostalgia] Fix converter type names
f1c2113d [keel] Fix some completely incomprehensible build break in GCC12...
56b79f41 [keel,nostalgia] Further simplify writing type converters
844656d5 [nostalgia/gfx/keel] Update type converter style
849aceb8 [keel] Add cleaner way to write type converters
c84b8510 [nostalgia/gfx/studio] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: 89ae226b1d1eb514bad146ebfc5e0a12818ec808
2025-04-17 20:12:48 -05:00
e2452ab433 Merge commit 'ec6cf92c4763be5933ee6debbf97bce25b9fcfc9' 2025-04-17 20:12:48 -05:00
fa3617a554 [jasper/world/keel] Cleanup
All checks were successful
Build / build (push) Successful in 1m31s
2025-04-16 20:37:48 -05:00
26d3dce299 [jasper/studio] Update icons 2025-04-16 20:12:59 -05:00
9ba01b8377 [olympic] Improve error handling in file-to-cpp 2025-04-16 20:11:28 -05:00
1d50cc1f98 [jasper/studio] Add embedded window icons 2025-04-16 19:54:33 -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'
All checks were successful
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
bceb2acc64 Squashed 'deps/nostalgia/' changes from d0a32e24..fbebf4ef
fbebf4ef [nostalgia/gfx/studio/tilesheet] Fix export for 4bpp images
20513f77 [nostalgia/sample_project] Add type descriptors
25a7873e [nostalgia,studio] Fix crash that occurred when navigating to file that is not already open

git-subtree-dir: deps/nostalgia
git-subtree-split: fbebf4ef83626995bafb3e81754257c18f09def1
2025-02-22 01:01:21 -06:00
9c63b31df6 Merge commit 'bceb2acc644595f5109d222cc974516a231cfadd'
All checks were successful
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
All checks were successful
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
1720328735 [jasper] Update NostalgiaCore references
All checks were successful
Build / build (push) Successful in 1m58s
2025-02-20 20:14:31 -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
All checks were successful
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
c2065fe988 [keel] Fix loading assets by path 2025-02-19 21:47:00 -06:00
a6b9657268 Squashed 'deps/nostalgia/' changes from 804d78e1..2a8e3c2d
2a8e3c2d [nostalgia/gfx] Remove unnecessary cast
998066d3 [ox/std] Add comparison functions
fefb876f [nostalgia/gfx] Add checks for GCC version for warning suppression
5979e988 [jsoncpp] Up required CMake version
a17abe46 [nfde] Up required CMake version
d62f9138 [nostalgia/gfx] Suppress some superfluous warnings
12bb7475 [nostalgia/gfx/studio/tilesheet] Adjust pixel line size on Windows
df2c7e2b [nostalgia] Update release notes
713aec88 [buildcore] Change mypy invokation
3089cd7a Change builder type to olympic
00638bc8 [nostalgia/gfx/studio/tilesheet] Mark DrawCommands as obsolete if no changes
e0021098 [studio] Make undo/redo skip over obsolete commands
b4798fd2 [nostalgia/gfx/studio/tilesheet] Make rotate only available for square subsheets or selections
3c804bf6 [studio] Give MakeCopy popup an error message for files that already exist
d39d552b [nostalgia/studio] Update icon to higher resolution
b7202a2b [nostalgia/player] Disable Keel mods on GBA
4e27a4c1 [nostalgia/core/studio/tilesheet] Fix palette path display update
4ef31762 [nostalgia/core/studio/tilesheet] Cleanup
8b22a8f3 [keel] Make buildUuidMap only read the first 40 bytes of each file
d45ff05b [ox/fs] Add new partial file read functions
671dd862 [keel,studio] Add Make Copy option to ProjectExplorer
0abadc18 [studio] Fix QuestionPopup to only emit a response when there is a response
4e068d62 [studio] Fix misrender flash on tab close
4461f99f [studio] Add Ctrl-W shortcut for closing active tab
cd1f4bda [studio] Add confirmation for closing file with unsaved changes
47286995 [studio] Add combobox that will take string views
105a1e55 [nostalgia/core/studio/tilesheet] Rework operation ctrls into a dropbox
1bc18e34 [nostalgia/core/studio/tilesheet] Add ability to rotate a selection
fb8d295f [nostalgia/core/studio/tilesheet] Add rotate functionality

git-subtree-dir: deps/nostalgia
git-subtree-split: 2a8e3c2dc44642fd9fef6bc8b645ad966f0277da
2025-02-19 00:34:26 -06:00
04b7204ed8 Merge commit 'a6b9657268eb3fe139b0c22df27c2cb2efc0013c' 2025-02-19 00:34:26 -06:00
fb98d49120 [jasper] Change builder type to olympic
Some checks failed
Build / build (push) Failing after 36s
2025-02-07 20:59:01 -06:00
c42adc290c Squashed 'deps/nostalgia/' changes from be518387..804d78e1
804d78e1 [nostalgia/gfx/studio] Cleanup
5351e9aa [nostalgia/core/studio/tilesheet] Add line drawing tool
b5954f15 [studio] Restore context menu for root dir, but exclude Delete
5dce9dd3 [studio] Suppress context menu for root dir in ProjectExplorer
0570f762 [ox/fs] Fix PassThroughFS::stripSlash
e22b658a [studio] Fix isParentOf check in Project to ensure child dir path ends with /
56b9cb6e [studio] Fix file explorer to treat empty directories as directories
eaa9a241 [keel] Make reloadAsset check if file is loaded
95256a9a [studio] Make rename file give error message if the file already exists
2286238a [studio] Make rename file accept input upon pressing Enter if text input is focused
13f0bf57 [studio] Make deleting a file close tabs associated with it
8eb1ac21 [studio] Fix not to try moving a parent directory to its child
e132f2fd [studio] Make file move do nothing if the file already exists
12f6b22c [nostalgia/gfx/studio/palette] Cleanup
6c858e0c [nostalgia/gfx/studio/tilesheet] UI cleanup
c6b58f7c [nostalgia] Update release notes
a22aafaf [nostalgia/gfx/studio/palette] Add ability to reorder Palette pages
6298ac3a [nostalgia] Update release notes
cd63afac [studio] Remove Ctrl-0 tab shortcut
28591837 [nostalgia/gfx/studio/tilesheet] Add the ability to move subsheets
05516597 [nostalgia/sample_project] Update test assets

git-subtree-dir: deps/nostalgia
git-subtree-split: 804d78e116ca07a13f0a3bd053875657fb6dfbcd
2025-02-01 22:55:46 -06:00
ebf524e055 Merge commit 'c42adc290cd8a27d01bb6d9877032dd2c963a4b7'
All checks were successful
Build / build (push) Successful in 4m22s
2025-02-01 22:55:46 -06:00
5b0bae9712 [jasper/world/studio] Update for Studio changes
All checks were successful
Build / build (push) Successful in 4m14s
2025-01-26 15:44:34 -06:00
ab760b064f Squashed 'deps/nostalgia/' changes from 7e3e0461..be518387
be518387 [nostalgia/gfx/studio/tilesheet] Add flip x and flip y functionality
1207dade [studio] Add ability to move directories
109e1898 [studio] Add ability to drag files between directories
a24bf7ff [studio] Fix config to update when open file name changes
046834c2 [studio,nostalgia] Update tab name when corresponding file's name changes
f840240a [nostalgia/gfx/studio/tilesheeteditor] Rework system for tracking current palette path
cfa91d3d [keel,studio] Add ability to rename files
f7a7a66a [ox/event] Add Signal::connectionCnt
5145595d [ox/std] Fix HashMap collision handling
f01d3033 [ox/std] Fix UPtr compare with nullptr
098c8cb8 [nostalgia/gfx/studio] Make move color commands affect all pages
04ad0f02 [studio] Add drag/drop functions that use model TypeName for name
695e7a45 [nostalgia/gfx/studio/paletteeditor] Change move color mechanism to use drag/drop
7d53028f [studio] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: be51838775cd37d8c0778378a5d944f8f261830c
2025-01-26 15:42:50 -06:00
e86c58a087 Merge commit 'ab760b064fd6a302bad13274e0e02b2b2c957b67' 2025-01-26 15:42:50 -06:00
897a59cdad Squashed 'deps/nostalgia/' changes from e40b1124..7e3e0461
7e3e0461 [ox/model] Fix possible infinite recursion

git-subtree-dir: deps/nostalgia
git-subtree-split: 7e3e0461097fb87807237e5494f8cd6ba289dd87
2025-01-23 23:51:13 -06:00
0c909e798c Merge commit '897a59cdad66e593fd45eece9414d8414fa7f1ae' 2025-01-23 23:51:13 -06:00
f27c36487c [studio] Add filepickerpopup.hpp to studio.hpp
All checks were successful
Build / build (push) Successful in 4m2s
2025-01-23 22:19:59 -06:00
4bcbcf76d6 [jasper/world/studio] Use FilePickerPopup for ObjSet TileSheet 2025-01-23 22:19:19 -06:00
2fbeb8c685 Squashed 'deps/nostalgia/' changes from 161194c8..e40b1124
e40b1124 [nostalgia/gfx/studio/paletteeditor] Fix num key shortcuts to ignore if ctrl is down

git-subtree-dir: deps/nostalgia
git-subtree-split: e40b11246dc9296d173e8c6a47f32993aa869030
2025-01-23 21:58:02 -06:00
cf765d2745 Merge commit '2fbeb8c685a0904ce09d5786f58c25f696306255' 2025-01-23 21:58:02 -06:00
bd461ebeeb [jasper/world/studio] Integrate new FilePickerPopup
Some checks failed
Build / build (push) Failing after 1m7s
2025-01-23 21:52:35 -06:00
af93f94c67 Squashed 'deps/nostalgia/' changes from ff666eda..161194c8
161194c8 [nostalgia/gfx/studio/tilesheeteditor] Add FilePicker to for choosing a Palette
48603ea2 [studio] Make tabs not draw while closing
e2f2a173 [studio] Add FilePickerPopup
e8a0ce88 Merge commit 'dff9f81e073bb994d5ce96a6eaa1bfa547f1fdf4'
82e2ea74 [studio] Fix NewMenu to track prev stage correctly when going back two stages

git-subtree-dir: deps/nostalgia
git-subtree-split: 161194c8b268d8fb0159f251844292660b0a7922
2025-01-23 21:35:40 -06:00
67c796ec04 Merge commit 'af93f94c679456e697ec438bad9cdfdfcbed1eb8'
All checks were successful
Build / build (push) Successful in 3m58s
2025-01-23 21:35:40 -06:00
1aed9b2d12 Merge commit 'dff9f81e073bb994d5ce96a6eaa1bfa547f1fdf4'
All checks were successful
Build / build (push) Successful in 3m58s
2025-01-23 21:21:58 -06:00