Commit Graph

359 Commits

Author SHA1 Message Date
Anton Arbring
641107a106 Commented currently unused functions in new parenting system 2015-04-21 20:22:58 -04:00
Anton Arbring
2b8b8c0416 Solving merge conflicts with develop 2015-04-18 16:10:05 -04:00
Alexander Bock
f5f1b03bc8 More Linux fixes 2015-04-17 13:45:20 +02:00
Alexander Bock
b254f56a5e Linux compile fix 2015-04-17 13:38:30 +02:00
Alexander Bock
c01bb7834b Merge branch 'develop' into feature/scenegraphloader
Conflicts:
	src/abuffer/abuffer.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
2015-04-17 13:31:39 +02:00
Alexander Bock
607988f35e Renamed functions to something more reasonable 2015-04-17 11:35:26 +02:00
Alexander Bock
ccd58b7224 More restructuring work on SceneGraph 2015-04-12 14:50:43 +02:00
Alexander Bock
a65e48b0e3 More work on SceneGraph 2015-04-10 01:38:59 +02:00
Alexander Bock
79f3052887 More work on SceneGraphLoader
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
2015-04-09 21:43:13 +02:00