Alexander Bock
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
Emil Axelsson
2426545a05
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/sceneloader.cpp
tests/test_concurrentjobmanager.inl
tests/test_concurrentqueue.inl
tests/test_sceneloader.inl
2017-08-15 11:43:18 +02:00
Alexander Bock
c275b2f833
Feature/cmake cleanup ( #381 )
...
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31 )
* Cleaning up CMake files
* Restructure application specification
* Add parameter for library mode to all modules
* Add functions to handle global variable state
* Misc/remove warnings (#383 )
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Emil Axelsson
cb7319d5f2
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
data/scene/default.scene
modules/sync/syncmodule.h
openspace.cfg
src/engine/openspaceengine.cpp
src/scene/scene.cpp
src/scene/scene_doc.inl
src/scene/scenegraphnode.cpp
src/scene/scenegraphnode_doc.inl
src/scene/sceneloader.cpp
src/scripting/scriptengine.cpp
2017-08-14 11:17:25 +02:00
Alexander Bock
0e9edaeb12
Fix byte order mark commits
...
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
4dba552fd1
Started switching OpenSpace projects to nested namespaces
...
Various cleanups
2017-07-15 20:01:55 -04:00
Emil Axelsson
351a246f3a
Add support for c closures in lua
2017-07-06 22:30:57 +02:00
Alexander Bock
994ba32f44
Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328 )
...
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Alexander Bock
4e52f27f9e
Remove Dictionary include with forward declarations
2017-03-01 19:20:00 -05:00
Alexander Bock
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
d139dd2d22
Clean include guards in OpenSpace core
...
Remove unused files
2016-12-09 13:54:22 +01:00
Emil Axelsson
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00