482 Commits

Author SHA1 Message Date
d0073b2161 [jasper] Add missing install destinations 2024-05-31 02:22:48 -05:00
cdc7cbdd64 [nostalgia/core/studio] Fix build
All checks were successful
Build / build (push) Successful in 3m15s
2024-05-31 01:43:46 -05:00
834c8ef5aa [nostalgia/core/studio] Fix PaletteEditor add/remove color commands
Some checks failed
Build / build (push) Failing after 30s
2024-05-31 01:19:55 -05:00
e3cd379bb4 Squashed 'deps/nostalgia/' changes from 7d9f363b..dd5d1bfb
dd5d1bfb [ox/model] Fix type params in type ID

git-subtree-dir: deps/nostalgia
git-subtree-split: dd5d1bfbf517137cef5cb26eeb6a56045da2124b
2024-05-30 23:44:27 -05:00
f1a7f5cdc0 Merge commit 'e3cd379bb4bf7061a9e89a75b2ee5e36261e4a9a' 2024-05-30 23:44:27 -05:00
accff465d6 Merge commit '76b8b03a2c7c4bbda397629452eaf45fa7fe5ea2' 2024-05-30 23:19:09 -05:00
76b8b03a2c Squashed 'deps/nostalgia/' changes from eed115b2..7d9f363b
7d9f363b [nostalgia/core/studio] Show color names in TileSheetEditor
ababc2a7 [nostalgia/core/studio] Add Name to colors table in PaletteEditor
bfd4bc3c [nostalgia/core] Revise Palette system, give TileSheetEditor a config file
8826d51e [studio] Add configio.hpp to studio.hpp
c021e5e7 [ox/oc] Fix OC not dealing with certain int types properly
7d8a8e0e [keel] Cleanup
95a69b72 [ox/std] Fix String::c_str to always retrun a valid C str
e4c38660 [nostalgia/core] Fix subsheet resize not to read garbage
67cf3ae8 [ox/std] Ensure ox::String always has at least a null terminator
2761f23d [nostalgia/developer-handbook] Update serialization notes
6c170d31 [nostalgia/developer-handbook] Update serialization notes
d20bfc77 [nostalgia/developer-handbook] Update serialization notes
07ecbde1 [nostalgia/developer-handbook] Update notes on error handling
fbe2fcd3 [nostalgia/developer-handbook] Update notes on error handling
a8bb99b6 [turbine] Remove ClipboardObject::typeMatches
667dd21a [turbine] Make ClipboardObject::typId return a StringView
5d89370c [turbine] Rework getClipboardObject to use ox::ModelTypeId_v
b968ec8a [keel] Remove redundant move
ec45ffb7 [studio] Fix build error
97dc0274 [nostalgia/core/studio] Add acceptsClipboardPayload to TileSheetEditor
a138f60f [studio] Add acceptsClipboardPayload to Editor
791d1950 [turbine] Make ClipboardObject use ox::ModelTypeId_v for typeId
78eb8fca [keel] Cleanup pack logging
0b8051b6 [ox/preloader] Fix alignment issue
5a426829 [nostalgia/core/studio] Cleanup TileSheet selection, fix copy/paste bug
9d2fe0e8 [studio] Add size function to Selection
f1894699 [keel] Remove setAsset
27b38ed2 [keel,studio] Fix hotloading for files that get loaded as multiple types
2bb7c514 [studio/modlib] Fix type desc writing logic inversion
5177cfb0 [studio/modlib] Make Project::mkdir only mkdir if dir does not exist
f9a14433 [studio/modlib] Add variant of ComboBox that takes callback
e62426b0 [keel] Ensure consistent asset IDs in AssetManager
af634bd4 [ox/fs] Add FileSystem::exists
49b859ec [studio/modlib] Give Selection constructors
19a41201 [studio/modlib] Make iterateSelection return errors properly
f69b8afa [nostalgia] Remove use of deleted function
9c98b5e2 [studio/modlib] Remove color.hpp
1f87216d [nostalgia/core] Add applySelectionColor
94c59604 [nostalgia/core/opengl] Fix for Ox changes
8ee016c1 [studio/modlib] Add SelectionTracker
dc20c667 [ox/std] Add conversion functions for geo types, cleanup
407e5424 [ox/std] Remove SmallMap dtor, replace timing code with steady_clock
3b188696 [ox/claw] Remove enum type from ClawFormat
0fab6c7c [ox/preloader] Remove debug code
a72b865d [studio/modlib] Add function for exporting selection color
c0479604 [studio,nostalgia/studio] Make executing UndoCommands report errors
a1c89906 [nostalgia/studio] Make UndoCommand undo/redo return ox::Error
7fb0549c [nostalgia/core] Revert some auto formatting done by CLion...
37e65ab0 [nostalgia/core/studio] Fix Subsheet width to update properly
9105b1ec [ox/std] Fix Linux build
fbeb0815 [ox/model] Fix type params in buildTypeId
b882a47e [ox/std] Fix resize to set null terminator
660f2f56 [ox/std] Rework FileReader into StreamReader
aa83c2a6 [nostalgia/core/studio] Remove some unnecessary copying
4a2b1fd7 [studio,keel] Make fileChanged emit UUID as well as path, add uuidUrlToUuid
08f958fb [ox/std] Add IntegerRange_c
a651d45a [ox/std] Fix Vector insert functions
9e9f317c [studio] Make UndoCommand::mergeWith take a reference
f5a02ce9 [nostalgia/core/gba] Fix build
6971c310 [studio] Add NoChangeException
c47f48eb [keel] Add/cleanup UUID/path lookup functions
76771e7b [nostalgia/core] Add tileColumns and tileRows functions
f6a0ae20 [ox/std] Fix some Windows warnings
752c8c1d [glutils] Fix type conversion that happened on Windows
af3bff1a [glutils] Add FrameBuffer::sizef
87416e13 [ox/std] Make MallocaPtr call destructor
047b4396 [ox/std] Make Point and Size members int32_t
40b8da4d [studio/modlib] Cleanup
123c4125 [ox/std] Add SmallMap::pairs(), SmallMap model
963ec5d3 [ox/std] Add operator-> to SpanIterator
6df77a23 [glutils] Add size function to FrameBuffer
df412cf8 [ox/std] Add missing typenames
ae30ef36 Merge commit 'b66cef7127e97269fc6072a6f66ccc08990f6d2e'
095a1135 Merge commit 'f48824793cfce315971fe2e699ece198c7a79407'
ce1836ab Merge commit '1e041bd2ebfe5ace7bed3906faf60345aa98a8bc'
7d1641fa Merge commit '420fa96463f59c4a4a7cd66b16b0ad01ab0d55e6'
423212b2 [studio] Add missing include
60da1063 Merge commit 'bd416f82e25f1b710ab2b7890274571dd3fcd53d'
60d1996f [keel] Minor optimization

git-subtree-dir: deps/nostalgia
git-subtree-split: 7d9f363bfa7a2c64f5c4bcfd0b6686f3f5678119
2024-05-30 23:14:19 -05:00
a60aba2ae2 [ox/std] Fix String::c_str to always retrun a valid C str
All checks were successful
Build / build (push) Successful in 3m18s
2024-05-29 20:51:15 -05:00
53f8ec4666 [nostalgia/core] Fix subsheet resize not to read garbage
Some checks failed
Build / build (push) Failing after 1m8s
2024-05-29 02:16:07 -05:00
70152c45a9 [ox/std] Ensure ox::String always has at least a null terminator 2024-05-29 02:15:30 -05:00
5d8f5098e1 [jasper] Revert back to C++20
All checks were successful
Build / build (push) Successful in 3m16s
2024-05-29 00:56:35 -05:00
aa8da0733d [jasper] Update assets 2024-05-29 00:55:58 -05:00
f258a8b0c9 [nostalgia/developer-handbook] Update serialization notes
All checks were successful
Build / build (push) Successful in 3m14s
2024-05-29 00:21:59 -05:00
4161c6b1bd [nostalgia/developer-handbook] Update serialization notes
Some checks failed
Build / build (push) Has been cancelled
2024-05-29 00:19:58 -05:00
6233682d04 [jasper/world/studio] Remove erroneous noexcept
All checks were successful
Build / build (push) Successful in 3m14s
2024-05-29 00:13:21 -05:00
df322b092d [nostalgia/developer-handbook] Update serialization notes
All checks were successful
Build / build (push) Successful in 3m14s
2024-05-29 00:08:16 -05:00
69049e9295 [nostalgia/developer-handbook] Update notes on error handling
All checks were successful
Build / build (push) Successful in 3m13s
2024-05-29 00:00:25 -05:00
2c20ad0d53 [nostalgia/developer-handbook] Update notes on error handling
All checks were successful
Build / build (push) Successful in 3m13s
2024-05-28 23:52:20 -05:00
cc8ef142b9 [turbine] Remove ClipboardObject::typeMatches
All checks were successful
Build / build (push) Successful in 3m13s
2024-05-28 23:41:21 -05:00
87a848e306 [turbine] Make ClipboardObject::typId return a StringView
Some checks failed
Build / build (push) Has been cancelled
2024-05-28 23:39:02 -05:00
bb127400a1 [turbine] Rework getClipboardObject to use ox::ModelTypeId_v
All checks were successful
Build / build (push) Successful in 3m16s
2024-05-28 23:35:22 -05:00
0be51e8079 [jasper/world/studio] Add extra check for clipboard safety 2024-05-28 22:22:26 -05:00
a488ba4fd5 [keel] Remove redundant move
All checks were successful
Build / build (push) Successful in 3m16s
2024-05-28 21:33:19 -05:00
580f27ac87 [jasper/world/studio] Cleanup redundant keelCtx calls
Some checks failed
Build / build (push) Failing after 3m0s
2024-05-28 21:27:19 -05:00
2db3d0470a [studio] Fix build error
Some checks failed
Build / build (push) Has been cancelled
2024-05-28 21:25:31 -05:00
5d4af474b1 [jasper/world/studio] Cleanup
Some checks failed
Build / build (push) Has been cancelled
2024-05-28 21:24:16 -05:00
46c3e4e0de [jasper/world/studio] Cleanup, give WorldEditor an acceptsClipboardPayload function
Some checks failed
Build / build (push) Failing after 2m38s
2024-05-28 21:12:38 -05:00
8a1e60e571 [jasper/player] Make player use file pointed to in Bootfile 2024-05-28 20:59:44 -05:00
7c7d9decd2 [nostalgia/core/studio] Add acceptsClipboardPayload to TileSheetEditor 2024-05-28 20:58:49 -05:00
fe0fea49b3 [studio] Add acceptsClipboardPayload to Editor 2024-05-28 20:58:26 -05:00
181eee0087 [turbine] Make ClipboardObject use ox::ModelTypeId_v for typeId 2024-05-28 20:57:49 -05:00
e9f8787403 [keel] Cleanup pack logging 2024-05-28 20:56:40 -05:00
8f633d17ec [ox/preloader] Fix alignment issue 2024-05-28 20:44:26 -05:00
0675b4675b [nostalgia/core/studio] Cleanup TileSheet selection, fix copy/paste bug 2024-05-28 20:36:27 -05:00
db5cff5e8c [jasper/world/studio] Add copy/cut/paste to WorldEditor
All checks were successful
Build / build (push) Successful in 3m18s
2024-05-28 02:08:54 -05:00
8ae716e09c [studio] Add size function to Selection 2024-05-28 01:45:40 -05:00
654c509ccd [keel] Remove setAsset
All checks were successful
Build / build (push) Successful in 3m17s
2024-05-27 21:13:17 -05:00
bcbca9a5dd [keel,studio] Fix hotloading for files that get loaded as multiple types
All checks were successful
Build / build (push) Successful in 3m15s
2024-05-27 19:26:58 -05:00
3eee6161a0 [jasper/world/studio] Improve WorldEditor dependency tracking 2024-05-27 00:56:04 -05:00
55a747f6a1 [jasper/world/studio] Make ObjectSetEditor use UUIDs 2024-05-27 00:55:41 -05:00
aa89f20ed6 [studio/modlib] Fix type desc writing logic inversion
Also, provide foundation for making file types configurable for default Claw format.
2024-05-27 00:53:24 -05:00
6a7f70469f [studio/modlib] Make Project::mkdir only mkdir if dir does not exist 2024-05-27 00:51:00 -05:00
f1f596e7d8 [studio/modlib] Add variant of ComboBox that takes callback 2024-05-27 00:46:55 -05:00
505d757880 [keel] Ensure consistent asset IDs in AssetManager 2024-05-27 00:45:41 -05:00
7eaa7b36c0 [ox/fs] Add FileSystem::exists 2024-05-27 00:44:58 -05:00
f6235304a0 [jasper/world/studio] Make Ctrl-A select the entire map
All checks were successful
Build / build (push) Successful in 3m18s
2024-05-26 02:10:25 -05:00
4a73a7c35a [studio/modlib] Give Selection constructors 2024-05-26 02:09:59 -05:00
aa43dc9575 [jasper/world/studio] Simplify CollisionMapView with MapTileHighlighter
All checks were successful
Build / build (push) Successful in 3m15s
2024-05-26 00:00:44 -05:00
6e32d36c78 [jasper/world/studio] Make mouse release only finish selection if selection is ongoing
All checks were successful
Build / build (push) Successful in 3m11s
2024-05-25 22:41:03 -05:00
e75c51d614 [studio/modlib] Make iterateSelection return errors properly
All checks were successful
Build / build (push) Successful in 3m14s
2024-05-25 22:33:01 -05:00