Compare commits

..

5 Commits

Author SHA1 Message Date
1057099fcf [nostalgia] Update release notes
All checks were successful
Build / build (push) Successful in 1m17s
2025-06-22 01:01:46 -05:00
17577b6e8b [nostalgia/gfx/studio/tilesheet] Disable paste when nothing is selected 2025-06-22 01:01:44 -05:00
db442e2775 [nostalgia/gfx] Address a couple of implicit conversions
All checks were successful
Build / build (push) Successful in 1m20s
2025-06-21 14:21:23 -05:00
23cd50d29e [studio] Fix Studio to clear editor pointers when opening a new project 2025-06-21 14:21:12 -05:00
28088d1ed1 [nostalgia/studio] Set version to d2025.06.0
All checks were successful
Build / build (push) Successful in 1m16s
2025-06-21 08:55:52 -05:00
4 changed files with 23 additions and 22 deletions

View File

@@ -275,7 +275,7 @@ bool bgStatus(Context&, unsigned const bg) noexcept {
void setBgStatus(Context&, unsigned const bg, bool const status) noexcept { void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
constexpr auto Bg0Status = 8; constexpr auto Bg0Status = 8;
auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg); const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask); REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
} }

View File

@@ -15,7 +15,7 @@ target_link_libraries(
target_compile_definitions( target_compile_definitions(
NostalgiaStudio PUBLIC NostalgiaStudio PUBLIC
OLYMPIC_APP_VERSION="dev build" OLYMPIC_APP_VERSION="d2025.06.0"
) )
install( install(

View File

@@ -18,7 +18,7 @@
<string>APPL</string> <string>APPL</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>dev build</string> <string>d2025.06.0</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>12.0.0</string> <string>12.0.0</string>

View File

@@ -635,7 +635,8 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
keel::DuplicateSet ds; keel::DuplicateSet ds;
OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds)); OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
if (ds.size()) { if (ds.size()) {
ox::String msg{"Multiple files have the same UUID:\n"}; ox::String msg;
msg += "Multiple files have the same UUID:\n";
for (auto const &k : ds.keys()) { for (auto const &k : ds.keys()) {
msg += ox::sfmt("\n\t{}:\n", k.toString()); msg += ox::sfmt("\n\t{}:\n", k.toString());
for (auto const &v : ds[k]) { for (auto const &v : ds[k]) {