mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-20 17:51:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,938 Commits 84 Branches 47 Tags
ca4b6d2ce2b52aaaae496f16ded8752b311ae6c8
Commit Graph

89 Commits

Author SHA1 Message Date
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 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
Michael Nilsson c0e3eed9e3 loading image cygnets from localhost 2016-04-19 09:54:18 -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
Sebastian Piwell e292f79697 Get metadata and add new images 2016-04-11 17:45:41 -04:00
Michael Nilsson d5d79e01b3 add and remove iswaCygnets through lua scripts 2016-04-11 14:26:53 -04:00
Sebastian Piwell 9419ed9dfc No more parent variable in ISWACygnet 2016-04-08 17:18:18 -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 bf61f6f1e4 Load and read textures from memory 2016-04-06 14:17:29 -04:00
Sebastian Piwell bea3a1b89b Correct updateintervall 2016-04-05 17:09:45 -04:00
Sebastian Piwell fd9fbb540c Solved merge conficts 2016-04-05 13:21:34 -04:00
Sebastian Piwell ca9adfeb44 Some cleanup 2016-04-05 12:13:30 -04:00
Michael Nilsson a3266dfcc5 small addition to solving conflict 2016-04-05 11:57:55 -04:00
Michael Nilsson e59ea07b24 solved merge conflict 2016-04-05 11:57:17 -04:00
Sebastian Piwell b1a009e1b0 Create ISWACygnets with metadata struct 2016-04-05 11:44:49 -04:00
Michael Nilsson 7263b251ca iswa module ready for api change in downloadmanager 2016-04-05 11:03:55 -04:00
Michael Nilsson 6e8d8a9576 getting extension moved to iswa container 2016-04-04 15:46:20 -04:00
Michael Nilsson 66a9aeb008 solve merge conflict 2016-04-01 16:39:35 -04:00
Michael Nilsson f4964b1628 request file extension 2016-04-01 16:32:18 -04:00
Sebastian Piwell f7643769d9 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-01 11:24:32 -04:00
Sebastian Piwell d3fc17fc4d Real time updateinterval 2016-04-01 11:24:23 -04:00
Michael Nilsson b160f3b9af isReady check before render of iSWACygnets 2016-04-01 10:46:41 -04:00
Michael Nilsson a583856a52 remove thread and called update texture in textureplane constructor 2016-04-01 09:08:54 -04:00
Michael Nilsson df1f79bc62 two test cases for iswamanager 2016-03-31 16:45:32 -04:00
Michael Nilsson fd281f05b5 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-03-31 12:17:57 -04:00
Michael Nilsson 2bfe0129e4 add screenspacecygnets 2016-03-31 12:17:32 -04:00
Sebastian Piwell 91db544b07 Removed path property 2016-03-31 12:07:20 -04:00
Sebastian Piwell b893c60d53 Download image in ISWAManager 2016-03-31 11:18:22 -04:00
Sebastian Piwell 100f1b75dd Seperated iSWAManager and iSWAContainer 2016-03-31 10:53:03 -04:00
Sebastian Piwell f925a35aee Fixed merge conflict 2016-03-30 17:46:21 -04:00
Sebastian Piwell 232bd6d94c Add cygnetPlane class 2016-03-30 17:42:45 -04:00
Michael Nilsson 0feb7fb771 fix for windows. removed thread for updating texture. 2016-03-30 17:26:05 -04:00
Michael Nilsson 378766b55a add loggercat to dataplane 2016-03-30 16:13:52 -04:00
Sebastian Piwell c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00