Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 8173c95fc5 [jasper/world/studio] Simplify Person template master Gary Talent 2025-05-31 00:31:46 -05:00
• e5eafba951 [jasper/project] Flesh out side view of player Gary Talent 2025-05-30 23:39:29 -05:00
• b6f1bdbbcd Merge commit '47eee1d56d591e3631d16e95a78ea3629ee312ee' Gary Talent 2025-05-30 23:38:53 -05:00
• 47eee1d56d Squashed 'deps/nostalgia/' changes from 8419b137..e1cfcc8b Gary Talent 2025-05-30 23:38:53 -05:00
• b27ec952f0 [jasper/project] Exclude project files from autocrlf Gary Talent 2025-05-24 01:52:20 -05:00
• 992d6c2291 [jasper/world/studio] Headerize config file Gary Talent 2025-05-24 01:49:00 -05:00
• 7ed540a583 [jasper/world/studio] Update for turbine change Gary Talent 2025-05-24 01:45:20 -05:00
• 50dbf02ad9 Merge commit '08236fc790e711afe886b6ef545511d35e4e5c6c' Gary Talent 2025-05-24 01:44:07 -05:00
• 08236fc790 Squashed 'deps/nostalgia/' changes from 312097a7..8419b137 Gary Talent 2025-05-24 01:44:07 -05:00
• 6f380d817c [jasper/project] Remove DS_Store file Gary Talent 2025-05-23 22:21:25 -05:00
• c06d3c6131 [jasper/project] Add new type descriptors Gary Talent 2025-05-23 03:24:23 -05:00
• 2d9f39000f Merge commit 'e90dd887477452922f783535edb3d4c55e9a0d2c' Gary Talent 2025-05-23 03:23:17 -05:00
• e90dd88747 Squashed 'deps/nostalgia/' changes from cb304ecf..312097a7 Gary Talent 2025-05-23 03:23:17 -05:00
• 935ddb87fd [nostalgia/gfx/studio] Cleanup Gary Talent 2025-05-17 23:35:10 -05:00
• d10efbdcba [jasper/world/studio] Use type specific navigateTo functions Gary Talent 2025-05-17 23:27:53 -05:00
• ebef57a28b [nostalgia/gfx/studio] Add type specific navigateTo functions Gary Talent 2025-05-17 23:26:23 -05:00
• 0e9a8d7202 [jasper] Fix build Gary Talent 2025-05-17 23:08:16 -05:00
• 8c005db67f [jasper/world] Make World::setupDisplay clear CBBs Gary Talent 2025-05-17 17:49:18 -05:00
• 5c9ab7ae08 Merge commit 'a4a00c99d05441f5db491e06186039f817cb5c81' Gary Talent 2025-05-17 17:48:31 -05:00
• a4a00c99d0 Squashed 'deps/nostalgia/' changes from 3ccadba2..cb304ecf Gary Talent 2025-05-17 17:48:31 -05:00
• 2cb6ab87d9 Merge commit 'bf686590afc88aaa9fe3b0a202f5afe0553154c1' Gary Talent 2025-05-16 21:22:49 -05:00
• bf686590af Squashed 'deps/nostalgia/' changes from 00e52b64..3ccadba2 Gary Talent 2025-05-16 21:22:49 -05:00
• 61f8784587 [jasper] Add pkg-mac command to Makefile Gary Talent 2025-05-15 22:28:58 -05:00
• 3b2d04003f Merge commit 'e2ca6389a9ffdfc23325faf7d73779887917680d' Gary Talent 2025-05-15 22:27:30 -05:00
• e2ca6389a9 Squashed 'deps/nostalgia/' changes from 0de428a2..00e52b64 Gary Talent 2025-05-15 22:27:30 -05:00
• 9123a328ac [jasper/core] Cleanup Gary Talent 2025-05-15 21:52:29 -05:00
• 67108e58de [jasper/world/studio/worldobjectset] Fix navigation handler to load appropriate obj Gary Talent 2025-05-15 21:35:57 -05:00
• dd266b23b2 [jasper/world] Simplify WorldEditor - remove ObjSet selector Gary Talent 2025-05-15 21:29:16 -05:00
• b7aff140bf [jasper/world] Add navigateTo handling to editors Gary Talent 2025-05-15 20:41:44 -05:00
• 6e1ff6ddef [nostalgia/gfx] Add navigateTo handler to TileSheetEditor Gary Talent 2025-05-15 20:39:50 -05:00
• d848f78fc9 [studio/modlib] Give navigateTo a default argument Gary Talent 2025-05-15 20:39:01 -05:00
• 75c99e59f5 [studio/applib] Make navigateTo handle UUID paths Gary Talent 2025-05-15 20:38:27 -05:00
• 545fc83cab [ox/std] Add StringParam(IString const&) constructor Gary Talent 2025-05-15 20:37:44 -05:00
• 838546c4f9 Merge commit '71b1e79d61c1530fc6a19201600623e2b0394163' Gary Talent 2025-05-14 22:31:06 -05:00
• 71b1e79d61 Squashed 'deps/nostalgia/' changes from 26fe266b..0de428a2 Gary Talent 2025-05-14 22:31:06 -05:00
• 25ff7ef479 [jasper/project] Add back TileSheets Gary Talent 2025-05-07 19:50:59 -05:00
• 36d95d5a76 Merge commit '8e033b2460904a2ac56e8a40e6293784ad981c78' Gary Talent 2025-05-07 01:20:37 -05:00
• 8e033b2460 Squashed 'deps/nostalgia/' changes from 9676ea59..26fe266b Gary Talent 2025-05-07 01:20:37 -05:00
• c7bfcd1647 [jasper/project] Remove ng files Gary Talent 2025-05-07 00:18:31 -05:00
• 5c125bda26 [jasper/world] Update for new Olympic changes Gary Talent 2025-05-07 00:15:14 -05:00
• 62a3066c7c Merge commit 'ce53be92716b0f5201882d6959c398b61c6cc93c' Gary Talent 2025-05-07 00:12:52 -05:00
• ce53be9271 Squashed 'deps/nostalgia/' changes from 89ae226b..9676ea59 Gary Talent 2025-05-07 00:11:20 -05:00
• d4d6b1ba35 [jasper] Add generate-studio-rsrc to Makefile Gary Talent 2025-04-17 20:20:14 -05:00
• 311a25e90d [jasper] Fixes for Olympic update Gary Talent 2025-04-17 20:20:08 -05:00
• e2452ab433 Merge commit 'ec6cf92c4763be5933ee6debbf97bce25b9fcfc9' Gary Talent 2025-04-17 20:12:48 -05:00
• ec6cf92c47 Squashed 'deps/nostalgia/' changes from 3fe62464..89ae226b Gary Talent 2025-04-17 20:12:48 -05:00
• fa3617a554 [jasper/world/keel] Cleanup Gary Talent 2025-04-16 20:37:48 -05:00
• 26d3dce299 [jasper/studio] Update icons Gary Talent 2025-04-16 20:12:59 -05:00
• 9ba01b8377 [olympic] Improve error handling in file-to-cpp Gary Talent 2025-04-16 20:11:28 -05:00
• 1d50cc1f98 [jasper/studio] Add embedded window icons Gary Talent 2025-04-16 19:54:33 -05:00
• 1e875f8dd7 Merge commit '09b4a705a9251d54e797eb75db1f3d4687829a24' Gary Talent 2025-04-16 19:48:37 -05:00
• 09b4a705a9 Squashed 'deps/nostalgia/' changes from ab11b885..3fe62464 Gary Talent 2025-04-16 19:48:37 -05:00
• 163819af0f Merge commit '6bcd6deb76a946e5e4f58c865d12316b7dc4d2a6' Gary Talent 2025-03-27 00:22:15 -05:00
• 6bcd6deb76 Squashed 'deps/nostalgia/' changes from 646ab128..ab11b885 Gary Talent 2025-03-27 00:22:14 -05:00
• c4e6b833f0 Merge commit '54de52e6c55126b4bfd3843fbeac7a1b57cd4e10' Gary Talent 2025-02-24 21:48:11 -06:00
• 54de52e6c5 Squashed 'deps/nostalgia/' changes from fbebf4ef..646ab128 Gary Talent 2025-02-24 21:48:11 -06:00
• 0e27cec0f4 [studio] Cleanup Gary Talent 2025-02-22 19:51:55 -06:00
• 9c63b31df6 Merge commit 'bceb2acc644595f5109d222cc974516a231cfadd' Gary Talent 2025-02-22 01:01:21 -06:00
• bceb2acc64 Squashed 'deps/nostalgia/' changes from d0a32e24..fbebf4ef Gary Talent 2025-02-22 01:01:21 -06:00
• 49cc2f492a [nostalgia,studio] Fix crash that occurred when navigating to file that is not already open Gary Talent 2025-02-20 23:57:02 -06:00
• 77d526d6ac Merge commit '611df32bdb02e80feecba9e0084a9fa723913c0d' Gary Talent 2025-02-20 23:38:27 -06:00
• 611df32bdb Squashed 'deps/nostalgia/' changes from 26fc5565..d0a32e24 Gary Talent 2025-02-20 23:38:27 -06:00
• 1720328735 [jasper] Update NostalgiaCore references Gary Talent 2025-02-20 20:14:31 -06:00
• 7a890653ee Merge commit '4e94c925686cdda4b1ac777045dd7a17c7dc0329' Gary Talent 2025-02-20 20:11:03 -06:00
• 4e94c92568 Squashed 'deps/nostalgia/' changes from 2a8e3c2d..26fc5565 Gary Talent 2025-02-20 20:11:03 -06:00
• b6826f4aa4 [ox/std] Make bounds checking its own option enable-able in release builds Gary Talent 2025-02-20 20:05:07 -06:00
• f83bf5bd3b [ox/fs] Restructure stat error handling to make easier to debug Gary Talent 2025-02-19 21:47:47 -06:00
• c2065fe988 [keel] Fix loading assets by path Gary Talent 2025-02-19 21:47:00 -06:00
• 04b7204ed8 Merge commit 'a6b9657268eb3fe139b0c22df27c2cb2efc0013c' Gary Talent 2025-02-19 00:34:26 -06:00
• a6b9657268 Squashed 'deps/nostalgia/' changes from 804d78e1..2a8e3c2d Gary Talent 2025-02-19 00:34:26 -06:00
• fb98d49120 [jasper] Change builder type to olympic Gary Talent 2025-02-07 20:59:01 -06:00
• ebf524e055 Merge commit 'c42adc290cd8a27d01bb6d9877032dd2c963a4b7' Gary Talent 2025-02-01 22:55:46 -06:00
• c42adc290c Squashed 'deps/nostalgia/' changes from be518387..804d78e1 Gary Talent 2025-02-01 22:55:46 -06:00
• 5b0bae9712 [jasper/world/studio] Update for Studio changes Gary Talent 2025-01-26 15:44:34 -06:00
• e86c58a087 Merge commit 'ab760b064fd6a302bad13274e0e02b2b2c957b67' Gary Talent 2025-01-26 15:42:50 -06:00
• ab760b064f Squashed 'deps/nostalgia/' changes from 7e3e0461..be518387 Gary Talent 2025-01-26 15:42:50 -06:00
• 0c909e798c Merge commit '897a59cdad66e593fd45eece9414d8414fa7f1ae' Gary Talent 2025-01-23 23:51:13 -06:00
• 897a59cdad Squashed 'deps/nostalgia/' changes from e40b1124..7e3e0461 Gary Talent 2025-01-23 23:51:13 -06:00
• f27c36487c [studio] Add filepickerpopup.hpp to studio.hpp Gary Talent 2025-01-23 22:19:59 -06:00
• 4bcbcf76d6 [jasper/world/studio] Use FilePickerPopup for ObjSet TileSheet Gary Talent 2025-01-23 22:19:19 -06:00
• cf765d2745 Merge commit '2fbeb8c685a0904ce09d5786f58c25f696306255' Gary Talent 2025-01-23 21:58:02 -06:00
• 2fbeb8c685 Squashed 'deps/nostalgia/' changes from 161194c8..e40b1124 Gary Talent 2025-01-23 21:58:02 -06:00
• bd461ebeeb [jasper/world/studio] Integrate new FilePickerPopup Gary Talent 2025-01-23 21:52:35 -06:00
• 67c796ec04 Merge commit 'af93f94c679456e697ec438bad9cdfdfcbed1eb8' Gary Talent 2025-01-23 21:35:40 -06:00
• af93f94c67 Squashed 'deps/nostalgia/' changes from ff666eda..161194c8 Gary Talent 2025-01-23 21:35:40 -06:00
• 1aed9b2d12 Merge commit 'dff9f81e073bb994d5ce96a6eaa1bfa547f1fdf4' Gary Talent 2025-01-23 21:21:58 -06:00
• dff9f81e07 Squashed 'deps/nostalgia/' changes from 1cc1d561..ff666eda Gary Talent 2025-01-23 21:20:06 -06:00
• 1388bf9c88 [studio] Fix NewMenu to track prev stage correctly when going back two stages Gary Talent 2025-01-23 21:13:58 -06:00
• 356dbcfe82 [jasper/studio] Fix build Gary Talent 2025-01-22 23:37:56 -06:00
• d96453fa64 [studio] Fix prev tracking Gary Talent 2025-01-22 23:37:44 -06:00
• c0fc18cee0 [jasper/world/studio] Change Person TS template type to V5 Gary Talent 2025-01-22 23:22:01 -06:00
• d4a691bcc2 Merge commit '3fddeeee3e14669f4c8a139162bf9a548716a108' Gary Talent 2025-01-22 23:13:07 -06:00
• 3fddeeee3e Squashed 'deps/nostalgia/' changes from 1af4da43..1cc1d561 Gary Talent 2025-01-22 23:13:07 -06:00
• b00654e7a3 Merge commit '6fdf744dd2f7130ef13679fd82068fc060a7a86a' Gary Talent 2025-01-21 22:58:38 -06:00
• 6fdf744dd2 Squashed 'deps/nostalgia/' changes from f987b02c..1af4da43 Gary Talent 2025-01-21 22:58:02 -06:00
• c4805f1012 [nostalgia] Add release notes document Gary Talent 2025-01-21 22:45:55 -06:00
• dabff6ed89 [nostalgia/gfx] Make TileSheetV5::defaultPalette a string instead of FileAddress Gary Talent 2025-01-21 22:44:55 -06:00
• eb9132d3a9 [ox/std] Change ox::String::operator[](size_t) const return a reference Gary Talent 2025-01-21 22:43:57 -06:00
• 25ca985869 [nostalgia/gfx] Cleanup, add PaletteV5, restore mistakenly removed function Gary Talent 2025-01-21 22:17:13 -06:00
• 814923186b [ox/oc] Fix integer read for signed/unsigned Gary Talent 2025-01-21 22:15:36 -06:00