Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 89915ccd66 Merge commit 'd84c4980b2ec51a5f774229e715c361ec4096546' master gary 2026-01-25 23:53:51 -06:00
• d84c4980b2 Squashed 'deps/nostalgia/' changes from 63d0abaa..53aea973 gary 2026-01-25 23:53:51 -06:00
• 9e82bf6489 Merge commit '5fc3d23a9783e7c424d9cdb0dc50f3ba3abb427b' gary 2025-11-23 01:17:29 -06:00
• 5fc3d23a97 Squashed 'deps/nostalgia/' changes from 671fa54f..63d0abaa gary 2025-11-23 01:17:29 -06:00
• a53d1f87ee [Makefile] Add targets for build-pack and build-gba-player, update pkg-gba target to use them gary 2025-10-01 00:30:41 -05:00
• 7b5c760974 [ox/std] Ignore broken GCC warning gary 2025-09-20 13:54:58 -05:00
• 53446cfa1d Merge commit '5384d8c83bd449618b0ab318877fd967cb1f034f' gary 2025-09-10 23:48:49 -05:00
• 5384d8c83b Squashed 'deps/nostalgia/' changes from 31b39982..671fa54f gary 2025-09-10 23:48:49 -05:00
• 6a0f57994c Merge commit '6b0a56d5d66032c4d150c76c2b6a537930a5c5fa' gary 2025-08-01 02:53:02 -05:00
• 6b0a56d5d6 Squashed 'deps/nostalgia/' changes from e38b85b4..31b39982 gary 2025-08-01 02:53:02 -05:00
• 3aac345637 Merge commit 'b67b95767b7bfcd5f618ebc8e14ddbc83edcbe36' gary 2025-07-31 00:41:06 -05:00
• b67b95767b Squashed 'deps/nostalgia/' changes from f7c3c02c..e38b85b4 gary 2025-07-31 00:41:06 -05:00
• 8aea7c2ecf [nostalgia/gfx] Add lists for file extensions gary 2025-07-31 00:39:55 -05:00
• e9a7fb1ec8 [ox/std] Fix MSVC build gary 2025-07-31 00:38:26 -05:00
• 084baa6005 Merge commit '375388c0f16a0de1b16575578ad49e8318a1c80f' gary 2025-07-30 01:51:46 -05:00
• 375388c0f1 Squashed 'deps/nostalgia/' changes from e27eee50..f7c3c02c gary 2025-07-30 01:51:46 -05:00
• b1f912445d Merge commit '1bfb7f99c215e2c74556bd3281f44962b8faaa96' gary 2025-07-30 00:42:42 -05:00
• 1bfb7f99c2 Squashed 'deps/nostalgia/' changes from c7bc2a95..e27eee50 gary 2025-07-30 00:40:03 -05:00
• 10db939d62 [nostalgia/gfx/studio] Make editors use Project::loadObj for their primary assets gary 2025-07-30 00:37:59 -05:00
• 553797fdbd [studio] Add File -> Reload Project menu item gary 2025-07-30 00:37:23 -05:00
• fb0cd99d8c [keel] Make keel attempt to delete all existing assets when FS is changed gary 2025-07-30 00:36:56 -05:00
• a372814e3c [ox/std] Fix UPtr::reset to conform to unique_ptr::reset gary 2025-07-30 00:29:34 -05:00
• ceea6c7b27 [nostalgia/player] Fix build gary 2025-07-25 22:54:43 -05:00
• 7f6e734026 [jasper/world/studio] Cleanup gary 2025-07-25 22:51:14 -05:00
• 2863874ae0 [jasper/project] Fill out more facets of player assets gary 2025-07-25 22:51:02 -05:00
• d0277a43fc [jasper/world/studio] Rename string len() functions to size() gary 2025-07-25 22:49:35 -05:00
• aa875e9be2 [nostalgia,olympic] Rename string len() functions to size() gary 2025-07-25 22:48:08 -05:00
• b126a3a859 [ox/std] Rename string len() functions to size() gary 2025-07-25 22:47:56 -05:00
• 90613184e0 [jasper] Add make loc command gary 2025-07-25 22:45:14 -05:00
• f1d4c20c88 Merge commit '8a74e044dc5fa44ba10dbbf7d2812c7070ff4f7c' gary 2025-07-25 00:32:02 -05:00
• 8a74e044dc Squashed 'deps/nostalgia/' changes from fae1e73e..c7bc2a95 gary 2025-07-25 00:32:02 -05:00
• 6a7226ae68 [jasper/world/studio] Fix build gary 2025-07-24 02:02:46 -05:00
• 86860cf27b Merge commit 'dceeaaa9302b7e9ce85fa773fc187bc593f3c93c' gary 2025-07-24 01:58:27 -05:00
• dceeaaa930 Squashed 'deps/nostalgia/' changes from 671b8eda..fae1e73e gary 2025-07-24 01:58:27 -05:00
• 6f80f634b0 [jasper/world/keel] Make convertWorldDocToWorldStatic take a const src gary 2025-07-23 00:42:41 -05:00
• 99ee44b838 [keel] Make type converters work with functions that take const src arg gary 2025-07-23 00:41:33 -05:00
• be7dd92971 Merge commit 'b0726568df6aaa37390906ca44ff1eee11735f98' gary 2025-06-29 17:34:57 -05:00
• b0726568df Squashed 'deps/nostalgia/' changes from f847289b..671b8eda gary 2025-06-29 17:33:27 -05:00
• d98d78890a [jasper/world] Fix WorldObjectSetEditor to handle .ng and .nts file extensions gary 2025-06-25 21:31:28 -05:00
• 43efcbf59f [nostalgia,studio] Add FileExts_TileSheet const, and corresponding FilePickerPopup constructor gary 2025-06-25 21:30:49 -05:00
• 07e223937b [ox/std] Fix StringLiteral::operator= to work with DevkitARM gary 2025-06-25 21:29:41 -05:00
• f1ad8567f3 [nostalgia/gfx] Add isTileSheet function for checking paths against both file extensions gary 2025-06-25 21:03:45 -05:00
• 2c8a8a4e9f Merge commit '9b5f7886cadc5c3dc826d00fa5b2e71696151dfd' gary 2025-06-23 20:49:01 -05:00
• 9b5f7886ca Squashed 'deps/nostalgia/' changes from 37cfa927..f847289b gary 2025-06-23 20:49:01 -05:00
• d4201a7183 Merge commit '6bbcae10cc7b21b73171ec0ff196f4baf6304404' gary 2025-06-21 14:29:47 -05:00
• 6bbcae10cc Squashed 'deps/nostalgia/' changes from 857587c1..37cfa927 gary 2025-06-21 14:29:47 -05:00
• ba524fc733 Merge commit '7371df429534f264c179684412f6197f7968ebfa' gary 2025-06-21 08:48:13 -05:00
• 7371df4295 Squashed 'deps/nostalgia/' changes from e78c4050..857587c1 gary 2025-06-21 08:48:13 -05:00
• 9b57d61ed0 [jasper/world] Update coding style gary 2025-06-19 21:25:05 -05:00
• a32a0a067a Merge commit '7688c05bac8c20bc267cae62ec78d55e5d0c493b' gary 2025-05-31 02:14:15 -05:00
• 7688c05bac Squashed 'deps/nostalgia/' changes from e1cfcc8b..e78c4050 gary 2025-05-31 02:14:15 -05:00
• 8173c95fc5 [jasper/world/studio] Simplify Person template gary 2025-05-31 00:31:46 -05:00
• e5eafba951 [jasper/project] Flesh out side view of player gary 2025-05-30 23:39:29 -05:00
• b6f1bdbbcd Merge commit '47eee1d56d591e3631d16e95a78ea3629ee312ee' gary 2025-05-30 23:38:53 -05:00
• 47eee1d56d Squashed 'deps/nostalgia/' changes from 8419b137..e1cfcc8b gary 2025-05-30 23:38:53 -05:00
• b27ec952f0 [jasper/project] Exclude project files from autocrlf gary 2025-05-24 01:52:20 -05:00
• 992d6c2291 [jasper/world/studio] Headerize config file gary 2025-05-24 01:49:00 -05:00
• 7ed540a583 [jasper/world/studio] Update for turbine change gary 2025-05-24 01:45:20 -05:00
• 50dbf02ad9 Merge commit '08236fc790e711afe886b6ef545511d35e4e5c6c' gary 2025-05-24 01:44:07 -05:00
• 08236fc790 Squashed 'deps/nostalgia/' changes from 312097a7..8419b137 gary 2025-05-24 01:44:07 -05:00
• 6f380d817c [jasper/project] Remove DS_Store file gary 2025-05-23 22:21:25 -05:00
• c06d3c6131 [jasper/project] Add new type descriptors gary 2025-05-23 03:24:23 -05:00
• 2d9f39000f Merge commit 'e90dd887477452922f783535edb3d4c55e9a0d2c' gary 2025-05-23 03:23:17 -05:00
• e90dd88747 Squashed 'deps/nostalgia/' changes from cb304ecf..312097a7 gary 2025-05-23 03:23:17 -05:00
• 935ddb87fd [nostalgia/gfx/studio] Cleanup gary 2025-05-17 23:35:10 -05:00
• d10efbdcba [jasper/world/studio] Use type specific navigateTo functions gary 2025-05-17 23:27:53 -05:00
• ebef57a28b [nostalgia/gfx/studio] Add type specific navigateTo functions gary 2025-05-17 23:26:23 -05:00
• 0e9a8d7202 [jasper] Fix build gary 2025-05-17 23:08:16 -05:00
• 8c005db67f [jasper/world] Make World::setupDisplay clear CBBs gary 2025-05-17 17:49:18 -05:00
• 5c9ab7ae08 Merge commit 'a4a00c99d05441f5db491e06186039f817cb5c81' gary 2025-05-17 17:48:31 -05:00
• a4a00c99d0 Squashed 'deps/nostalgia/' changes from 3ccadba2..cb304ecf gary 2025-05-17 17:48:31 -05:00
• 2cb6ab87d9 Merge commit 'bf686590afc88aaa9fe3b0a202f5afe0553154c1' gary 2025-05-16 21:22:49 -05:00
• bf686590af Squashed 'deps/nostalgia/' changes from 00e52b64..3ccadba2 gary 2025-05-16 21:22:49 -05:00
• 61f8784587 [jasper] Add pkg-mac command to Makefile gary 2025-05-15 22:28:58 -05:00
• 3b2d04003f Merge commit 'e2ca6389a9ffdfc23325faf7d73779887917680d' gary 2025-05-15 22:27:30 -05:00
• e2ca6389a9 Squashed 'deps/nostalgia/' changes from 0de428a2..00e52b64 gary 2025-05-15 22:27:30 -05:00
• 9123a328ac [jasper/core] Cleanup gary 2025-05-15 21:52:29 -05:00
• 67108e58de [jasper/world/studio/worldobjectset] Fix navigation handler to load appropriate obj gary 2025-05-15 21:35:57 -05:00
• dd266b23b2 [jasper/world] Simplify WorldEditor - remove ObjSet selector gary 2025-05-15 21:29:16 -05:00
• b7aff140bf [jasper/world] Add navigateTo handling to editors gary 2025-05-15 20:41:44 -05:00
• 6e1ff6ddef [nostalgia/gfx] Add navigateTo handler to TileSheetEditor gary 2025-05-15 20:39:50 -05:00
• d848f78fc9 [studio/modlib] Give navigateTo a default argument gary 2025-05-15 20:39:01 -05:00
• 75c99e59f5 [studio/applib] Make navigateTo handle UUID paths gary 2025-05-15 20:38:27 -05:00
• 545fc83cab [ox/std] Add StringParam(IString const&) constructor gary 2025-05-15 20:37:44 -05:00
• 838546c4f9 Merge commit '71b1e79d61c1530fc6a19201600623e2b0394163' gary 2025-05-14 22:31:06 -05:00
• 71b1e79d61 Squashed 'deps/nostalgia/' changes from 26fe266b..0de428a2 gary 2025-05-14 22:31:06 -05:00
• 25ff7ef479 [jasper/project] Add back TileSheets gary 2025-05-07 19:50:59 -05:00
• 36d95d5a76 Merge commit '8e033b2460904a2ac56e8a40e6293784ad981c78' gary 2025-05-07 01:20:37 -05:00
• 8e033b2460 Squashed 'deps/nostalgia/' changes from 9676ea59..26fe266b gary 2025-05-07 01:20:37 -05:00
• c7bfcd1647 [jasper/project] Remove ng files gary 2025-05-07 00:18:31 -05:00
• 5c125bda26 [jasper/world] Update for new Olympic changes gary 2025-05-07 00:15:14 -05:00
• 62a3066c7c Merge commit 'ce53be92716b0f5201882d6959c398b61c6cc93c' gary 2025-05-07 00:12:52 -05:00
• ce53be9271 Squashed 'deps/nostalgia/' changes from 89ae226b..9676ea59 gary 2025-05-07 00:11:20 -05:00
• d4d6b1ba35 [jasper] Add generate-studio-rsrc to Makefile gary 2025-04-17 20:20:14 -05:00
• 311a25e90d [jasper] Fixes for Olympic update gary 2025-04-17 20:20:08 -05:00
• e2452ab433 Merge commit 'ec6cf92c4763be5933ee6debbf97bce25b9fcfc9' gary 2025-04-17 20:12:48 -05:00
• ec6cf92c47 Squashed 'deps/nostalgia/' changes from 3fe62464..89ae226b gary 2025-04-17 20:12:48 -05:00
• fa3617a554 [jasper/world/keel] Cleanup gary 2025-04-16 20:37:48 -05:00
• 26d3dce299 [jasper/studio] Update icons gary 2025-04-16 20:12:59 -05:00
• 9ba01b8377 [olympic] Improve error handling in file-to-cpp gary 2025-04-16 20:11:28 -05:00