mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 21:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,348 Commits 85 Branches 47 Tags
268ca0ea752cede33376ffff5fdfe1bf2e08353b
Commit Graph

203 Commits

Author SHA1 Message Date
Michael Nilsson 268ca0ea75 change method for adding data values in dataprocessortext 2016-06-16 14:40:26 -04:00
Sebastian Piwell 389d094b8e Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 11:49:50 -04:00
Sebastian Piwell 1ef3c035e3 Renormalize values in the histogram correctly 2016-06-15 11:49:36 -04:00
Michael Nilsson 4401a21677 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 11:07:30 -04:00
Michael Nilsson 6573a6dfce add heroku baseurl and key bindings 2016-06-15 11:07:20 -04:00
Sebastian Piwell 78b827d9d6 Histogram with standard score normalization 2016-06-15 10:32:59 -04:00
Michael Nilsson fd026dae53 only get selected datavalues from file 2016-06-13 17:59:36 -04:00
Michael Nilsson 546b1a9d92 another windows fix + disable update when enable equals false 2016-06-13 17:14:20 -04:00
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 cdbe0ae1e0 solve merge conflict 2016-06-13 15:45:28 -04:00
Michael Nilsson 55e1850045 download texture resource ahead of time 2016-06-13 15:44:31 -04:00
Sebastian Piwell afb54ea8d1 Do not process x,y,z variables in DataProcessorText 2016-06-13 14:17:34 -04:00
Sebastian Piwell 65bacf3119 Merge with develop 2016-06-13 13:30:26 -04:00
Sebastian Piwell 3e034b73bb Solved merge conflict 2016-06-13 13:25:03 -04:00
Sebastian Piwell 661dd00129 Faster processing in DataProcessorText 2016-06-13 13:20:00 -04:00
Michael Nilsson cb484f3ce5 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-10 15:48:46 -04:00
Michael Nilsson 1633d9048e cleanup iswacygnet header, 90 degree rotation fix, small optimization 2016-06-10 15:48:34 -04:00
Sebastian Piwell 39f083c342 Every datacygnet uses own dimensions 2016-06-10 15:19:32 -04:00
Sebastian Piwell e2e5d39d3f x data for new offset 2016-06-10 11:51:20 -04:00
Sebastian Piwell a48b46e921 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-06 10:21:01 -04:00
Sebastian Piwell 9e7c420719 KameleonTransformationMatrix() in Transformation manager 2016-06-06 10:20:53 -04:00
Alexander Bock 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Michael Nilsson 11245c9ead fix for new ionosphere data 2016-06-03 16:26:51 -04:00
Michael Nilsson dbe9066829 removed shared_ptr from group events. 2016-06-03 12:44:18 -04:00
Michael Nilsson f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Sebastian Piwell 8c7986bee4 Clean up in DataProcessor 2016-06-02 17:14:51 -04:00
Sebastian Piwell d788e31334 Change resolution and cdf file in KameleonPlane 2016-06-02 16:25:11 -04:00
Michael Nilsson 7401595e93 refactor filloptions in kameleonplane, merge conflict 2016-06-02 09:45:14 -04:00
Alexander Bock 4c679c15ea Allow the disabling of ISWA components 2016-06-02 13:25:05 +02:00
Sebastian Piwell a00e29d987 Merge fix 2016-06-01 16:55:20 -04:00
Sebastian Piwell 342b7fa985 Renamed IswaGroup to IswaBaseGroup 2016-06-01 15:25:11 -04:00
Sebastian Piwell bba419fcf1 IswaKameleonGroup 2016-06-01 15:08:29 -04:00
Sebastian Piwell 27a046d81d IswaDataGroup 2016-06-01 14:40:00 -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
Sebastian Piwell 876c86ca75 Merge fix 2016-06-01 12:09:58 -04:00
Sebastian Piwell d33121d07c New dataprocessor classes works with IswaGroup 2016-06-01 11:50:26 -04:00
Sebastian Piwell 1f8df7a166 Refactor dataprocessor 2016-05-31 16:52:46 -04:00
Sebastian Piwell 6f6e016602 No more unique option names 2016-05-26 13:09:08 -04:00
Sebastian Piwell 0e3749fcf9 Small bug fixes 2016-05-26 09:49:24 -04:00
Sebastian Piwell ba2737d554 Merge fix 2016-05-25 14:47:25 -04:00
Sebastian Piwell 2830708112 Fieldlines in IswaGroup 2016-05-25 14:18:16 -04:00
Michael Nilsson 4bcb69739e windows fix 2016-05-25 14:06:15 -04:00
Sebastian Piwell 813a68c85f Alpha and group name first 2016-05-24 15:35:34 -04:00
Sebastian Piwell 92f64e8653 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-24 14:42:55 -04:00
Sebastian Piwell a4d90fb667 Load cdf files at start up 2016-05-24 14:42:38 -04:00
Michael Nilsson 8f6bc7d418 solve merge conflict 2016-05-24 14:10:37 -04:00
Michael Nilsson 8633bc8522 refactoring, using pubsub pattern for groups 2016-05-24 14:02:42 -04:00
Sebastian Piwell e3c1093310 Read cdf list 2016-05-23 17:24:46 -04:00