Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 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
• 610c0c03ce [jasper/world] Fix build Gary Talent 2025-01-21 02:47:31 -06:00
• fbd42e74a6 Merge commit 'ec49463217cb6822254fd230426135c0b52da547' Gary Talent 2025-01-21 02:25:27 -06:00
• ec49463217 Squashed 'deps/nostalgia/' changes from 672b92b3..f987b02c Gary Talent 2025-01-21 02:25:27 -06:00
• c33ffa7b36 [jasper] Upgrade to newer Nostalgia Gary Talent 2025-01-20 03:18:30 -06:00
• 2eb87c06f2 Merge commit '1e92e0d1341619f6652e9d37f1896d781c3e268c' Gary Talent 2025-01-20 03:14:04 -06:00
• 1e92e0d134 Squashed 'deps/nostalgia/' changes from 830f8fe3..672b92b3 Gary Talent 2025-01-20 03:14:04 -06:00
• 9cd67ad12b Merge commit '38777cfac8868b3628332090260710d5ac26aba0' Gary Talent 2025-01-20 02:15:45 -06:00
• 38777cfac8 Squashed 'deps/nostalgia/' changes from 2016f6e6..830f8fe3 Gary Talent 2025-01-20 02:15:45 -06:00
• 20722ed0fd [jasper/world/studio] Add input filtering for when popup is open Gary Talent 2025-01-20 02:12:03 -06:00
• 765d6d95f5 [nostalgia,studio] Proper fix for input filtering Gary Talent 2025-01-20 02:10:48 -06:00
• 67901ff748 [studio] Cleanup Gary Talent 2025-01-20 01:34:00 -06:00
• c6fbcd8151 [nostalgia/core/studio/paletteeditor] Ignore keyboard input when popup is open Gary Talent 2025-01-20 01:33:23 -06:00
• 34325794ee [studio] Cleanup Gary Talent 2025-01-20 00:16:16 -06:00
• c0ac9869bf Merge commit '8e0b6ffbabb10f8a6e9ad7e9f07e0ba1d039a02e' Gary Talent 2025-01-19 20:18:56 -06:00
• 8e0b6ffbab Squashed 'deps/nostalgia/' changes from 6bc629e0..2016f6e6 Gary Talent 2025-01-19 20:18:56 -06:00
• 27a2c8b47c [jasper/world] Cleanup Gary Talent 2025-01-19 20:00:27 -06:00
• b05f807cd3 [jasper/project] Update project files Gary Talent 2025-01-19 19:30:27 -06:00
• 97cf03fbb7 [jasper/world/studio] Fix WorldObjectSetEditor to reload tilesheet when it changes Gary Talent 2025-01-19 19:24:52 -06:00
• a1a2b4154e [jasper/world/studio] Cleanup Gary Talent 2025-01-19 19:12:20 -06:00
• f678c8f8fc [jasper/project] Update project files Gary Talent 2025-01-19 19:07:39 -06:00
• 78da9f526d Merge commit '7e20f7200963cd0b22f84cc46e10db12b6c13806' Gary Talent 2025-01-19 19:04:24 -06:00
• 7e20f72009 Squashed 'deps/nostalgia/' changes from 6b53eaf6..6bc629e0 Gary Talent 2025-01-19 19:03:50 -06:00
• 583cdc62b4 [nostalgia/core/studio/tilesheeteditor] Add back file type check for palette drop Gary Talent 2025-01-19 18:21:50 -06:00
• 61a0446c1d [nostalgia/core/studio/tilesheeteditor] Manually merge in changes that were lost in conflict Gary Talent 2025-01-19 18:18:52 -06:00
• 853512a0f8 Merge commit '83055a96b55399cc06af79d4991c53769ee56c64' Gary Talent 2025-01-19 18:11:38 -06:00
• 83055a96b5 Squashed 'deps/nostalgia/' changes from d68e6493..6b53eaf6 Gary Talent 2025-01-19 18:11:38 -06:00
• b18a901b95 [nostalgia/core/studio/paletteeditor] Fix crash that occurs when removing last color Gary Talent 2025-01-19 17:56:21 -06:00
• bcd62cd622 [jasper/world/studio/worldobjectseteditor] Fix file drops to check file type Gary Talent 2025-01-19 17:01:23 -06:00
• 92a549ad38 [jasper/world/studio/worldeditor] Add file drag/drop support Gary Talent 2025-01-19 16:58:28 -06:00
• 7dfbfc834b [jasper/world] Allow world to load without palettes Gary Talent 2025-01-19 16:57:21 -06:00
• fe14e0a586 [ox/std] Fix string append issues Gary Talent 2025-01-19 16:51:05 -06:00
• 17f358552a [nostalgia/core/studio/tilesheeteditor] Fix palette drop target to only take palettes Gary Talent 2025-01-19 16:49:31 -06:00
• 4d9e2ea7ac [jasper/project] Update type descriptor Gary Talent 2025-01-19 14:33:17 -06:00
• 3df4e1662e [jasper/world/studio/worldobjectseteditor] Add file drag/drop support Gary Talent 2025-01-19 14:32:41 -06:00
• ac743834d3 [applib] Fix build Gary Talent 2025-01-19 14:32:08 -06:00
• 8d6343e325 Merge commit '7b7d59cf63d77cf7ab6daf6ed7122eef97954555' Gary Talent 2025-01-19 13:39:31 -06:00
• 7b7d59cf63 Squashed 'deps/nostalgia/' changes from a3d6a58c..d68e6493 Gary Talent 2025-01-19 13:31:44 -06:00
• ebe8b1cdce [nostalgia/core/studio/paletteeditor] Fix adding page if there is no existing page Gary Talent 2025-01-18 21:29:36 -06:00
• 233c444255 [nostalgia/core] Replace ContextDeleter with safeDelete(Context*) Gary Talent 2025-01-18 20:57:15 -06:00
• 90d804dbd9 [ox/std] Drop ox:: qualifier from safeDelete function for pointee Gary Talent 2025-01-18 20:56:24 -06:00
• a5e089b6ae [jasper/world] Add World Person TileSheet template Gary Talent 2025-01-18 20:17:22 -06:00
• 0f5f41de64 [keel,studio] Add support for New Item templates Gary Talent 2025-01-18 20:16:29 -06:00
• 62ccba875a [ox/std] Add UAnyPtr Gary Talent 2025-01-18 20:11:42 -06:00
• 86ad4fae90 [nostalgia/core/studio/tilesheeteditor] Fix subsheet and palette scrolling Gary Talent 2025-01-18 20:08:09 -06:00
• 48dec919ab Merge commit '50b1ed33df6ac7ddc89187f657d2eb49cb0d5acc' Gary Talent 2025-01-17 21:58:18 -06:00
• 50b1ed33df Squashed 'deps/nostalgia/' changes from 791b7746..a3d6a58c Gary Talent 2025-01-17 21:58:18 -06:00
• 5c5632e963 [nostalgia,keel] Add ability to types Obj to Obj Gary Talent 2025-01-15 23:44:18 -06:00
• d76b514c8d [ox/model] Fix ModelTypeName_v to use requireModelTypeName Gary Talent 2025-01-15 23:34:48 -06:00
• 0c48444231 [nostalgia/core/studio] Cleanup, fix possible TileSheet fill tool failure Gary Talent 2025-01-14 23:06:12 -06:00
• e014a54af5 [keel] Add detail to preload logging Gary Talent 2025-01-14 21:20:13 -06:00
• 911a5dce60 [nostalgia/core/opengl] Cleanup Gary Talent 2025-01-14 21:18:22 -06:00
• d9f7b2ea1c [nostalgia/core] Add clearCbb functions Gary Talent 2025-01-14 21:13:42 -06:00
• 06e564652c [nostalgia/core/opengl] Cleanup memcpys Gary Talent 2025-01-14 21:11:10 -06:00