143 Commits

Author	SHA1	Message	Date
ElonOlsson	d96f12396f	merge + codegen doc return	2021-05-26 11:00:50 -04:00
GPayne	0d5909b6a9	Merge master in	2021-05-24 23:49:51 -06:00
GPayne	e374eef72d	Fixed merge conflicts with master	2021-05-20 19:55:49 -06:00
Malin Ejdbo	80eba3bdd9	Address PR comments	2021-05-20 13:44:45 +02:00
GPayne	413639e9fe	Fixed problems with pausing time and time management	2021-05-19 19:47:51 -06:00
ElonOlsson	fcc690fa09	master merge + seed point files from directory fix	2021-05-18 12:00:53 -04:00
Malin Ejdbo	0d06c68f6f	Clean up	2021-05-18 16:41:15 +02:00
Malin Ejdbo	9cdd252781	Make buttons on SpaceMouse to switch between local and global roll	2021-05-14 17:09:06 +02:00
ElonOlsson	9d1ece1163	finish merge + manual time offset property	2021-05-12 15:37:22 -04:00
Malin Ejdbo	def7f1f1a2	Merge branch 'master' into feature/space-mouse ... * Resolve conflicts	2021-05-12 17:32:26 +02:00
Alexander Bock	09e28ff49e	Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker (closes #85); Fix bug with wrong documentation shown in RenderablePlane	2021-05-08 18:08:56 +02:00
Emma Broman	804444e267	Simplify Property code (#1575) ... * Remove the PropertyDelegate * Remove some unused and redundant property types * Use helper functions for Lua/Json conversion * Solve a bug in SelectionProperty that occurred when re-setting options * General simplification and refactoring of the code	2021-05-04 09:32:29 +02:00
Alexander Bock	fb8e80ea80	Adjust tab width for asset and task files	2021-04-28 19:19:51 +02:00
Emma Broman	8a30dc570e	Add Logarithmic sliders and Color picker (#1564) ... * Pass ViewOptions meta data to WebUi * Add Color ViewOption * Add Logarithmic ViewOption * Update gui hash to get slider and color picker UI features	2021-04-27 09:24:36 +02:00
Malin Ejdbo	b9441cc618	Correct PS4Controller mapping	2021-04-23 15:45:24 +02:00
Malin Ejdbo	d93d367e74	Add roll axis for SpaceMouse	2021-04-23 11:33:14 +02:00
Malin Ejdbo	08118ba7bb	Add initial support for SpaceMouse as joystick input	2021-04-23 10:52:31 +02:00
Emma Broman	9a51a76088	Update the gui hash ... Add SelectionProperty and ListProperties UI and some bug fixes	2021-04-21 17:57:43 +02:00
Alexander Bock	d32a09ba80	Feature/strict lua (#1556) ... Make all LuaState strict to check whether uninitialized variables are used Adapt the existing assets to work with the strict state	2021-04-15 13:01:00 +02:00
Alexander Bock	4b25f5c074	Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items	2021-03-24 09:57:27 +01:00
ElonOlsson	cbc6825b9f	Merge remote-tracking branch 'origin/master' into thesis/2020/radiation	2021-03-12 15:15:58 -05:00
Malin Ejdbo	4fb8a36952	Merge branch 'master' into feature/multitexturing ... * Resolve conflicts	2021-03-02 15:49:39 +01:00
Gene Payne	f4e7d01aa7	Fixes for Issue #1409 (#1501) ... * Fixed renderablesmallbody selective rendering props to accept asset file settings * Set to only show selective rendering log info msg if render size is 1 * Mirrored selective rendering behavior from smallbody to satellites * Added property coupling of values to satellite/asteroid render settings for size, start index, upperlimit * Fix for selective rendering with synced render settings * Removed redundant property definitions for codegen compliance * Improvements to documentation and handling values spec'd in asset file * Fix for satellites: selective rendering settings specified from assets	2021-02-17 12:41:05 -07:00
elon	8ea0f245d3	submodule update	2021-02-11 12:38:07 -05:00
elon	92529fa6d4	merging master, conflicts	2021-02-10 11:33:01 -05:00
Malin Ejdbo	c6b3b409ff	Update assets for new model loading structure ... * Update Ghoul	2021-02-03 10:19:35 +01:00
Emma Broman	19e5960020	Small grid renderable updates/fixes (#1473) ... * Make sure we have examples for all grid types * Fix problems with blending when rendering transparent grids * Rename 'GridColor' to 'Color' for better consistenty among renderables * Fix issue with resizing box grid * Avoid problems with line width on Mac	2021-01-28 09:22:50 +01:00
Alexander Bock	feb3078641	Update slide_deck_helper.asset ... Rename `Alpha` to `Opacity` (closes #1441)	2020-12-19 21:19:35 +01:00
Micah Acinapura	cc7c0092a3	Feature/meta identifier list (#1357) ... Updating asset.meta.identifiers to be dictionary/list instead of string	2020-10-28 14:25:34 +01:00
Alexander Bock	a93b5fdf10	No long show extra interpolation warning when a slide deck image does not exist (closes #936)	2020-10-20 23:57:10 +02:00
Micah	5fc0a151c3	updating webgui hash	2020-10-19 16:00:12 -04:00
Alexander Bock	0779c54a07	Provide correct error message if the ProfileName is empty ... Don't include Voyager and Pioneer in the base asset as it takes too long to load Ensure that the webgui asset can load without the dashboard Fix scripting issue in Rosetta scene with trails Fix issue with Dashboards that would actually render one line too far down causing trouble with multiline text Set the render option for renderablebillboards to view direction by default as the normal mode has some issues (see #1342) Set more sensible maximum value for RenderablePlanesCloud Correctly show the number of significant digits in the altitude Replace setPropertyValue with setPropertyValueSingle when clicking on the friction "buttons" on screen Add a new script function hasProperty to check whether a property exits	2020-10-17 20:10:15 +02:00
Micah	26565cf270	launcher label and profile fixes	2020-10-13 12:42:10 -04:00
Alexander Bock	d0aaaeb090	Merge remote-tracking branch 'origin/master' into feature/profile-gui ... # Conflicts: # data/profiles/apollo8.profile # data/profiles/apollo_sites.profile # data/profiles/asteroids.profile # data/profiles/dawn.profile # data/profiles/default.profile # data/profiles/default_full.profile # data/profiles/gaia.profile # data/profiles/insight.profile # data/profiles/juno.profile # data/profiles/mars.profile # data/profiles/messenger.profile # data/profiles/newhorizons.profile # data/profiles/osirisrex.profile # data/profiles/rosetta.profile # data/profiles/touch.profile # data/profiles/voyager.profile	2020-10-13 16:32:58 +02:00
Micah	21774b937b	sending exoplanet names for gui panel	2020-10-13 05:24:26 -04:00
Micah	d88f6eda6b	update of all profiles to json format, few asset fixes	2020-10-12 04:22:16 -04: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
Micah	0f667685da	update for modelgeometry; fix for pioneer sync	2020-10-09 16:28:22 -04:00
Micah	102454089a	update DU assets for gui.description	2020-10-09 14:24:46 -04:00
Micah	d800876879	mars layers	2020-10-02 17:20:21 -04:00
Micah	2e61a0ba72	start of asset meta update	2020-09-25 17:14:41 -04:00
Emma Broman	8c87246e43	Remove old delta time keys code	2020-09-21 13:37:31 +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	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
Emma Broman	19c110a4c2	Update gui hash	2020-08-25 13:08:54 +02: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
Emma Broman	a636faeaac	Add option to immediately set delta time step, without interpolation	2020-08-24 11:32:32 +02:00
Emma Broman	457dabe9b7	Add list of delta time steps, stepping functions and keybindings	2020-08-24 11:32:31 +02:00