Commit Graph

6 Commits

Author SHA1 Message Date
Michael Nilsson
7df90f2f2e Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-29 10:09:48 -04:00
Sebastian Piwell
ea8c126202 Create iSWA url 2016-03-28 15:19:27 -04:00
Michael Nilsson
6034f7ee7e Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-28 11:26:56 -04:00
Sebastian Piwell
c10dda95d8 Towards more general model scale and position 2016-03-24 16:38:56 -04:00
Michael Nilsson
900afdfc32 add _loggerCat to textureplane 2016-03-24 10:11:16 -04:00
Michael Nilsson
73545c721e merge conflict, added textureplane 2016-03-24 09:25:47 -04:00