Kalle Bladin f525eb53cc Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing

2016-05-25 18:03:21 -04:00

..

engine

Solve merge conflict.

2016-05-19 12:10:14 -04:00

interaction

Change size in boundingbox for the globe and the texture and patch size.

2016-05-25 18:03:13 -04:00

network

Untabify more files

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

properties

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

query

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

rendering

Merge in initialization of camera pos from feature/interaction

2016-05-25 16:47:15 -04:00

scene

Merge in initialization of camera pos from feature/interaction

2016-05-25 16:47:15 -04:00

scripting

Untabify more files

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

util

Solve merge conflict for interaction.

2016-05-25 13:20:12 -04:00

CMakeLists.txt

moved histogram class to core

2016-05-17 12:49:16 -04:00

openspace.cpp

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

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