mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 16:29:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,926 Commits 83 Branches 48 Tags
c72536fbbce430976ce236283c0bbb280a1ed251
Commit Graph

317 Commits

Author SHA1 Message Date
Michael Nilsson c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Michael Nilsson 07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Sebastian Piwell 9bb326b7eb Uncomment important line 2016-04-20 14:52:41 -04:00
Sebastian Piwell 201963a2f2 Solved merge conflict 2016-04-20 14:46:37 -04:00
Sebastian Piwell f6ddce7929 Seperated coordinate scale and spatial scale 2016-04-20 14:38:12 -04:00
Michael Nilsson 2701d483c1 check if node with same name already exist before create cygnet 2016-04-20 13:55:03 -04:00
Michael Nilsson b7dc02d421 solve merge conflict 2016-04-20 13:29:05 -04:00
Michael Nilsson 6aa8536d8c create both textureplane and dataplane through gui easier 2016-04-20 13:21:14 -04:00
Sebastian Piwell 7b510dae98 Add dataplane when time is running 2016-04-20 10:48:49 -04:00
Sebastian Piwell cb49805b07 Update ghoul 2016-04-20 10:28:53 -04:00
Michael Nilsson a068ca2030 load cygnets through mod file 2016-04-20 09:47:20 -04:00
Sebastian Piwell 64a9dd8069 Update screenspacerenderables 2016-04-19 18:03:29 -04:00
Sebastian Piwell 3d229fdc3a Update textureplane and delete dataplane 2016-04-19 16:59:40 -04:00
Sebastian Piwell b2f25b5ca7 Multiple data values on the same plane 2016-04-19 15:14:23 -04:00
Michael Nilsson c0e3eed9e3 loading image cygnets from localhost 2016-04-19 09:54:18 -04:00
Sebastian Piwell 4d487fc810 Stream data 2016-04-19 09:07:17 -04:00
Sebastian Piwell 02c2ee9ef6 DataPlane reads from server 2016-04-18 15:16:11 -04:00
Sebastian Piwell 86bf771cdd Read data file from server 2016-04-18 13:05:50 -04:00
Alexander Bock a21c9538b6 Untabify more files 2016-04-18 15:15:30 +02:00
Alexander Bock c8da825098 Rename ImageSequencer2 to ImageSequencer 2016-04-18 15:14:59 +02:00
Alexander Bock 6b5681626b Removing clang-analyze warnings 2016-04-13 11:46:07 -04:00
Sebastian Piwell fa3fc8dc87 Transfer function to dataplan and ColorBar 2016-04-13 11:36:43 -04:00
Emil Axelsson 48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Sebastian Piwell e292f79697 Get metadata and add new images 2016-04-11 17:45:41 -04:00
Sebastian Piwell 5af317e594 Functions to create iSWAcygnets 2016-04-11 15:15:58 -04:00
Sebastian Piwell 6d74bd3b29 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-11 14:41:38 -04:00
Sebastian Piwell d4ade042c1 Parse json string to Lua table 2016-04-11 14:41:31 -04:00
Michael Nilsson 0d298e7232 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-11 14:27:02 -04:00
Michael Nilsson d5d79e01b3 add and remove iswaCygnets through lua scripts 2016-04-11 14:26:53 -04:00
Sebastian Piwell 6c72494859 Small json parse fix 2016-04-11 14:10:37 -04:00
Sebastian Piwell f64804d043 Add frame from json 2016-04-11 13:57:03 -04:00
Sebastian Piwell a820d0a4dd Parse json to lua table string 2016-04-11 12:11:38 -04:00
Alexander Bock e4f8f8c830 Clang compile fixes 2016-04-11 11:18:50 -04:00
Emil Axelsson 4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
Sebastian Piwell 9419ed9dfc No more parent variable in ISWACygnet 2016-04-08 17:18:18 -04:00
Sebastian Piwell 6f582912f6 Update with ISWAManager 2016-04-08 16:10:53 -04:00
Sebastian Piwell a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -04:00
Sebastian Piwell 6a81065b42 ISWACygnet child of Renderable 2016-04-08 12:27:23 -04:00
Sebastian Piwell 263bc9508e Create ISWACygnets with dictionary 2016-04-08 11:58:46 -04:00
Sebastian Piwell 20c1fa0cfa Compile fix for Linux, included string 2016-04-08 10:47:59 -04:00
Sebastian Piwell cb10757b29 Merge branch 'feature/scenegraphmodification' into feature/iSWA 2016-04-08 10:23:44 -04:00
Alexander Bock 3de5fb3b55 Add FloatProperty to RenderableStars to modify transparency (closing #150) 2016-04-08 15:11:46 +02:00
Alexander Bock 72ccfe51e9 Ignore empty lines in Speck file reading (closing #133) 2016-04-08 15:06:13 +02:00
Alexander Bock 8f4d3c20eb Untabify RenderableStars 2016-04-08 15:00:43 +02:00
Alexander Bock 7c750ff2a2 Merge branch 'develop' into feature/newhorizons 2016-04-08 13:54:23 +02:00
Alexander Bock 2acb2cbd92 Updated ghoul repository 
Make use of automatic conversion and swizzling of textures
 2016-04-07 19:07:18 +02:00
Michael Nilsson 575c580e80 iSWAmanager allow GIF loading, update ref to ghoul 2016-04-06 18:20:10 -04:00
Michael Nilsson 65179d49e2 update ghoul reference and iswamanager remove check for '.jpeg' extension 2016-04-06 15:49:14 -04:00
Michael Nilsson a276b330e1 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-06 15:35:00 -04:00
Michael Nilsson 43b79b2101 referencing kameleon back to old commit 2016-04-06 15:39:34 -04:00