Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 0afa2b8cbd [nostalgia/core] Revert some auto formatting done by CLion... Gary Talent 2024-05-23 21:01:10 -05:00
• 18e4183623 [jasper/world/studio] Simplify EditWorldSizeCommand::mergeWith Gary Talent 2024-05-23 20:54:45 -05:00
• b51098595a [nostalgia/core/studio] Fix Subsheet width to update properly Gary Talent 2024-05-23 20:52:55 -05:00
• 648c62e745 [ox/std] Fix Linux build Gary Talent 2024-05-23 01:38:57 -05:00
• e33c4c5362 [ox/model] Fix type params in buildTypeId Gary Talent 2024-05-23 01:29:45 -05:00
• b4f08df181 [ox/std] Fix resize to set null terminator Gary Talent 2024-05-23 01:27:59 -05:00
• 47582573e5 [ox/std] Rework FileReader into StreamReader Gary Talent 2024-05-23 00:45:28 -05:00
• ded73a0b4c [jasper/world/studio] Fix WorldEditor to pull in resource updates Gary Talent 2024-05-22 23:24:08 -05:00
• 542e492830 [nostalgia/core/studio] Remove some unnecessary copying Gary Talent 2024-05-22 23:19:01 -05:00
• ddeca461ac [studio,keel] Make fileChanged emit UUID as well as path, add uuidUrlToUuid Gary Talent 2024-05-22 23:17:28 -05:00
• 1988e785e6 [jasper/world] Cleanup Gary Talent 2024-05-22 23:15:43 -05:00
• 355f583382 [ox/std] Add IntegerRange_c Gary Talent 2024-05-22 23:14:06 -05:00
• 42d893b38f [ox/std] Fix Vector insert functions Gary Talent 2024-05-22 23:13:52 -05:00
• f920748e19 [jasper] Fixes for Studio changes, make EditWorldSizeCommand merge Gary Talent 2024-05-22 02:12:46 -05:00
• 3c593b8d58 [studio] Make UndoCommand::mergeWith take a reference Gary Talent 2024-05-22 02:11:58 -05:00
• a5229b7a34 [nostalgia/core/gba] Fix build Gary Talent 2024-05-22 00:41:07 -05:00
• 299a91fd66 [jasper/world]/studio] Make World refer to obj sets with UUIDs Gary Talent 2024-05-22 00:37:03 -05:00
• 8e9274a84b [studio] Add NoChangeException Gary Talent 2024-05-22 00:35:20 -05:00
• 5e436c56fc [keel] Add/cleanup UUID/path lookup functions Gary Talent 2024-05-22 00:32:49 -05:00
• e5bd44cb78 [nostalgia/core] Add tileColumns and tileRows functions Gary Talent 2024-05-22 00:28:08 -05:00
• 3ba04db2fb [ox/std] Fix some Windows warnings Gary Talent 2024-05-22 00:26:56 -05:00
• 0ea99d2577 [glutils] Fix type conversion that happened on Windows Gary Talent 2024-05-22 00:26:03 -05:00
• 7b279886ca [glutils] Add FrameBuffer::sizef Gary Talent 2024-05-22 00:25:03 -05:00
• b26601fad9 [jasper/world/studio] Fix positioning for tile placement Gary Talent 2024-05-21 01:19:57 -05:00
• 4c7fc5f9b4 [ox/std] Make MallocaPtr call destructor Gary Talent 2024-05-20 02:46:19 -05:00
• abba35d64e [jasper/world/studio] Add tile placement in world editing Gary Talent 2024-05-20 02:07:10 -05:00
• 3d2b3da7f5 [ox/std] Make Point and Size members int32_t Gary Talent 2024-05-20 02:06:27 -05:00
• c772f5de25 [jasper] Add cmake-build-* to .gitignore Gary Talent 2024-05-19 22:17:26 -05:00
• 49e5b17ff4 [studio/modlib] Cleanup Gary Talent 2024-05-19 22:15:54 -05:00
• cb30e36227 [ox/std] Add SmallMap::pairs(), SmallMap model Gary Talent 2024-05-19 22:15:13 -05:00
• 9296076ec6 [ox/std] Add operator-> to SpanIterator Gary Talent 2024-05-19 22:14:28 -05:00
• b290fa5745 [glutils] Add size function to FrameBuffer Gary Talent 2024-05-19 22:13:57 -05:00
• c82324d769 [ox/std] Add missing typenames Gary Talent 2024-05-18 13:01:06 -05:00
• e10d59ed1f Merge commit 'b66cef7127e97269fc6072a6f66ccc08990f6d2e' Gary Talent 2024-05-18 12:17:23 -05:00
• b66cef7127 Squashed 'deps/nostalgia/' changes from 7233da75..eed115b2 Gary Talent 2024-05-18 12:17:23 -05:00
• 1b6248545b Merge commit 'f48824793cfce315971fe2e699ece198c7a79407' Gary Talent 2024-05-11 02:09:10 -05:00
• f48824793c Squashed 'deps/nostalgia/' changes from 17f28d43..7233da75 Gary Talent 2024-05-11 02:09:10 -05:00
• 7203913b11 Merge commit '1e041bd2ebfe5ace7bed3906faf60345aa98a8bc' Gary Talent 2024-05-10 02:21:42 -05:00
• 1e041bd2eb Squashed 'deps/nostalgia/' changes from f624c720..17f28d43 Gary Talent 2024-05-10 02:21:42 -05:00
• f0944e2372 Merge commit '420fa96463f59c4a4a7cd66b16b0ad01ab0d55e6' Gary Talent 2024-05-08 23:55:07 -05:00
• 420fa96463 Squashed 'deps/nostalgia/' changes from 47a6a410..f624c720 Gary Talent 2024-05-08 23:55:07 -05:00
• c2b91d28df [studio] Add missing include Gary Talent 2024-05-06 22:27:20 -05:00
• cff0ff94b2 Merge commit 'bd416f82e25f1b710ab2b7890274571dd3fcd53d' Gary Talent 2024-05-03 23:42:00 -05:00
• bd416f82e2 Squashed 'deps/nostalgia/' changes from 227f3cd9..47a6a410 Gary Talent 2024-05-03 23:42:00 -05:00
• 40aa69c2c8 [jasper] Enable C++23 Gary Talent 2024-05-03 23:02:29 -05:00
• 336665d1bd [jasper] Add .pyenv to .gitignore Gary Talent 2024-05-03 23:02:00 -05:00
• cd94dd8cd7 [jasper/world] Cleanup Gary Talent 2024-05-03 23:01:35 -05:00
• d1c44eda7f [keel] Minor optimization Gary Talent 2024-05-03 23:00:38 -05:00
• 72cdc32e71 Merge commit 'df22a1e51b411329184b3fe33cfc0b665b7b87b6' Gary Talent 2024-05-03 21:15:51 -05:00
• df22a1e51b Squashed 'deps/nostalgia/' changes from 0c0ccd1a..227f3cd9 Gary Talent 2024-05-03 21:15:51 -05:00
• f547c92a65 [jasper/world] Fix name of palBank in WorldObject model Gary Talent 2024-04-28 16:24:42 -05:00
• 4955e177c6 [jasper/world/studio] Fixes for Ox update Gary Talent 2024-04-24 23:21:01 -05:00
• 35c97cfb67 Merge commit '22e6299e90e85cb2b5ee814ebf2324b1a74d7091' Gary Talent 2024-04-24 23:12:54 -05:00
• 22e6299e90 Squashed 'deps/nostalgia/' changes from 84205879..0c0ccd1a Gary Talent 2024-04-24 23:10:33 -05:00
• eecc9da3ce [jasper] Add missing files, update for Nostalgia changes Gary Talent 2024-04-21 13:15:17 -05:00
• 26d2645174 Merge commit 'c0baf7efca0e4c3a86a018ad2564d9df7b07c133' Gary Talent 2024-04-21 13:13:26 -05:00
• c0baf7efca Squashed 'deps/nostalgia/' changes from 6a523191..84205879 Gary Talent 2024-04-21 10:33:10 -05:00
• 513e3360b5 [jasper/world/studio] Get a good start to world editor going Gary Talent 2024-04-21 10:25:44 -05:00
• 7ceee8c84d [olympic/studio] Add new ImGui util functions Gary Talent 2024-04-21 10:24:53 -05:00
• b8ba386494 [nostalgia/core/studio] Cleanup context types Gary Talent 2024-04-21 10:24:29 -05:00
• 83e4c52e2c [olympic/studio] Make studio::run static Gary Talent 2024-04-21 10:23:55 -05:00
• 4bec1e13f0 [olympic] Change TypeId building to use constexpr globals Gary Talent 2024-04-21 10:23:22 -05:00
• 52e931d8a3 [nostalgia/core/opengl] Unbind vertex arrays when done with them Gary Talent 2024-04-21 10:22:32 -05:00
• 5f0e113f10 [glutils] Remove trailing whitespace Gary Talent 2024-04-21 10:21:44 -05:00
• 24085f38e8 [ox/std] Replace ox::ignore with std::ignore Gary Talent 2024-04-13 00:35:49 -05:00
• 223c975e0c [ox/std] Cleanup Gary Talent 2024-04-13 00:10:09 -05:00
• 7439310a9e [ox/std] Fix Signed_c and Unsigned_c Gary Talent 2024-04-13 00:07:40 -05:00
• 5598d9a381 [nostalgia/core] Update pack transforms to use ModelTypeId_v Gary Talent 2024-04-10 00:03:16 -05:00
• ccf197643d [ox/model] Add constexpr ModelTypeId_v Gary Talent 2024-04-09 23:52:43 -05:00
• 70bf26b538 [ox/std] Fix sfmt constexpr problems Gary Talent 2024-04-09 23:47:18 -05:00
• 05ce318a85 [ox/std] Sort of fix custom assert Gary Talent 2024-04-09 23:46:54 -05:00
• f6910ab1f7 [ox/std] Fix some Vector constexpr problems Gary Talent 2024-04-09 23:46:12 -05:00
• 092d14d1b7 [ox/std] Add nodiscard to some string functions Gary Talent 2024-04-09 22:40:37 -05:00
• cbebbc108e [ox/std] Add ox::ignore Gary Talent 2024-04-09 22:40:20 -05:00
• 3dee350f17 Merge commit '5627a6357219246db3b23ca420360d3c8a77faa5' Gary Talent 2024-03-20 21:37:42 -05:00
• 5627a63572 Squashed 'deps/nostalgia/' changes from 04f3d6b4..6a523191 Gary Talent 2024-03-20 21:37:42 -05:00
• 27e54b8a93 Merge commit 'd6403991d49292d4f2b7d441636949472ca2b249' Gary Talent 2024-03-14 23:33:20 -05:00
• d6403991d4 Squashed 'deps/nostalgia/' changes from b97d7d99..04f3d6b4 Gary Talent 2024-03-14 23:33:20 -05:00
• a0d25a13c3 [studio/modlib] Add ig::ChildStackItem Gary Talent 2024-03-14 23:32:05 -05:00
• cf1f2c3372 [olympic/studio] Make StudioContext::ui a ref instead of ptr Gary Talent 2024-03-14 23:31:01 -05:00
• dbbdb7c79e [jasper] Fix build Gary Talent 2024-02-21 22:52:05 -06:00
• 675e1a87fe [ox/std] Make ranges predicates const refs Gary Talent 2024-02-17 11:43:25 -06:00
• 31d0ed5736 [jasper/project] Add assets Gary Talent 2024-02-12 00:13:28 -06:00
• a826c5daf2 [keel] Remove use of removed ModelValue operator Gary Talent 2024-02-11 20:35:48 -06:00
• 0e758f59b3 [ox] Remove panicing ModelValue operators Gary Talent 2024-02-11 20:35:19 -06:00
• 9ac83a9095 [ox] Make serialize and allocate Writer_c functions take refs Gary Talent 2024-02-11 19:39:29 -06:00
• 4ad295d005 Merge commit '9c712cc38ae706b021807b271899bce56c234fa5' Gary Talent 2024-02-11 17:30:45 -06:00
• 9c712cc38a Squashed 'deps/nostalgia/' changes from 4e50889b..b97d7d99 Gary Talent 2024-02-11 17:30:45 -06:00
• 4c0aa60a52 Merge commit '56f9d7a4634c9de9b09df390c4385c67ab646607' Gary Talent 2024-02-11 17:24:22 -06:00
• 56f9d7a463 Squashed 'deps/nostalgia/' changes from ee051184..4e50889b Gary Talent 2024-02-11 17:24:22 -06:00
• d9be861ec4 Merge commit 'ace68f7c1d870ed53e69c55ba53709a9425388be' Gary Talent 2024-02-04 10:21:12 -06:00
• ace68f7c1d Squashed 'deps/nostalgia/' changes from 59fa3907..ee051184 Gary Talent 2024-02-04 10:21:12 -06:00
• 4d5f1c0392 Merge commit '8e0467ca5fdb3f983738a97c17cba742a0d233fd' Gary Talent 2024-02-01 21:07:56 -06:00
• 8e0467ca5f Squashed 'deps/nostalgia/' changes from 10a12f2a..59fa3907 Gary Talent 2024-02-01 21:07:56 -06:00
• d588d822af Merge commit '0d61e5a064382a7076b62d32b25c70298ee0706e' Gary Talent 2024-01-31 23:18:13 -06:00
• 0d61e5a064 Squashed 'deps/nostalgia/' changes from 28b1c6dc..10a12f2a Gary Talent 2024-01-31 23:18:13 -06:00
• d75dead89d Merge commit '057272347486efe5046691f32f51604e3a594e6a' Gary Talent 2024-01-31 23:13:34 -06:00
• 0572723474 Squashed 'deps/nostalgia/' changes from b75bbc4d..28b1c6dc Gary Talent 2024-01-31 23:13:34 -06:00
• bc7bbb57c8 Merge commit 'cfc27a384b00388fc1ce30ac47c266ddd1f8e6f1' Gary Talent 2024-01-28 18:05:09 -06:00
• cfc27a384b Squashed 'deps/nostalgia/' changes from f128664a..b75bbc4d Gary Talent 2024-01-28 18:05:09 -06:00