mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,520 Commits 83 Branches 46 Tags
32632f2df0e18d760ffbae991e91589f549eb55d
Commit Graph

186 Commits

Author SHA1 Message Date
Alexander Bock
539c0d7554 Fixing correct C++17 specification in CMake (trying to fix #501) 2018-02-12 10:12:56 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues 
Update Ghoul repository
 2017-12-29 19:18:06 +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
570ce9813d Add CMake configure file that writes the Git branch and commit hash into a file 2017-12-23 20:27:54 +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
Alexander Bock
a08c678bb0 Remove erraneous enabled OpenGL checking code 
Remove warnings
Reset using the star glare texture as billboard for the Sun
 2017-12-12 13:07:56 -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
Alexander Bock
669078201a Add check for usage of ghoul_assert instead of plain old assert 
Update Ghoul
 2017-11-16 16:12:54 -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
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
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06: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
88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
 2017-11-09 10:51:56 -05:00
Alexander Bock
ad3df78e1a Add strict coding style check for line length 2017-11-08 19:26:28 -06:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
 2017-11-08 19:10:59 -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
Alexander Bock
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06: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
9fe27ba0d9 Fix CMake configuration regarding application settings 2017-10-23 13:01:45 -07: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
42a7341207 Honor the option for building applications and don't overwrite with the default value 
Remove unknown warning-warning from Clang
 2017-09-30 13:06:05 -04:00
Emil Axelsson
4cdae984e9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-09-11 11:52:31 +02:00
Alexander Bock
c3825cc81e Only display commit hash text overlay if there is information available 
Add version and commit information into a global property
 2017-08-31 11:37:22 -04:00
Alexander Bock
0ceab49df7 Update gitignore to include Mars texture 
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
 2017-08-30 14:56:02 -04:00
Alexander Bock
09a94e6bf5 Workaround for Visual Studio 15.3 compile fix in Windows headers 2017-08-18 15:44:06 -04:00
Emil Axelsson
75fccbefcd Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	modules/globebrowsing/globebrowsingmodule.cpp
 2017-08-18 13:26:50 +02:00
Alexander Bock
621dd20f45 Fix include of default applications 2017-08-16 15:08:47 -04: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
Alexander Bock
52b257a62c Support nested module directories (closing #369) 2017-08-14 16:11:36 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381) 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
 2017-08-14 09:38:32 -04:00
Emil Axelsson
cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
 2017-08-14 11:17:25 +02:00
Alexander Bock
02ce2a1b2a Merge pull request #375 from OpenSpace/feature/property-documentation 
Feature/property documentation

Adds documentation strings to properties
Fix all the errors that occurred during the change
Fix capitalization of property names
 2017-07-26 19:59:56 -04:00
Arfon Smith
4fc5bc5384 Fixing up YAML affiliations 2017-07-26 12:20:54 -04:00
Alexander Bock
dc79a94142 Remove warnings 
Update SGCT repository
Update Ghoul repository
 2017-07-26 11:59:48 -04:00
Alexander Bock
2cef26c1e3 Update paper.md 
Add indexed affiliations
Add references to the Summary text
 2017-07-25 12:12:05 -04:00
Alexander Bock
e661324002 Remove style guide errors 
Add missing newline errors
 2017-07-21 11:52:25 -04:00
Emil Axelsson
84a52c091a Work on assets 2017-07-20 17:06:34 +02:00
Alexander Bock
631f53ed2d Append a check for UTF-8 BOM to the check_style_guide.py 
Add a script to remove a BOM
 2017-07-17 15:58:13 -04:00
Alexander Bock
713b5bb97b Fix compile error in iSWA module 
Update warning specification for modules
Disable unreferenced local function warning
Update Ghoul
 2017-07-15 17:48:03 -04:00
Alexander Bock
93cb8a98da Set correct compiler flags for OpenSpaceTest 2017-07-15 16:12:49 -04:00
Alexander Bock
469140f4f0 C++17 nested namespace test 2017-07-15 15:37:42 -04:00
Klas Eskilson
98534bc1ec Normalize ALL the line endings (#361) 
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
 2017-07-13 12:08:47 -04:00
Alexander Bock
23a97e982b Remove the SIMD project and thus remove the dependency on NASM 2017-07-10 13:48:00 -04:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Alexander Bock
90a937e127 Merge branch 'master' into feature/cpp17-update 2017-07-01 15:47:00 -04:00
Alexander Bock
8a781a2028 Compile fix for Windows 10 SDK 2017-07-01 15:26:39 -04:00
eriksunden
0d05d30396 Feature/packaging (#333) 
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
 2017-07-01 14:04:37 -04:00