2da3579818
Squashed 'deps/nostalgia/' changes from 5e90f8d4..3b874c6e
...
3b874c6e [turbine] Fix refresh logic to handle default refresh within value
6cf7bf96 [ox/std] Hopefully fix MSVC build
e34df255 [nostalgia] Update developer-handbook non-error return
7eab2f92 [studio/modlib] Comment out logging in configio
3824788a [ox/std] Add non-const operator[] to Pair
1eac7e1e [ox/std] Add Pair
8798d2d7 [nostalgia/core] Fix getTileIdx(TileSheet, SubSheetId)
f82db690 [nostalgia/core] Make load TileSheet functions take CompactTileSheet, in addition to FileAddresses
0dfa7c30 [studio/modlib] Make TaskRunner check that task is not null
2afade24 Merge commit 'fc2dec64389824a251fb258f6fd0a9074e521cc2'
3635702e [nostalgia] Cleanup config IO
6cbafc75 [nostalgia,keel] Make repair return ox::Error
0d7b89a0 [turbine] Add TimeMs alias to uint64_t
e8f5c911 [studio/applib] Change updateHandler to 10 second interval
3cb3bc12 [nostalgia/core] Add valid and repair functions for PaletteV3
a2cec10c [keel] Add valid and repair functions for AssetManager
git-subtree-dir: deps/nostalgia
git-subtree-split: 3b874c6e6aa0b80783fc9d712c31bc837326337c
2024-06-18 00:50:59 -05:00
62cbe76c1c
Merge commit '2da3579818c8cbb50ad4b346f5fbc9e5304e682f'
2024-06-18 00:50:59 -05:00
7649ee2a58
[ox/std] Add non-const operator[] to Pair
2024-06-12 22:52:20 -05:00
4657861607
[ox/std] Add Pair
2024-06-12 22:51:57 -05:00
1fc681b23e
[jasper/world] Remove palette based animation system
2024-06-04 00:38:17 -05:00
97c92cac87
[nostalgia/core] Fix getTileIdx(TileSheet, SubSheetId)
Build / build (push) Successful in 3m16s
2024-06-03 23:17:50 -05:00
bcb4a8de3f
[nostalgia/core] Make load TileSheet functions take CompactTileSheet, in addition to FileAddresses
2024-06-03 20:00:48 -05:00
93f3df039f
[studio/modlib] Make TaskRunner check that task is not null
2024-06-02 14:08:23 -05:00
e961d9b63d
Merge commit 'fc2dec64389824a251fb258f6fd0a9074e521cc2'
2024-06-02 11:35:07 -05:00
fc2dec6438
Squashed 'deps/nostalgia/' changes from 430cae16..5e90f8d4
...
5e90f8d4 [studio] Move task runner to draw call
fd4619bc [studio,turbine] Fix Turbine sleep logic, tweak Studio default sleep values
128ddb2c [turbine/gba] Fix ticksMs function signature
f34704d8 [nostalgia/core/studio] Fix AddSubsheetCommand::undo to undo ID idx change
fb5d3545 [nostalgia/core/studio] Cleanup
2180f7bf [nostalgia/core] Fix validateSubSheetIdx
dcad4440 [keel] Make GBA AssetRef changeable
git-subtree-dir: deps/nostalgia
git-subtree-split: 5e90f8d45434fa36b6e113357cf05a6cf53bfae5
2024-06-02 11:33:36 -05:00
33112fb921
[jasper/project] Update assets
Build / build (push) Successful in 3m17s
2024-06-01 22:43:33 -05:00
8a67657473
[jasper/world/studio] Make WorldEditor remember animate option
2024-06-01 20:38:19 -05:00
bddb08c201
[nostalgia] Cleanup config IO
2024-06-01 20:14:29 -05:00
f338a6a86a
[jasper/player] Make player default to working dir for asset dir
Build / build (push) Successful in 3m18s
2024-06-01 18:06:28 -05:00
ce9ce3f0e5
[jasper/project] Update assets
2024-06-01 18:03:25 -05:00
d40130eff0
[nostalgia,keel] Make repair return ox::Error
Build / build (push) Successful in 3m15s
2024-06-01 15:54:11 -05:00
cab71a5fcf
[jasper/world/studio] Make WorldEditor able to animate BG
Build / build (push) Successful in 3m17s
2024-06-01 15:43:38 -05:00
e008416d08
[turbine] Add TimeMs alias to uint64_t
2024-06-01 13:58:46 -05:00
7472834ef8
[studio/applib] Change updateHandler to 10 second interval
2024-06-01 13:58:15 -05:00
c389eeeef8
[nostalgia/core] Add valid and repair functions for PaletteV3
2024-06-01 13:56:15 -05:00
3064f7e742
[keel] Add valid and repair functions for AssetManager
2024-06-01 13:54:45 -05:00
f8acaf6551
[studio,turbine] Fix Turbine sleep logic, tweak Studio default sleep values
Build / build (push) Successful in 3m16s
2024-06-01 01:21:43 -05:00
04bf815642
[studio,turbine] Fix Turbine sleep logic, tweak Studio default sleep values
2024-06-01 01:20:01 -05:00
7499bd87da
[turbine/gba] Fix ticksMs function signature
Build / build (push) Successful in 3m15s
2024-05-31 23:59:49 -05:00
ad3ff78e2f
[nostalgia/core/studio] Fix AddSubsheetCommand::undo to undo ID idx change
2024-05-31 23:59:15 -05:00
14eb10016e
[nostalgia/core/studio] Cleanup
2024-05-31 23:58:40 -05:00
a4b909c890
[nostalgia/core] Fix validateSubSheetIdx
2024-05-31 23:58:21 -05:00
f6c327c2d7
[keel] Make GBA AssetRef changeable
2024-05-31 23:57:14 -05:00
e861b4f6e7
[jasper/world] Add world background animation
Build / build (push) Successful in 3m15s
2024-05-31 23:55:12 -05:00
79d7f76407
[jasper/world/studio] WorldEditor: suppress keyboard when popup open
2024-05-31 23:50:49 -05:00
bec487552f
[jasper/project] Add missing type descriptors
2024-05-31 23:47:31 -05:00
a0d6019480
Squashed 'deps/nostalgia/' changes from 976550ef..430cae16
...
430cae16 [nostalgia,studio] Update for new ImGui's Mac awareness
git-subtree-dir: deps/nostalgia
git-subtree-split: 430cae1622d807a6a04925183646d3ee7401b76a
2024-05-31 23:42:52 -05:00
41b4fae643
Merge commit 'a0d6019480b421575b54182f52af98fc2379f758'
2024-05-31 23:42:52 -05:00
60789230be
Squashed 'deps/nostalgia/' changes from dd5d1bfb..976550ef
...
976550ef [nostalgia/sample_project] Add missing type descriptors
1fb0a866 [nostalgia/core] Fix CompactPalette TypeName and TypeVersion
eb46aeeb [nfde] Fix compiler warnings on Gtk build
9244b735 [nostalgia] Fix non-Linux non-Apple systems not to build GLFW for Wayland
3fba36b4 [nfde] Make only option BUILD_SHARED_LIBS if not already set
6ddb6b42 Merge commit '5461f6700dac79e9e71e3966f8a1270706c385ba'
5461f670 Squashed 'deps/nfde/' changes from 28ade5a5c..5786fabce
1ecc7aa7 Merge commit '26c8cc348eacea01237cd64e1a68d0df8141e848'
26c8cc34 Squashed 'deps/glfw/' changes from 7d5a16ce7..7b6aead9f
fc25c12d Merge commit 'ae51a422787bc3b720ff1748c0219c8f33363427'
ae51a422 Squashed 'deps/imgui/' changes from f33737806..2db79d086
6c71e1e2 [nostalgia/core/studio,studio] Give TileSheetEditor Ctrl-A and Ctrl-G for selection
2ede01e7 [nostalgia/core/studio] Fix build
deacd4ab [nostalgia/core/studio] Fix PaletteEditor add/remove color commands
git-subtree-dir: deps/nostalgia
git-subtree-split: 976550ef6fa269cf1e367e880f148b0ad7b1b163
2024-05-31 20:54:46 -05:00
c92ba2713e
Merge commit '60789230be4092f2fbd2b2245949603d7d5513b8'
2024-05-31 20:54:46 -05:00
7ac29585d6
[jasper/world/studio] Fix world tile selection to properly release when out of bounds
Build / build (push) Successful in 3m14s
2024-05-31 02:23:36 -05:00
d0073b2161
[jasper] Add missing install destinations
2024-05-31 02:22:48 -05:00
cdc7cbdd64
[nostalgia/core/studio] Fix build
Build / build (push) Successful in 3m15s
2024-05-31 01:43:46 -05:00
834c8ef5aa
[nostalgia/core/studio] Fix PaletteEditor add/remove color commands
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
Build / build (push) Successful in 3m18s
2024-05-29 20:51:15 -05:00
53f8ec4666
[nostalgia/core] Fix subsheet resize not to read garbage
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
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
Build / build (push) Successful in 3m14s
2024-05-29 00:21:59 -05:00
4161c6b1bd
[nostalgia/developer-handbook] Update serialization notes
Build / build (push) Has been cancelled
2024-05-29 00:19:58 -05:00
