mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-24 21:39:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-10-16 11:07:24 +02:00
parent 18c50afeb5 d97cfbe829
commit 2623912ec9
91 changed files with 2283 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/configurationmanager.h
+2 -2
View File
@@ -69,8 +69,8 @@ public:
static const std::string KeyFactoryDocumentation;
/// The key that stores the location of the asset file that is initially loaded
static const std::string KeyConfigAsset;
/// The key that stores the location of the tasks file that is initially loaded
static const std::string KeyConfigTask;
/// The key that stores the location of the scene file that is initially loaded
static const std::string KeyConfigTasksRoot;
/// The key that stores the subdirectory containing a list of all startup scripts to
/// be executed on application start before the scene file is loaded
static const std::string KeyStartupScript;