From 9ddc63606656ba794f25ddece10ccf3efe00fa9b Mon Sep 17 00:00:00 2001 From: floralrainfall Date: Wed, 19 Jul 2023 01:25:38 -0400 Subject: [PATCH 1/2] fix skybox --- Content/RNR/sky/null_plainsky512.material | 2 +- Dependencies/Luau | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/RNR/sky/null_plainsky512.material b/Content/RNR/sky/null_plainsky512.material index dcaca03..8d779ac 100644 --- a/Content/RNR/sky/null_plainsky512.material +++ b/Content/RNR/sky/null_plainsky512.material @@ -9,7 +9,7 @@ material sky/null_plainsky512 texture_unit { - cubic_texture sky/null_plainsky512_bk.jpg sky/null_plainsky512_ft.jpg sky/null_plainsky512_lf.jpg sky/null_plainsky512_rt.jpg sky/null_plainsky512_up.jpg sky/null_plainsky512_dn.jpg separateUV + cubic_texture sky/null_plainsky512_rt.jpg sky/null_plainsky512_lf.jpg sky/null_plainsky512_bk.jpg sky/null_plainsky512_ft.jpg sky/null_plainsky512_up.jpg sky/null_plainsky512_dn.jpg separateUV tex_address_mode clamp } } diff --git a/Dependencies/Luau b/Dependencies/Luau index 2181591..e25de95 160000 --- a/Dependencies/Luau +++ b/Dependencies/Luau @@ -1 +1 @@ -Subproject commit 218159140c7d79ae745e646da721d12331f536f5 +Subproject commit e25de95445f2d635a125ab463426bb7fda017093 From cd7226895043cdc844d40924162ebff4374839f9 Mon Sep 17 00:00:00 2001 From: floralrainfall Date: Wed, 19 Jul 2023 01:26:53 -0400 Subject: [PATCH 2/2] fix error on release with slots --- Projects/Client/Studio/Header/MainWindow.hpp | 2 -- Projects/Client/Studio/Source/MainWindow.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/Projects/Client/Studio/Header/MainWindow.hpp b/Projects/Client/Studio/Header/MainWindow.hpp index 9fc6307..e437512 100644 --- a/Projects/Client/Studio/Header/MainWindow.hpp +++ b/Projects/Client/Studio/Header/MainWindow.hpp @@ -40,9 +40,7 @@ class MainWindow : public QMainWindow void run(); void pause(); -#ifndef NDEBUG void dbg_pointlight(); -#endif protected: void widgetItemPrepare(QTreeWidgetItem* item, RNR::Instance* instance); void recurseTreeAddInstance(QTreeWidgetItem* parent, RNR::Instance* instance); diff --git a/Projects/Client/Studio/Source/MainWindow.cpp b/Projects/Client/Studio/Source/MainWindow.cpp index 94baea8..83aad9d 100644 --- a/Projects/Client/Studio/Source/MainWindow.cpp +++ b/Projects/Client/Studio/Source/MainWindow.cpp @@ -128,12 +128,10 @@ void MainWindow::pause() this->ogreWidget->world->getRunService()->pause(); } -#ifndef NDEBUG void MainWindow::dbg_pointlight() { } -#endif void MainWindow::closeEvent(QCloseEvent* event) {