Kalle Bladin 562e249dc9 Merge branch 'develop' into feature/globebrowsing

2016-06-08 12:32:31 -04:00

..

engine

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

interaction

Add the ability to change the interaction mode dynamically and via lua script.

2016-06-07 17:25:00 -04:00

network

Update camera to use double precition.

2016-06-05 21:27:20 -04:00

performance

Make performance widget graphs fill from right to left instead of circular

2016-06-07 11:16:27 +02:00

properties

Remove cygnet groups

2016-05-03 17:13:28 -04:00

query

Renamed IswaGroup to IswaBaseGroup

2016-06-01 15:25:11 -04:00

rendering

Merge branch 'develop' into feature/globebrowsing

2016-06-08 12:32:31 -04:00

scene

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

scripting

Untabify more files

2016-04-27 14:24:58 +02:00

util

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

CMakeLists.txt

Rename PerformanceHelper to PerformanceMeasurement

2016-06-06 08:48:44 +02:00

openspace.cpp

Replacing CMake-based version setting with C++-based version

2016-04-14 10:27:59 -04:00