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

2017-11-13 11:18:00 +01:00

..

documentation

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

engine

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

2017-11-13 11:18:00 +01:00

interaction

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

2017-11-11 19:10:42 +01:00

mission

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

2017-11-10 16:07:58 +01:00

network

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

2017-11-11 19:10:42 +01:00

performance

More coding style conformance

2017-11-11 11:25:49 -05:00

properties

More coding style conformance

2017-11-11 11:25:49 -05:00

query

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

2017-11-11 19:10:42 +01:00

rendering

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

2017-11-13 11:18:00 +01:00

scene

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

2017-11-13 11:18:00 +01:00

scripting

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

2017-11-11 19:10:42 +01:00

util

Decentralize resource synchronization. Remove notion of SynchronizationJob.

2017-11-12 19:09:16 +01:00

CMakeLists.txt

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

2017-11-13 11:18:00 +01:00

openspace.cpp

Cleanup for coding style

2017-11-08 10:35:39 -06:00