Michal Marcinkowski
|
f032b4e3b0
|
Merge branch 'develop' into solarsystem2
Conflicts:
.gitignore
include/openspace/rendering/renderablefov.h
src/CMakeLists.txt
src/rendering/model/renderablemodel.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/factorymanager.cpp
|
2014-12-15 13:23:30 -05:00 |
|
Jonas Strandstedt
|
da4fa44c03
|
Continued work on memory leaks and proper isReady usage
|
2014-12-11 16:48:49 +01:00 |
|
Michal Marcinkowski
|
bd841c488c
|
Merge branch 'develop' into solarsystem2
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
|
2014-12-08 21:26:38 -05:00 |
|
michal
|
bd74acedd3
|
fixing stupid git mistake.
|
2014-11-28 17:15:13 -05:00 |
|
michal
|
a5c232eb88
|
Tidying up.
|
2014-11-28 14:41:59 -05:00 |
|
Alexander Bock
|
4de8071efe
|
Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
Fix velocity in RenderableStars
|
2014-11-28 01:41:26 +01:00 |
|
michal
|
d6d7f1ffe7
|
intermediate commit.
|
2014-11-12 12:28:16 -05:00 |
|
michal
|
d3ea503454
|
Fixes to the modelloader class
|
2014-10-23 20:11:49 -04:00 |
|
michal
|
ecfc4ad79a
|
reshaping the modelloader class to suit the overall design of openspace
|
2014-10-23 18:49:15 -04:00 |
|