4887 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Emil Axelsson	2fa42859cd	Decentralize resource synchronization. Remove notion of SynchronizationJob.	2017-11-12 19:09:16 +01:00
Emil Axelsson	19812af629	Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management	2017-11-11 19:10:42 +01:00
Emil Axelsson	a73f2e0d00	Work on asset synchronization	2017-11-11 18:48:07 +01:00
Alexander Bock	758e26789c	More coding style conformance	2017-11-11 11:25:49 -05:00
Alexander Bock	f29b15a37f	Add a rotation method that follows a fixed scene graph node ... Add missing file for ImGui	2017-11-10 17:15:00 -05:00
Alexander Bock	28e1298be6	Only include touchbar file if on Apple	2017-11-10 13:38:47 -05:00
Alexander Bock	f183b9536f	Implement GUI button and featured elements on touchbar	2017-11-10 13:19:46 -05:00
Emil Axelsson	916f94d70e	Terminate torrent thread on destruction	2017-11-10 16:42:55 +01:00
Emil Axelsson	c3d7cb657b	Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management	2017-11-10 16:14:25 +01:00
Emil Axelsson	c479cb5079	Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management	2017-11-10 16:10:41 +01:00
Emil Axelsson	cb07af4a2b	Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management	2017-11-10 16:07:58 +01:00
Alexander Bock	bc95d13c31	Updated ImGui external	2017-11-10 09:58:53 -05:00
Alexander Bock	953d1581ae	Update libTorrent repository	2017-11-10 09:47:37 -05:00
Alexander Bock	afa1d6d33e	Add strict test for whitespace at end of line ... More work on coding style	2017-11-09 23:47:51 -05:00
Alexander Bock	7b12a241ed	Remove BOMs ... Fix coding style and script	2017-11-09 19:10:32 -05:00
Alexander Bock	aa20c677dd	Move onscreen rendering into SGCT's render2D function (closes #181) ... Same fix makes GUI windows work again (closes #412)	2017-11-09 18:12:13 -05:00
Alexander Bock	51a71d5ce2	Compile fix to adjust to runTime method not existing anymore	2017-11-09 14:58:43 -05:00
Alexander Bock	5fe98b85ff	Merge pull request #403 from OpenSpace/feature/fieldlineSequence ... Feature/fieldlinesSequence	2017-11-09 12:23:13 -06:00
Alexander Bock	d1735af1ed	Fix compile error in iswa module	2017-11-09 11:41:27 -05:00
Alexander Bock	ca7053d8f2	Fix bug with layer support for height maps	2017-11-09 10:20:33 -05:00
Alexander Bock	8866a13ff6	More coding style fixes	2017-11-08 21:36:06 -06:00
Alexander Bock	ad3df78e1a	Add strict coding style check for line length	2017-11-08 19:26:28 -06:00
Alexander Bock	44806687bf	Fix bug with applying colormap in RenderableBillboardsCloud	2017-11-08 12:21:15 -06:00
Alexander Bock	b50b52d351	Cleanup for coding style ... Add strict mode to check_style_guide script	2017-11-08 10:35:39 -06:00
Emil Axelsson	d94408224c	Compile fix for Windows	2017-11-07 18:04:35 +01:00
Alexander Bock	80f5706049	Remove warnings on Clang	2017-11-07 09:19:45 -06:00
Emil Axelsson	3d9481a4fc	Make screen log thread safe	2017-11-07 00:14:50 +01:00
Emil Axelsson	8da01993cd	Add support for Magnet Links	2017-11-07 00:00:26 +01:00
Emil Axelsson	3d8c7ad0a4	Make screen log thread safe	2017-11-06 22:11:58 +01:00
Emil Axelsson	87595812d2	Remove BOM	2017-11-06 21:22:43 +01:00
Emil Axelsson	e201dec907	Start work on TorrentSynchronization	2017-11-06 19:07:52 +01:00
Emil Axelsson	1f33359697	Cleanup and better configuration of resource syncs	2017-11-05 23:17:51 +01:00
Emil Axelsson	43664d34b7	Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management	2017-11-05 20:04:47 +01:00
Emil Axelsson	81e81d04e4	Force Cmake flags for Libtorrent	2017-11-05 20:04:01 +01:00
Emil Axelsson	88c5733d00	Only synchronize http resources if missing	2017-11-05 19:34:17 +01:00
Emil Axelsson	03aab55a1f	Asset synchronization using HTTP	2017-11-05 19:02:31 +01:00
Alexander Bock	7ab79ce687	Update Digital Universe stars	2017-11-04 09:45:10 -04:00
Alexander Bock	ca69408366	Enable minimum picking distance in NDC	2017-11-02 12:05:09 -04:00
Alexander Bock	4a449f3668	Update starlabels.data file	2017-11-02 12:05:04 -04:00
Emil Axelsson	96f512484b	Asset loading fix on mac	2017-11-01 14:54:03 +01:00
Emil Axelsson	c7f16189d8	Compile fix for macOS	2017-11-01 14:31:14 +01:00
Emil Axelsson	a7a0715200	Restructure sync directories and change sync API	2017-11-01 12:31:40 +01:00
Emil Axelsson	2313a275d3	Resource syncing infrastructure	2017-10-31 17:46:48 +01:00
Alexander Bock	3ea8f0e129	Add constellation files to GitIgnore ... Add spherical mirror configuration file Add the Spout output configration file	2017-10-31 08:12:27 -04:00
Emil Axelsson	fba556b11f	Always create a camera	2017-10-31 10:55:20 +01:00
Emil Axelsson	19393feac8	Work on syncing and initialization of assets	2017-10-31 10:04:02 +01:00
Alexander Bock	0f8adec9aa	Show on-screen information about friction status	2017-10-30 14:28:03 -04:00
Alexander Bock	a2e7614112	Update Ghoul ... Fix AssImp CMake warnings	2017-10-30 09:49:10 -04:00
Emil Axelsson	8059fb05e9	More work on asset management	2017-10-27 16:43:04 +02:00
Emil Axelsson	a9c74977fd	Work on asset management	2017-10-27 14:42:45 +02:00