mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-17 19:10:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,434 Commits 84 Branches 46 Tags
cb77e2839cd68d3367ec8263cd481c2104f55c13
Commit Graph

239 Commits

Author SHA1 Message Date
Alexander Bock
1bd1b18301 Merge pull request #493 from OpenSpace/issue/488 
Update sgct repository
 2018-02-06 11:50:44 -05:00
Alexander Bock
8551d6799e Update Ghoul repository (closes #483) 
Do not let exception leak out of OpenSpaceEngine::create method
Add double dash to long name commandline arguments
 2018-02-06 11:34:42 -05:00
Alexander Bock
f7a3fa9ebf Update sgct repository 
Make use of new sync parametrization to disable messages and set waitout time to 15 minutes (closes #488)
 2018-02-06 10:10:42 -05:00
Emil Axelsson
32e8f99af4 Update OpenSpace application icon 2018-01-12 23:22:52 +01:00
Alexander Bock
6089449bba Fix crash with MSAA buffer generation when compiling in Debug on Windows 
Cleanup of logging behavior
 2017-12-30 20:24:05 -05:00
Alexander Bock
7ab26b3015 Fix TaskRunner 2017-12-30 15:56:24 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
cc178d03f3 Remove clang warnings 
Update SGCT repository
 2017-12-29 19:47:33 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues 
Update Ghoul repository
 2017-12-29 19:18:06 +01:00
Alexander Bock
b337c3aa1e Windows compile fix 2017-12-28 14:15:06 -05:00
Alexander Bock
3201bab8d6 Add icons to Sync and TaskRunner applications 2017-12-26 23:38:51 +01:00
Alexander Bock
7520241387 Make OpenSpace an AppBundle on MacOS 
Add icon to AppBundle
 2017-12-26 23:06:31 +01:00
Alexander Bock
339c45a7f6 Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder 
Replace TaskRoot in openspace.cfg with ${TASK} in Taskrunner
Remove Launcher
 2017-12-26 20:13:23 +01:00
Alexander Bock
c7c4f01f26 Make SyncTask work with globebrowsing scripts 
Add additional error information to http request
 2017-12-24 01:45:22 +01:00
Alexander Bock
4c92b9ccbb First steps towards making OpenSpaceEngine resilient against SGCT configuration errors 2017-12-23 20:39:23 +01:00
Alexander Bock
4b65e20570 Support loading of .asset and .scene files 
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
 2017-12-23 08:08:12 +01:00
Emil Axelsson
fd550fc372 Fix compilation issues and bugs on windows 2017-12-18 10:22:42 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Alexander Bock
c321d76b3e Add try/catch blocks around the rendering to detect excess of texture units (closes #427) 2017-12-11 23:48:56 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Emil Axelsson
fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Alexander Bock
38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Emil Axelsson
62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00
Alexander Bock
bbd019e8dd Jenkins build hotfix 2017-11-12 10:52:26 -05:00
Alexander Bock
76b26c0128 Change to different libTorrent version 2017-11-11 16:06:02 -05:00
Alexander Bock
6911a0cade Revert libtorrent back to an RC version 2017-11-11 15:41:57 -05:00
Emil Axelsson
19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +01:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05: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
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
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
b50b52d351 Cleanup for coding style 
Add strict mode to check_style_guide script
 2017-11-08 10:35:39 -06:00
Alexander Bock
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson
e201dec907 Start work on TorrentSynchronization 2017-11-06 19:07:52 +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
157d91d631 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-26 13:43:49 +02:00
Alexander Bock
269dda8aff Remove runTime from OpenSpaceEngine and place in WindowWrapper instead 2017-10-24 01:33:53 -07:00
Alexander Bock
2bfbf82403 Fix Tully download 
Guard against stray .data files
 2017-10-19 23:56:16 -04:00
Emil Axelsson
97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +02:00
Emil Axelsson
3307b3f3bc Update logo in Launcher 2017-10-18 17:12:30 +02:00
Emil Axelsson
7eb65c54be Guard against concurrent downloads of the same file 2017-10-18 16:57:38 +02:00
Emil Axelsson
1862b804a9 Use libtorrent as a git submodule. Support base library functions in Lua execution of the Launcher. 2017-10-18 14:47:01 +02:00
Emil Axelsson
ed89587487 Remove libtorrent from repository 2017-10-17 14:20:55 +02:00
Emil Axelsson
2623912ec9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-16 11:07:24 +02:00
Alexander Bock
06550ea42f Add support for OpenGL 4.6 
Compile fix in rawvolumewriter
 2017-10-11 09:05:10 -04:00
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350) 
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
 2017-09-22 12:03:23 +02:00
Emil Axelsson
2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
 2017-08-15 11:43:18 +02:00