Commit Graph

165 Commits

Author SHA1 Message Date
gary 2a55a5762d [jasper/world/studio] Make executing UndoCommands report errors
Build / build (push) Successful in 3m8s
2024-05-23 21:50:44 -05:00
gary 058bc5c438 [studio,nostalgia/studio] Make executing UndoCommands report errors 2024-05-23 21:50:27 -05:00
gary 6eb78f90cf [jasper/world/studio] Make UndoCommand undo/redo return ox::Error
Build / build (push) Successful in 3m9s
2024-05-23 21:30:15 -05:00
gary 815f23a0b5 [nostalgia/studio] Make UndoCommand undo/redo return ox::Error 2024-05-23 21:29:57 -05:00
gary 0afa2b8cbd [nostalgia/core] Revert some auto formatting done by CLion...
Build / build (push) Successful in 3m8s
2024-05-23 21:01:10 -05:00
gary 18e4183623 [jasper/world/studio] Simplify EditWorldSizeCommand::mergeWith
Build / build (push) Successful in 3m8s
2024-05-23 20:54:45 -05:00
gary b51098595a [nostalgia/core/studio] Fix Subsheet width to update properly 2024-05-23 20:52:55 -05:00
gary 648c62e745 [ox/std] Fix Linux build
Build / build (push) Successful in 3m8s
2024-05-23 01:38:57 -05:00
gary e33c4c5362 [ox/model] Fix type params in buildTypeId
Build / build (push) Failing after 20s
2024-05-23 01:32:41 -05:00
gary b4f08df181 [ox/std] Fix resize to set null terminator 2024-05-23 01:27:59 -05:00
gary 47582573e5 [ox/std] Rework FileReader into StreamReader
Build / build (push) Failing after 20s
2024-05-23 00:45:28 -05:00
gary ded73a0b4c [jasper/world/studio] Fix WorldEditor to pull in resource updates
Build / build (push) Successful in 3m9s
2024-05-22 23:24:08 -05:00
gary 542e492830 [nostalgia/core/studio] Remove some unnecessary copying 2024-05-22 23:19:01 -05:00
gary ddeca461ac [studio,keel] Make fileChanged emit UUID as well as path, add uuidUrlToUuid 2024-05-22 23:17:28 -05:00
gary 1988e785e6 [jasper/world] Cleanup 2024-05-22 23:15:55 -05:00
gary 355f583382 [ox/std] Add IntegerRange_c 2024-05-22 23:14:06 -05:00
gary 42d893b38f [ox/std] Fix Vector insert functions 2024-05-22 23:13:52 -05:00
gary f920748e19 [jasper] Fixes for Studio changes, make EditWorldSizeCommand merge
Build / build (push) Successful in 3m13s
2024-05-22 02:12:46 -05:00
gary 3c593b8d58 [studio] Make UndoCommand::mergeWith take a reference 2024-05-22 02:11:58 -05:00
gary a5229b7a34 [nostalgia/core/gba] Fix build
Build / build (push) Successful in 3m9s
2024-05-22 00:41:07 -05:00
gary 299a91fd66 [jasper/world]/studio] Make World refer to obj sets with UUIDs
Build / build (push) Failing after 30s
2024-05-22 00:37:03 -05:00
gary 8e9274a84b [studio] Add NoChangeException 2024-05-22 00:35:20 -05:00
gary 5e436c56fc [keel] Add/cleanup UUID/path lookup functions 2024-05-22 00:32:49 -05:00
gary e5bd44cb78 [nostalgia/core] Add tileColumns and tileRows functions 2024-05-22 00:31:10 -05:00
gary 3ba04db2fb [ox/std] Fix some Windows warnings 2024-05-22 00:26:56 -05:00
gary 0ea99d2577 [glutils] Fix type conversion that happened on Windows 2024-05-22 00:26:03 -05:00
gary 7b279886ca [glutils] Add FrameBuffer::sizef 2024-05-22 00:25:03 -05:00
gary b26601fad9 [jasper/world/studio] Fix positioning for tile placement
Build / build (push) Successful in 3m9s
2024-05-21 01:19:57 -05:00
gary 4c7fc5f9b4 [ox/std] Make MallocaPtr call destructor
Build / build (push) Successful in 3m10s
2024-05-20 02:46:19 -05:00
gary abba35d64e [jasper/world/studio] Add tile placement in world editing
Build / build (push) Successful in 3m11s
2024-05-20 02:17:29 -05:00
gary 3d2b3da7f5 [ox/std] Make Point and Size members int32_t 2024-05-20 02:06:27 -05:00
gary c772f5de25 [jasper] Add cmake-build-* to .gitignore
Build / build (push) Successful in 3m8s
2024-05-19 22:17:40 -05:00
gary 49e5b17ff4 [studio/modlib] Cleanup 2024-05-19 22:15:54 -05:00
gary cb30e36227 [ox/std] Add SmallMap::pairs(), SmallMap model 2024-05-19 22:15:13 -05:00
gary 9296076ec6 [ox/std] Add operator-> to SpanIterator 2024-05-19 22:14:28 -05:00
gary b290fa5745 [glutils] Add size function to FrameBuffer 2024-05-19 22:13:57 -05:00
gary c82324d769 [ox/std] Add missing typenames
Build / build (push) Successful in 3m6s
2024-05-18 13:01:06 -05:00
gary e10d59ed1f Merge commit 'b66cef7127e97269fc6072a6f66ccc08990f6d2e' 2024-05-18 12:17:23 -05:00
gary b66cef7127 Squashed 'deps/nostalgia/' changes from 7233da75..eed115b2
eed115b2 [keel] Fix a GCC break

git-subtree-dir: deps/nostalgia
git-subtree-split: eed115b2876124c9976d914313dac0f87fee8570
2024-05-18 12:17:23 -05:00
gary 1b6248545b Merge commit 'f48824793cfce315971fe2e699ece198c7a79407' 2024-05-11 02:09:10 -05:00
gary f48824793c Squashed 'deps/nostalgia/' changes from 17f28d43..7233da75
7233da75 [ox/std] Remove dedicated keys array from SmallMap
30797c71 [ox/std] Add small sz option to SmallMap
e8041121 [ox/std] Add missing oxExpect to timeMapStrToUuid
d054528e [ox/std] Remove empty if from SmallMap
09d840cf [ox/std] Add some functions for comparing HashMap and SmallMap
aeb1ef3b [ox/std] Cleanup SmallMap, make it easier to make potential changes
b66f61c2 [ox/std] Add hash function for UUID
b089bf46 [ox/std] Optimize Array compare
cd60c4ab [ox/std] Fix bugs in HashMap and SmallMap
d1845448 [ox/std] Add == and != operators to UUID
c4f6ee00 [nostalgia,olympic] Make performPackTransforms update type id when needed

git-subtree-dir: deps/nostalgia
git-subtree-split: 7233da75eaaea055ed0486895fc85606db86d0f4
2024-05-11 02:09:10 -05:00
gary 7203913b11 Merge commit '1e041bd2ebfe5ace7bed3906faf60345aa98a8bc' 2024-05-10 02:21:42 -05:00
gary 1e041bd2eb Squashed 'deps/nostalgia/' changes from f624c720..17f28d43
17f28d43 [ox/clargs] Replace C string with StringView
043df533 [ox] Cleanup string len handling
bec75d2e [ox/std] Fix memory leak in Vector

git-subtree-dir: deps/nostalgia
git-subtree-split: 17f28d43d12c12389d409fec1c7e322af5335855
2024-05-10 02:21:42 -05:00
gary f0944e2372 Merge commit '420fa96463f59c4a4a7cd66b16b0ad01ab0d55e6' 2024-05-08 23:55:07 -05:00
gary 420fa96463 Squashed 'deps/nostalgia/' changes from 47a6a410..f624c720
f624c720 [studio] Fix broken readClaw call
204e5bbf [ox/std] Add SmallMap
1ecf197a [nostalgia] Remove .idea directory
74a8a7d7 [ox/std] Remove incomplete writeF32toa
331f7212 [olympic,nostalgia] Cleanup
63486c23 [ox] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: f624c720f9dcc9b44943269adb54d32095bc0e04
2024-05-08 23:55:07 -05:00
gary c2b91d28df [studio] Add missing include
Build / build (push) Successful in 3m16s
2024-05-06 22:27:20 -05:00
gary bd416f82e2 Squashed 'deps/nostalgia/' changes from 227f3cd9..47a6a410
47a6a410 [ox/std] Update Vector memory map for preloader
d82c0822 [buildcore] Add error message to pybb debug for missing debugger

git-subtree-dir: deps/nostalgia
git-subtree-split: 47a6a410c4baabf8700bd271a303232dd2e0d3e9
2024-05-03 23:42:00 -05:00
gary cff0ff94b2 Merge commit 'bd416f82e25f1b710ab2b7890274571dd3fcd53d' 2024-05-03 23:42:00 -05:00
gary 40aa69c2c8 [jasper] Enable C++23 2024-05-03 23:02:29 -05:00
gary 336665d1bd [jasper] Add .pyenv to .gitignore 2024-05-03 23:02:00 -05:00