Michael Nilsson 0d49076c54 solve merge conflict with develop

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

apps

untabify to make merge easier

2016-04-20 15:21:30 -04:00

config

solve merge conflict with develop

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

data

solve merge conflict with develop

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

ext

Updated Ghoul

2016-05-03 14:21:06 +02:00

include/openspace

solve merge conflict with develop

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

modules

solve merge conflict with develop

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

scripts

solve merge conflict with develop

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

shaders

Removing quadFrag, singlepassraycaster and twopassraycaster shaders

2016-05-01 13:24:59 +02:00

src

solve merge conflict with develop

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

support

Update default Qt version to 5.6

2016-04-30 10:24:49 +02:00

tests

Works without iSWA module enabled

2016-04-05 15:55:55 -04:00

.clang-format

Changes in clang-format

2014-05-03 18:23:16 +02:00

.gitignore

solve merge conflict with develop

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

.gitmodules

Moving Kameleon subrepository to Github

2016-03-02 21:48:56 +01:00

CMakeLists.txt

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

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

CREDITS

Updated CREDITS file

2016-05-01 12:37:21 +02:00

Doxyfile

Move the doxygen files from doxygen to support/doxygen

2014-12-04 16:29:39 +01:00

LICENSE

Updated CREDITS file

2016-05-01 12:37:21 +02:00

openspace.cfg

solve merge conflict with develop

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

Description

This is the official GitHub repository for OpenSpace: an open source astrovisualization project. For instructions on how to build and run OpenSpace, see the Getting Started Guides on the wiki page at http://docs.openspaceproject.com.

577 MiB

Languages

C++ 73.2%

Lua 20.3%

GLSL 4%

CMake 1.6%

SuperCollider 0.5%

Other 0.3%