4bcbcf76d6
[jasper/world/studio] Use FilePickerPopup for ObjSet TileSheet
2025-01-23 22:19:19 -06:00
cf765d2745
Merge commit '2fbeb8c685a0904ce09d5786f58c25f696306255'
2025-01-23 21:58:02 -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
bd461ebeeb
[jasper/world/studio] Integrate new FilePickerPopup
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'
Build / build (push) Successful in 3m58s
2025-01-23 21:35:40 -06:00
1aed9b2d12
Merge commit 'dff9f81e073bb994d5ce96a6eaa1bfa547f1fdf4'
Build / build (push) Successful in 3m58s
2025-01-23 21:21:58 -06:00
dff9f81e07
Squashed 'deps/nostalgia/' changes from 1cc1d561..ff666eda
...
ff666eda [studio] Make NewMenu default Name field to focus when it appears
0d8b82ba [studio] Cleanup
5598dfdd [nostalgia/player] Update hardcoded tilesheet refs to new file ext
6ef462ad [keel] Add clearer Error handling
9511cb57 [studio] Fix prev tracking
git-subtree-dir: deps/nostalgia
git-subtree-split: ff666eda9b20181135e163b0553a70101c196589
2025-01-23 21:20:06 -06:00
1388bf9c88
[studio] Fix NewMenu to track prev stage correctly when going back two stages
Build / build (push) Successful in 3m58s
2025-01-23 21:13:58 -06:00
356dbcfe82
[jasper/studio] Fix build
Build / build (push) Successful in 3m56s
2025-01-22 23:37:56 -06:00
d96453fa64
[studio] Fix prev tracking
2025-01-22 23:37:44 -06:00
c0fc18cee0
[jasper/world/studio] Change Person TS template type to V5
Build / build (push) Failing after 1m10s
2025-01-22 23:22:01 -06:00
3fddeeee3e
Squashed 'deps/nostalgia/' changes from 1af4da43..1cc1d561
...
1cc1d561 [studio] Add a file explorer to NewMenu to choose where new files go
d15a0df7 [studio] Make reusable FileTreeModel
e1282b6b [studio] Fix build
5fe7c14c [nostalgia/sample_project] Rename TileSheet files using new file ext
42165ba2 [nostalgia/gfx] Change default file extension for TileSheets to nts
git-subtree-dir: deps/nostalgia
git-subtree-split: 1cc1d561e2edfd454335b0cb4d85332e8588237d
2025-01-22 23:13:07 -06:00
d4a691bcc2
Merge commit '3fddeeee3e14669f4c8a139162bf9a548716a108'
2025-01-22 23:13:07 -06:00
b00654e7a3
Merge commit '6fdf744dd2f7130ef13679fd82068fc060a7a86a'
Build / build (push) Successful in 3m57s
2025-01-21 22:58:38 -06:00
6fdf744dd2
Squashed 'deps/nostalgia/' changes from f987b02c..1af4da43
...
1af4da43 [nostalgia] Update release notes
4fa879a0 [nostalgia/sample_project] Update NS_Logo.ng to final TileSheetV5 format
fd8f1a29 [nostalgia] Add release notes document
9fda2763 [nostalgia/gfx] Make TileSheetV5::defaultPalette a string instead of FileAddress
cda23ac4 [ox/std] Change ox::String::operator[](size_t) const return a reference
c36b244d [nostalgia/gfx] Cleanup, add PaletteV5, restore mistakenly removed function
335d278f [ox/oc] Fix integer read for signed/unsigned
git-subtree-dir: deps/nostalgia
git-subtree-split: 1af4da43ad5512cc654e7a18265eba52b6523adf
2025-01-21 22:58:02 -06:00
c4805f1012
[nostalgia] Add release notes document
2025-01-21 22:45:55 -06:00
dabff6ed89
[nostalgia/gfx] Make TileSheetV5::defaultPalette a string instead of FileAddress
2025-01-21 22:44:55 -06:00
eb9132d3a9
[ox/std] Change ox::String::operator[](size_t) const return a reference
2025-01-21 22:43:57 -06:00
25ca985869
[nostalgia/gfx] Cleanup, add PaletteV5, restore mistakenly removed function
2025-01-21 22:17:13 -06:00
814923186b
[ox/oc] Fix integer read for signed/unsigned
2025-01-21 22:15:36 -06:00
610c0c03ce
[jasper/world] Fix build
2025-01-21 02:47:31 -06:00
ec49463217
Squashed 'deps/nostalgia/' changes from 672b92b3..f987b02c
...
f987b02c [nostalgia/gfx] Move to TileSheetV5
3c056276 [turbine,nostalgia] Cleanup
87e2fdef [ox/std] Make UAnyPtr uncopyable
git-subtree-dir: deps/nostalgia
git-subtree-split: f987b02c657802c25061e6786fc28c562877c9c6
2025-01-21 02:25:27 -06:00
fbd42e74a6
Merge commit 'ec49463217cb6822254fd230426135c0b52da547'
2025-01-21 02:25:27 -06:00
c33ffa7b36
[jasper] Upgrade to newer Nostalgia
Build / build (push) Successful in 3m57s
2025-01-20 03:18:30 -06:00
1e92e0d134
Squashed 'deps/nostalgia/' changes from 830f8fe3..672b92b3
...
672b92b3 [nostalgia/gfx/studio] Remove accidental version tag in default Palette
762a6517 [nostalgia] Rename core to gfx
d141154a Merge commit '38777cfac8868b3628332090260710d5ac26aba0'
6170647c [nostalgia,studio] Proper fix for input filtering
48e45c7d [studio] Cleanup
5d3d9229 [nostalgia/core/studio/paletteeditor] Ignore keyboard input when popup is open
d54e93d8 [studio] Cleanup
7b638538 Merge commit '8e0b6ffbabb10f8a6e9ad7e9f07e0ba1d039a02e'
240effd3 Merge commit '7e20f7200963cd0b22f84cc46e10db12b6c13806'
f6f2acd6 [nostalgia/core/studio/tilesheeteditor] Add back file type check for palette drop
git-subtree-dir: deps/nostalgia
git-subtree-split: 672b92b363a2047c4c8ce93fb3d88001a76da35f
2025-01-20 03:14:04 -06:00
2eb87c06f2
Merge commit '1e92e0d1341619f6652e9d37f1896d781c3e268c'
2025-01-20 03:14:04 -06:00
38777cfac8
Squashed 'deps/nostalgia/' changes from 2016f6e6..830f8fe3
...
830f8fe3 [studio,nostalgia/core/studio] Give default Palette created studio a default page
git-subtree-dir: deps/nostalgia
git-subtree-split: 830f8fe3e4aad93f045e56cc4cdce851b5de0b70
2025-01-20 02:15:45 -06:00
9cd67ad12b
Merge commit '38777cfac8868b3628332090260710d5ac26aba0'
2025-01-20 02:15:45 -06:00
20722ed0fd
[jasper/world/studio] Add input filtering for when popup is open
Build / build (push) Successful in 3m57s
2025-01-20 02:12:03 -06:00
765d6d95f5
[nostalgia,studio] Proper fix for input filtering
2025-01-20 02:10:48 -06:00
67901ff748
[studio] Cleanup
2025-01-20 01:34:00 -06:00
c6fbcd8151
[nostalgia/core/studio/paletteeditor] Ignore keyboard input when popup is open
2025-01-20 01:33:23 -06:00
34325794ee
[studio] Cleanup
2025-01-20 00:16:16 -06:00
8e0b6ffbab
Squashed 'deps/nostalgia/' changes from 6bc629e0..2016f6e6
...
2016f6e6 [studio] Fix DeleteConfirmation 'No' option to not delete file
git-subtree-dir: deps/nostalgia
git-subtree-split: 2016f6e605207caade93cb868dce1557b2aacac5
2025-01-19 20:18:56 -06:00
c0ac9869bf
Merge commit '8e0b6ffbabb10f8a6e9ad7e9f07e0ba1d039a02e'
2025-01-19 20:18:56 -06:00
27a2c8b47c
[jasper/world] Cleanup
2025-01-19 20:00:27 -06:00
b05f807cd3
[jasper/project] Update project files
2025-01-19 19:30:57 -06:00
97cf03fbb7
[jasper/world/studio] Fix WorldObjectSetEditor to reload tilesheet when it changes
Build / build (push) Successful in 3m53s
2025-01-19 19:24:52 -06:00
a1a2b4154e
[jasper/world/studio] Cleanup
2025-01-19 19:12:20 -06:00
f678c8f8fc
[jasper/project] Update project files
2025-01-19 19:07:39 -06:00
78da9f526d
Merge commit '7e20f7200963cd0b22f84cc46e10db12b6c13806'
Build / build (push) Successful in 3m54s
2025-01-19 19:04:24 -06:00
7e20f72009
Squashed 'deps/nostalgia/' changes from 6b53eaf6..6bc629e0
...
6bc629e0 [nostalgia/core/studio/tilesheeteditor] Replace Palette combobox with a readonly text input
0146d384 [nostalgia/core/studio/tilesheeteditor] Manually merge in changes that were lost in conflict
75d8e7bb [nostalgia/core/studio/paletteeditor] Fix crash that occurs when removing last color
git-subtree-dir: deps/nostalgia
git-subtree-split: 6bc629e02c60e86739f0f3da3a0f3e15855637ce
2025-01-19 19:03:50 -06:00
583cdc62b4
[nostalgia/core/studio/tilesheeteditor] Add back file type check for palette drop
2025-01-19 18:21:50 -06:00
61a0446c1d
[nostalgia/core/studio/tilesheeteditor] Manually merge in changes that were lost in conflict
2025-01-19 18:18:52 -06:00
83055a96b5
Squashed 'deps/nostalgia/' changes from d68e6493..6b53eaf6
...
6b53eaf6 [ox/std] Fix string append issues
16c32273 [nostalgia/core/studio/tilesheeteditor] Fix palette drop target to only take palettes
1567a6e2 [applib] Fix build
89d543bc Merge commit '7b7d59cf63d77cf7ab6daf6ed7122eef97954555'
git-subtree-dir: deps/nostalgia
git-subtree-split: 6b53eaf6b1d8f4caadea8df8ec6e4c09e37993b4
2025-01-19 18:11:38 -06:00
853512a0f8
Merge commit '83055a96b55399cc06af79d4991c53769ee56c64'
2025-01-19 18:11:38 -06:00
b18a901b95
[nostalgia/core/studio/paletteeditor] Fix crash that occurs when removing last color
2025-01-19 17:56:21 -06:00
bcd62cd622
[jasper/world/studio/worldobjectseteditor] Fix file drops to check file type
2025-01-19 17:01:23 -06:00
92a549ad38
[jasper/world/studio/worldeditor] Add file drag/drop support
2025-01-19 16:58:28 -06:00
