2217 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Michael Nilsson	8bc665eb04	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-27 09:57:27 -04:00
Michael Nilsson	fccf05a026	uncommented important code	2016-05-27 09:57:11 -04:00
Sebastian Piwell	921fd7b48d	Update ghoul	2016-05-26 17:34:37 -04:00
Sebastian Piwell	95dd221f84	Fix crash when cygnet has no group	2016-05-26 15:53:44 -04:00
Sebastian Piwell	edfff68491	Memory leak fix	2016-05-26 15:29:45 -04:00
Sebastian Piwell	6f6e016602	No more unique option names	2016-05-26 13:09:08 -04:00
Sebastian Piwell	2459b2c48b	Merge fix with develop	2016-05-26 10:42:29 -04:00
Sebastian Piwell	1d8e780622	RenderableTrail bug fix #88	2016-05-26 10:40:21 -04:00
Sebastian Piwell	9b9642873f	Gui with smaller labels (closing #89)	2016-05-26 10:38:19 -04:00
Sebastian Piwell	f079c2d18a	Solved GUI name conflict	2016-05-26 10:05:18 -04:00
Sebastian Piwell	0e3749fcf9	Small bug fixes	2016-05-26 09:49:24 -04:00
Sebastian Piwell	c374fa2ce4	Fieldline bugfix	2016-05-25 17:33:46 -04:00
Sebastian Piwell	678ecc6370	RenderableTrail bug fix	2016-05-25 17:19:20 -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
Alexander Bock	427d49bfb4	Fix for height maps on RenderablePlanetProjection	2016-05-25 18:34:19 +02:00
Michael Nilsson	88c006b361	add initializeGroup function to iswaCygnet	2016-05-24 17:33:06 -04:00
Michael Nilsson	4e2e3286ac	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-24 17:20:17 -04:00
Michael Nilsson	e24944675e	remove excess code	2016-05-24 17:08:22 -04:00
Michael Nilsson	4e599a80fb	remove excess code	2016-05-24 16:51:02 -04:00
Michael Nilsson	b8c093c411	bugfix for adding iswacygnet without group	2016-05-24 16:47:01 -04:00
Michael Nilsson	a76d4bd277	solved merge conflict	2016-05-24 16:25:45 -04:00
Michael Nilsson	627e33fd7e	finished refactoring for datasphere. bugfix in textureplane future object	2016-05-24 16:19:18 -04:00
Sebastian Piwell	b3d5d41ca6	Auto filter property	2016-05-24 16:00:18 -04:00
Sebastian Piwell	813a68c85f	Alpha and group name first	2016-05-24 15:35:34 -04:00
Sebastian Piwell	fbcad58d98	Small bug fix	2016-05-24 15:07:51 -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
Sebastian Piwell	fb5b260b8f	Fix for variable resolution for KameleonPlane	2016-05-23 11:19:54 -04:00
Sebastian Piwell	5b9813c817	Don't load all Histograms at startup for KameleonPlane	2016-05-23 11:08:12 -04:00
Sebastian Piwell	eefa5ea844	Small fix for ionospere	2016-05-23 09:51:10 -04:00
Sebastian Piwell	1d8c77ee3b	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-20 16:46:41 -04:00
Sebastian Piwell	c983ecfb89	Histogram eq with group dataprocessor	2016-05-20 16:46:33 -04:00
Michael Nilsson	4056cbb160	linux fix	2016-05-20 15:08:00 -04:00
Michael Nilsson	1535803705	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-20 14:12:44 -04:00
Michael Nilsson	0ccc48d1c3	windows fix	2016-05-20 14:18:49 -04:00
Michael Nilsson	99ef3c13da	update ghoul reference	2016-05-20 14:11:56 -04:00
Sebastian Piwell	a1188c3895	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-20 13:40:10 -04:00
Sebastian Piwell	57cd44535d	IswaGroup has own dataProcessor	2016-05-20 12:48:48 -04:00
Michael Nilsson	8ca457b14c	solve merge conflict with develop	2016-05-20 09:33:41 -04:00
Emil Axelsson	ca46661d3e	fix compile errors for osx	2016-05-20 00:39:29 +02:00
Sebastian Piwell	672933cd05	Choose slice of kameleonPlane	2016-05-19 15:14:11 -04:00
Sebastian Piwell	0d54a24891	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-19 14:05:18 -04:00
Sebastian Piwell	bb2da4dd2a	Choose resolution of KameleonPlane	2016-05-19 14:05:13 -04:00