1480 Commits

Author	SHA1	Message	Date
Emma Broman	4f3e930ce7	Merge pull request #1321 from OpenSpace/feature/exoplanets-panel ... sending exoplanet names for gui panel	2020-10-13 13:27:24 +02:00
Micah	21774b937b	sending exoplanet names for gui panel	2020-10-13 05:24:26 -04:00
Micah Acinapura	08dacfd703	Cleaning up iss on removal (#1318)	2020-10-13 09:21:18 +02:00
Micah Acinapura	ee1b1cd165	Added tags to pluto system (#1319)	2020-10-13 09:20:52 +02:00
Micah Acinapura	4935ae8814	Update keys for slidedeck example (#1320)	2020-10-13 09:20:25 +02:00
Emma Broman	7e34e1b1d8	Resolve merge conflict	2020-10-12 09:30:51 +02:00
Emma Broman	887fe5572d	Merge pull request #1302 from OpenSpace/issue/1285 ... Issue/1285 - Add delta time steps to profiles and generate keybindings for number keys	2020-10-12 08:35:36 +02:00
Alexander Bock	2a122f9751	Some more cleanup of empty lines	2020-10-10 12:50:38 +02:00
Alexander Bock	607d008cbf	Fixing newlines at the end of files	2020-10-10 12:20:45 +02:00
Alexander Bock	96ed6cfb70	Merge branch 'master' into feature/asset-meta-update	2020-10-10 12:01:56 +02:00
Micah	0f667685da	update for modelgeometry; fix for pioneer sync	2020-10-09 16:28:22 -04:00
Alexander Bock	de97a5520a	Merge branch 'master' into feature/session-recording-improvements ... # Conflicts: # include/openspace/network/messagestructures.h # src/interaction/sessionrecording.cpp	2020-10-09 22:10:40 +02:00
Alexander Bock	e43fa248bd	Remove spaces from constellation images (closes #1219)	2020-10-09 21:52:55 +02:00
Alexander Bock	2dabe1f9d4	Update James Hedberg's constellation images (closes #1263)	2020-10-09 21:38:10 +02:00
Micah	102454089a	update DU assets for gui.description	2020-10-09 14:24:46 -04:00
Emma Broman	d40f3ffc8b	Whitespace cleanup	2020-10-09 19:12:20 +02:00
Emma Broman	f168e97796	Add delta times to new defualt profile (json)	2020-10-09 19:02:49 +02:00
Alexander Bock	50a456b87f	Issue/1299 (#1312) ... Change profile file format from a custom one to JSON	2020-10-09 17:32:30 +02:00
Emma Broman	9616782ab7	Remove the old data preparation task	2020-10-09 15:52:41 +02:00
Emma Broman	fd04af5156	Add the new data preparation task file	2020-10-09 12:48:16 +02:00
Micah	f617331c33	update to solarsystem for description on scene graph node. added earth observing trails for planets	2020-10-08 23:39:30 -04:00
Micah	0ccf4dfd1f	update for gui meta panel	2020-10-04 16:26:52 -04:00
Micah	d800876879	mars layers	2020-10-02 17:20:21 -04:00
Micah	323416b99a	du asset meta update	2020-10-01 17:56:12 -04:00
Micah	df06edbba7	add milkyway arm label asset	2020-09-28 09:55:56 -04:00
Micah	4080d70feb	solar system update	2020-09-28 08:39:52 -04:00
Emma Broman	754128a9e7	Some final cleanup	2020-09-28 11:37:28 +02:00
Micah	2e61a0ba72	start of asset meta update	2020-09-25 17:14:41 -04:00
Emma Broman	193923e33b	Merge branch 'master' into thesis/2018/exoplanets	2020-09-23 09:56:41 +02:00
Emma Broman	8c87246e43	Remove old delta time keys code	2020-09-21 13:37:31 +02:00
Emma Broman	56cc8f97a5	Add delta time steps to profiles	2020-09-21 10:47:34 +02:00
Alexander Bock	617dadb9d4	Merge pull request #1297 from OpenSpace/feature/orion_nebula ... Feature/orion nebula	2020-09-16 23:16:24 +02:00
Alexander Bock	dffa7b914a	Minor cleaup	2020-09-16 23:07:32 +02:00
Jonathas Costa	e84437345f	Fixed layer name on Linux.	2020-09-16 11:30:11 -04:00
Emma Broman	0b4593a194	Put exoplanet data files on server and fetch using HttpSynchronization	2020-09-16 09:32:16 +02:00
Emma Broman	4e73a1b2ef	Cleanup csvtobin task slightly	2020-09-14 11:27:32 +02:00
Emma Broman	2aa31abe45	Merge branch 'master' into thesis/2018/exoplanets	2020-09-11 13:43:01 +02:00
Micah	2a4ad44740	style cleanup	2020-09-10 17:50:33 -04:00
Micah	b55d93ad94	added orion nebula asset from DU, updated licence template to better support whitespace	2020-09-10 17:46:48 -04:00
Emma Broman	a57003f272	Fix asteroids profile not running due to whitespace instead of tab	2020-09-09 13:35:41 +02:00
Alexander Bock	e0671700fc	Merge pull request #1281 from OpenSpace/issue/1277 ... Issue/1277 - Layer assets should add themselves on initialize	2020-09-07 15:41:12 +02:00
Alexander Bock	af6e15da40	Merge remote-tracking branch 'origin/master' into feature/openglstatecache ... # Conflicts: # ext/ghoul # modules/digitaluniverse/rendering/renderablebillboardscloud.cpp # modules/digitaluniverse/rendering/renderableplanescloud.cpp # src/util/screenlog.cpp	2020-09-04 14:02:17 +02:00
Alexander Bock	00a00c9cc8	Merge branch 'master' into feature/general-performance ... # Conflicts: # apps/OpenSpace/main.cpp # modules/server/src/topics/timetopic.cpp	2020-09-04 13:49:00 +02:00
Alexander Bock	2cca451898	Coding style adaptations ... Adapt to changes in Ghoul	2020-08-25 13:47:03 +02:00
Emma Broman	0ebe523bce	Merge branch 'master' into thesis/2018/exoplanets	2020-08-25 13:40:33 +02:00
Emma Broman	19c110a4c2	Update gui hash	2020-08-25 13:08:54 +02:00
Jonathas Costa	11ad1df863	Removed personal configuration.	2020-08-24 13:50:36 -04:00
Jonathas Costa	25cd3fdc0b	Merged master again.	2020-08-24 13:44:26 -04:00
Alexander Bock	95db615dab	Merge branch 'master' into feature/general-performance	2020-08-24 15:09:45 +02:00
Alexander Bock	3b786c0bb8	Merge pull request #1282 from OpenSpace/issue/1174 ... Issue/1174 - step between delta time steps using GUI or keybindings	2020-08-24 14:17:30 +02:00