7497 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Bock	77907fc7df	Rename ProfilesReadOnly -> ReadOnlyProfiles	2020-10-13 16:22:05 +02:00
Alexander Bock	fc574ee531	More cleanup ... Update QSS	2020-10-13 15:35:20 +02:00
Alexander Bock	38e0e1e250	Fix crash when trying to add new keybinding	2020-10-13 14:10:55 +02:00
Alexander Bock	b5531c652f	Merge branch 'feature/profile-gui' of https://github.com/OpenSpace/OpenSpace into feature/profile-gui	2020-10-13 14:10:38 +02:00
Micah Acinapura	b7c566089b	fixes to cmake for macos	2020-10-13 06:06:26 -04:00
Alexander Bock	ba8eac51dd	Fix simulation time specification for gaia scene	2020-10-13 11:38:02 +02:00
Alexander Bock	f2a1173dc1	Visually signal correctly if a dropdown menu in the launcher is disabled	2020-10-13 09:56:05 +02:00
GPayne	26b9db81e6	Merge branch 'feature/profile-gui' of https://github.com/OpenSpace/OpenSpace into feature/profile-gui	2020-10-13 00:32:33 -06:00
Gene Payne	23af34de83	Fixes to prevent segfault when OpenSpace app closes	2020-10-13 00:31:42 -06:00
GPayne	769cb4bf38	Added keybinding warning for number keys	2020-10-12 22:27:43 -06:00
GPayne	f2a03ed70e	Fix for linux X11 linking	2020-10-12 19:13:21 -06:00
Alexander Bock	76b0b781a9	Passing around Profile as a reference instead of a pointer	2020-10-12 20:56:11 +02:00
Alexander Bock	2b7680e634	ProfileEdit cleanup	2020-10-12 20:34:12 +02:00
Alexander Bock	35102eb968	Fix issue with the up vector being required	2020-10-12 19:17:13 +02:00
Alexander Bock	3a5f837290	Rename dialog files	2020-10-12 19:14:01 +02:00
Alexander Bock	39362daf78	Move image resources into the launcher folder	2020-10-12 16:15:43 +02:00
Alexander Bock	460cf63468	Correct handling of QSS everywhere ... Add window titles where they were missing	2020-10-12 16:06:38 +02:00
Alexander Bock	b46f00ebff	Cleanup of LauncherWindow	2020-10-12 15:13:27 +02:00
Alexander Bock	53b092be52	Cleanup of ProfileEdit	2020-10-12 14:38:22 +02:00
Alexander Bock	7b4d29c8de	Cleanup of Properties	2020-10-12 12:08:55 +02:00
Alexander Bock	5e375329b3	Cleanup of Time	2020-10-12 11:11:23 +02:00
Micah	d88f6eda6b	update of all profiles to json format, few asset fixes	2020-10-12 04:22:16 -04:00
Alexander Bock	290728eade	Cleanup of Modules Dialog	2020-10-12 01:09:57 +02:00
Alexander Bock	5834e0ddec	Cleanup of Meta code	2020-10-12 00:22:11 +02:00
Alexander Bock	8f9a53ce8b	Use multiline strings for meta fields in profile	2020-10-12 00:01:39 +02:00
Alexander Bock	b8a685b513	Cleanup MarkNodes	2020-10-11 23:38:58 +02:00
Alexander Bock	5b28208890	First pass at keybindings	2020-10-11 22:46:00 +02:00
Alexander Bock	a1c142320a	Cleanup FileSystemAccess	2020-10-11 19:54:18 +02:00
Alexander Bock	97850401a7	Remove ErrorDialog	2020-10-11 19:49:23 +02:00
Alexander Bock	24320fb252	Work on Deltatimes dialog	2020-10-11 19:43:06 +02:00
Alexander Bock	28246460ac	Work on Camera dialog	2020-10-11 18:08:38 +02:00
Alexander Bock	1d0dcec096	Work on asset classes	2020-10-11 15:59:24 +02:00
Alexander Bock	3dcad05430	Rename addedscripts files to additionalscripts	2020-10-11 14:55:11 +02:00
Alexander Bock	a768f530cb	Cleanup for AdditionalScripts Dialog	2020-10-11 13:46:34 +02:00
Alexander Bock	417167890b	First pass at code cleanup	2020-10-11 12:19:55 +02:00
Alexander Bock	5c054e008a	CMake fixes	2020-10-11 12:10:08 +02:00
Alexander Bock	4b26305340	Merge branch 'master' into feature/profile-gui ... # Conflicts: # openspace.cfg	2020-10-11 11:18:45 +02:00
Micah	19b09abd4e	rework launcher images from sync	2020-10-10 12:43:43 -04:00
Alexander Bock	0cd38217d4	Prevent crash when removing a globebrowsing layer	2020-10-10 17:32:15 +02:00
Alexander Bock	9a030bd7db	Update GLFW to 3.03 ... Remove some warnings	2020-10-10 16:29:12 +02:00
Alexander Bock	5b7679bab1	Feature/jenkins (#1317) ... * Update Jenkinsfile * Update submodules	2020-10-10 16:22:43 +02:00
Alexander Bock	01257d2fb2	Compile fix for Debug mode	2020-10-10 15:59:56 +02:00
Alexander Bock	b694633728	Merge pull request #1316 from OpenSpace/feature/asset-meta-update ... Feature/asset meta update	2020-10-10 15:40:24 +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
Micah	922718d827	update for launcher style	2020-10-10 06:03:15 -04:00
Alexander Bock	96ed6cfb70	Merge branch 'master' into feature/asset-meta-update	2020-10-10 12:01:56 +02:00
Micah	532e2a344c	final fixes for merge with json profile	2020-10-09 19:42:13 -04:00
Micah	d524ecf803	Merge branch 'master' into feature/profile-gui	2020-10-09 19:40:46 -04:00
Micah	0f667685da	update for modelgeometry; fix for pioneer sync	2020-10-09 16:28:22 -04:00