578 Commits

Author	SHA1	Message	Date
Sebastian Piwell	e3dae7abc3	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-06-03 13:43:01 -04:00
Sebastian Piwell	8e8d949107	Summer school release	2016-06-03 13:42:50 -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
Michael Nilsson	e694be248f	solve merge conflict in kameleonplane	2016-06-03 09:20:27 -04:00
Michael Nilsson	c05b417519	refactor kameleonplane	2016-06-02 18:00:26 -04:00
Sebastian Piwell	e1b042b252	Do not register backgroundValues when autoFilter is true	2016-06-02 17:30:10 -04:00
Sebastian Piwell	8c7986bee4	Clean up in DataProcessor	2016-06-02 17:14:51 -04:00
Sebastian Piwell	a4f9789dd9	Transfer function bug fix	2016-06-02 17:06:41 -04:00
Sebastian Piwell	41299f17f7	Improved multiple transfer functions	2016-06-02 16:56:25 -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
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
Michael Nilsson	a882d7df6c	add class comments to dataplane	2016-05-31 18:00:09 -04:00
Michael Nilsson	e8238859f8	refactor cygnetplane and dataplane	2016-05-31 17:54:39 -04:00
Sebastian Piwell	1f8df7a166	Refactor dataprocessor	2016-05-31 16:52:46 -04:00
Alexander Bock	88db25e868	Windows compile fix	2016-05-31 18:51:57 +02: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	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	e24944675e	remove excess code	2016-05-24 17:08:22 -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