1325 Commits

Author	SHA1	Message	Date
Sebastian Piwell	342b7fa985	Renamed IswaGroup to IswaBaseGroup	2016-06-01 15:25:11 -04:00
Michael Nilsson	4bcb69739e	windows fix	2016-05-25 14:06:15 -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	0ccc48d1c3	windows fix	2016-05-20 14:18:49 -04:00
Michael Nilsson	8ca457b14c	solve merge conflict with develop	2016-05-20 09:33:41 -04:00
Alexander Bock	b964cbe1a2	Remove comments in Downloadmanager	2016-05-19 13:25:47 +02:00
Alexander Bock	caae5336b5	Make use of new thread priority scheme ... Updated Ghoul repository	2016-05-19 13:23:40 +02:00
Alexander Bock	92df988bb6	Show some information when NewHorizons is not present	2016-05-18 21:37:41 +02:00
Alexander Bock	ecf1862eb3	Only show Pluto text information when NewHorizons node is present	2016-05-18 20:40:38 +02:00
Michael Nilsson	c3a8bb9bde	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-17 17:22:00 -04:00
Michael Nilsson	2af533e6fe	fetchFile in downloadmanager will fail when response status is 400 or above	2016-05-17 17:21:46 -04:00
Sebastian Piwell	ff39239b0f	Auto filter of 'background'	2016-05-17 16:11:57 -04:00
Michael Nilsson	ae131f88c5	changed the naming of min and max value in histogram class	2016-05-17 14:02:40 -04:00
Alexander Bock	e7f728868d	Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop	2016-05-17 19:47:46 +02:00
Alexander Bock	ed8cebbb9d	Fix crash with incidenttargetlist for rosetta	2016-05-17 19:47:41 +02:00
Michael Nilsson	7549beb5f2	solve merge conflict	2016-05-17 12:53:29 -04:00
Michael Nilsson	d2e913b70e	moved histogram class to core	2016-05-17 12:49:16 -04:00
Sebastian Piwell	2a236bca77	Read ionosphere data from json file	2016-05-16 13:36:25 -04:00
Sebastian Piwell	a28abd7774	iSWA Screen Space Options	2016-05-12 15:10:17 -04:00
Sebastian Piwell	c2443a9ee2	Merge branch 'develop' into feature/iSWA	2016-05-11 13:30:59 -04:00
Sebastian Piwell	e51b104ce8	Transformation Manager	2016-05-10 11:18:09 -04:00
Sebastian Piwell	39ff2415bb	Name changes	2016-05-09 13:09:47 -04:00
Alexander Bock	2c7e1ec9f4	Do not let exceptions in update function escape the loading	2016-05-08 16:21:17 +02:00
Michael Nilsson	f2b802b317	MemoryFile har now char pointer and size instead of string	2016-05-06 16:39:24 -04:00
Michael Nilsson	d63dd7db44	remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile	2016-05-06 15:56:12 -04:00
Michael Nilsson	47e2abf87d	new download function using std::future and std::async	2016-05-06 10:48:27 -04:00
Michael Nilsson	d0e6c8dd6e	removed progresscallback from downloadToMemory	2016-05-05 11:07:00 -04:00
Michael Nilsson	df030b4529	warnings if download to memory failed for some reason	2016-05-05 10:53:50 -04:00
Alexander Bock	d66e2e1b59	Add time information to SpiceExeception	2016-05-05 10:46:26 +02:00
Michael Nilsson	3a80405c30	solve merge conflict	2016-05-04 12:10:49 -04:00
Sebastian Piwell	355e70ca0a	Remove cygnet groups	2016-05-03 17:13:28 -04:00
Michael Nilsson	0d49076c54	solve merge conflict with develop	2016-05-03 17:11:28 -04:00
Sebastian Piwell	a0efc00408	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-03 15:35:38 -04:00
Sebastian Piwell	1e4e8919c3	Set attributes of screenspacerenderable through dictionary	2016-05-03 15:35:33 -04:00
Michael Nilsson	57cd5c0bf7	solve merge conflict	2016-05-03 15:14:31 -04:00
Michael Nilsson	f05672436e	removed iswamanager update function and create cygnet through scripts instead	2016-05-03 15:07:22 -04:00
Sebastian Piwell	810bcbb4e1	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-03 13:46:18 -04:00
Sebastian Piwell	7eae57b02f	Removed iswacontainer	2016-05-03 13:46:02 -04:00
Michael Nilsson	2f7d2e294f	solve merge conflict	2016-05-03 13:37:19 -04:00
Michael Nilsson	c34fa48c73	add script to remove screenspacerenderables from renderengine	2016-05-03 13:30:22 -04:00
Sebastian Piwell	dfd1968f0b	Lua script to add cygnet	2016-05-03 13:24:17 -04:00
Michael Nilsson	d6b5976298	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-03 10:39:41 -04:00
Michael Nilsson	4d61694f75	ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory	2016-05-03 10:39:32 -04:00
Sebastian Piwell	c57a9b7be1	Replaced string with enum	2016-05-03 10:06:47 -04:00
Sebastian Piwell	8bde97fdfa	ISWAGroup for manipulation of multiple dataplanes	2016-05-02 17:32:25 -04:00
Michael Nilsson	aa40e3a8b3	fix bug where screenspace cygnets crash program if moved to fast	2016-05-02 10:03:07 -04:00
Alexander Bock	cfb895e2e9	Move fboPass shader into NewHorizons module	2016-05-01 13:14:36 +02:00
Alexander Bock	20532d704f	Rename Lua functions to preInitialization and postInitialization ... Apply change to all scene files in the repository Remove default_settings and default_startup as their functoins have moved into the scene file	2016-04-30 14:18:08 +02:00