mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,971 Commits 83 Branches 48 Tags
434f8bfabb2033dcc32087dda307aa5bc479119d
Commit Graph

31 Commits

Author SHA1 Message Date
Sebastian Piwell 434f8bfabb Some clean up and small fixes 2016-04-27 14:48:22 -04:00
Sebastian Piwell 0246cd482e Solved merge conflict 2016-04-22 20:01:15 -04:00
Sebastian Piwell f6bbce8b4c Add extension to futurefile 2016-04-22 17:39:45 -04:00
Michael Nilsson c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Michael Nilsson a068ca2030 load cygnets through mod file 2016-04-20 09:47:20 -04:00
Sebastian Piwell e292f79697 Get metadata and add new images 2016-04-11 17:45:41 -04:00
Sebastian Piwell a820d0a4dd Parse json to lua table string 2016-04-11 12:11:38 -04: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 fdaeaa7361 Changed function names 2016-04-06 09:39:54 -04:00
Michael Nilsson e370e915fc Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-05 15:39:09 -04:00
Michael Nilsson 5c33642774 added comment and cout 2016-04-05 15:38:53 -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 e25d30f2fb Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-05 12:11:27 -04:00
Michael Nilsson 0810376b03 fix for windows 2016-04-05 12:11:06 -04:00
Sebastian Piwell b1a009e1b0 Create ISWACygnets with metadata struct 2016-04-05 11:44:49 -04:00
Michael Nilsson 4da6d72985 merge solved, fixed broken for loop in iswacontainer 2016-04-04 17:55:46 -04:00
Sebastian Piwell 7e4aecbd90 Add ISWACygnets at runtime 2016-04-04 16:42:01 -04:00
Michael Nilsson b62ff11c75 example creation of screenspacecygnet 2016-04-04 16:38:18 -04:00
Michael Nilsson cf2403c93d screenspacecygnet gets image path in constructor 2016-04-04 16:15:21 -04:00
Michael Nilsson bf6a8e249a solve merge conflict 2016-04-04 16:02:27 -04:00
Michael Nilsson 6e8d8a9576 getting extension moved to iswa container 2016-04-04 15:46:20 -04:00
Sebastian Piwell 8e996f5bab Remove screenspacerenderables and iSWACygnets 2016-04-04 15:30:54 -04:00
Sebastian Piwell 7eb312d10b Delete cygnets 2016-04-04 11:58:42 -04:00
Michael Nilsson b160f3b9af isReady check before render of iSWACygnets 2016-04-01 10:46:41 -04:00
Michael Nilsson 2bfe0129e4 add screenspacecygnets 2016-03-31 12:17:32 -04:00
Sebastian Piwell 100f1b75dd Seperated iSWAManager and iSWAContainer 2016-03-31 10:53:03 -04:00