Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'trunk' of https://github.com/lrre-foss/rnr into trunk

This commit is contained in:
sorket 2023-07-19 01:39:35 -04:00
parent 12c41a897b cd72268950
commit f40ad7833e
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Content/RNR/sky/null_plainsky512.material
View File

@ -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
}
}

2
Dependencies/Luau vendored

@ -1 +1 @@
Subproject commit 218159140c7d79ae745e646da721d12331f536f5
Subproject commit e25de95445f2d635a125ab463426bb7fda017093

2
Projects/Client/Studio/Header/MainWindow.hpp
View File

@ -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);

2
Projects/Client/Studio/Source/MainWindow.cpp
View File

@ -128,12 +128,10 @@ void MainWindow::pause()
this->ogreWidget->world->getRunService()->pause();
}
#ifndef NDEBUG
void MainWindow::dbg_pointlight()
{
}
#endif
void MainWindow::closeEvent(QCloseEvent* event)
{