Commit Graph

16 Commits

Author SHA1 Message Date
Sebastian Piwell 04a0abf010 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-13 16:10:41 -04:00
Sebastian Piwell c2a64df1c4 Processing speed test 2016-06-13 16:10:31 -04:00
Michael Nilsson 55e1850045 download texture resource ahead of time 2016-06-13 15:44:31 -04:00
Michael Nilsson db9af4c886 abstracted cygnet properties to DataCygnet 2016-06-10 16:57:55 -04:00
Sebastian Piwell 39f083c342 Every datacygnet uses own dimensions 2016-06-10 15:19:32 -04:00
Michael Nilsson f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Michael Nilsson e694be248f solve merge conflict in kameleonplane 2016-06-03 09:20:27 -04:00
Michael Nilsson c05b417519 refactor kameleonplane 2016-06-02 18:00:26 -04:00
Sebastian Piwell a4f9789dd9 Transfer function bug fix 2016-06-02 17:06:41 -04:00
Sebastian Piwell 41299f17f7 Improved multiple transfer functions 2016-06-02 16:56:25 -04:00
Michael Nilsson 7401595e93 refactor filloptions in kameleonplane, merge conflict 2016-06-02 09:45:14 -04:00
Sebastian Piwell a00e29d987 Merge fix 2016-06-01 16:55:20 -04:00
Michael Nilsson cb601042a6 solve merge conflict 2016-06-01 14:03:39 -04:00
Michael Nilsson f029362372 refactor datasphere 2016-06-01 13:19:45 -04:00
Michael Nilsson e8238859f8 refactor cygnetplane and dataplane 2016-05-31 17:54:39 -04:00
Michael Nilsson 627d31a5b2 refactor textureplane and cygnetplane 2016-05-27 16:50:01 -04:00