11 Commits

Author	SHA1	Message	Date
Michael Nilsson	1a47008694	solved merge conflict	2016-03-22 09:34:23 -04:00
Sebastian Piwell	d269eedf77	Correct size and position	2016-03-22 09:31:17 -04:00
Michael Nilsson	ea3d50561d	removed cout	2016-03-21 18:04:35 -04:00
Michael Nilsson	1db9d08c2b	attempt to load data from model	2016-03-21 17:41:55 -04:00
Alexander Bock	2f7fbb1f39	Uncomment old Progressbar from Kameleon to make jenkins compile again	2016-02-05 23:00:12 +01:00
Alexander Bock	c87fdfd38b	Fixes for Windows ... Fixing shader paths for fieldlines rendering Update Kameleon to work with MSVC 2015 fix	2016-01-02 21:40:15 +01:00
Alexander Bock	2fce471743	Started cleanup of module structure	2015-12-14 10:50:38 -08:00
Alexander Bock	5227ce2213	Renamed OpenSpaceModule's initialize method to create ... Created new initialize method that gets called in OpenSpaceEngine initialize	2015-06-22 23:09:19 +02:00
Alexander Bock	978b535a2f	Remove setName function from OpenSpaceModule and move naming into constructor	2015-06-22 22:57:15 +02:00
Joakim Kilby	63cce6226e	Removed redefinition of BOOST_ROOT from cmakelists	2015-06-16 11:28:34 +02:00
Alexander Bock	9d733eb613	Moving Kameleon into its own module ... Moving fieldline rendering into its own module	2015-05-26 23:51:15 +02:00