mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 01:41:29 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,632 Commits 81 Branches 46 Tags
f15efdad6ed19f8a2dab48aaa00ec6d0451ade63
Commit Graph

110 Commits

Author SHA1 Message Date
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock
6891861058 Add server request script used for the DownloadManager 2016-09-07 16:32:19 +02:00
Erik Broberg
3554392934 Add optional params -size and -cols for run_multiple_nodes script 2016-09-03 23:33:00 -04:00
Erik Broberg
ea532b10c6 Add firmSync as an option to run_multiple_nodes.js 2016-09-03 23:16:11 -04:00
Erik Broberg
697afc4959 Generate OpenSpace windows located in a grid 2016-09-03 17:39:33 -04:00
Erik Broberg
46107cc23f run_multiple_nodes generates and reads xml in same directory as itself 2016-09-01 15:54:21 -04:00
Erik Broberg
b9c76034ba Move and improve node script for starting multiple instances of OpenSpace 2016-09-01 15:28:47 -04:00
Alexander Bock
460da3893e Add ability to define external libraries which will cause DLLs to be copied to application directories automatically 
Add gdal.dll as external library to the globebrowsing module
 2016-08-26 23:47:08 +02:00
Erik Broberg
cd16e73f56 Add node helper script for generating mission file from spice kernels 2016-08-23 12:47:41 -04:00
Alexander Bock
1900abc70f Enable Edit and Continue feature 2016-08-17 11:25:58 +02:00
Emil Axelsson
95ea64609f link against zlibstatic built by ghoul 2016-08-15 13:36:04 +02:00
Alexander Bock
af672b6a4e - Update Ghoul reference 
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
 2016-08-11 11:12:15 +02:00
Alexander Bock
b72167a270 Add dependency calculation to the buildAllModuleCombination Jenkins script (closing #116) 2016-08-01 14:34:36 +02:00
Alexander Bock
5fb03eeb4a CMake generator fix for when no modules are selected 2016-08-01 14:13:42 +02:00
Alexander Bock
c418536827 Add script to build OpenSpace with no modules enabled 2016-08-01 14:06:46 +02:00
Alexander Bock
393f39de2e Let the module registration script return a lambda that will contain all modules, thus removing the static initialization order problem 2016-07-31 19:25:15 +02:00
Alexander Bock
0c3b2c55d9 Removing more CppCheck warnings 2016-07-28 20:31:53 +02:00
Alexander Bock
4068ec747b Remove CppCheck warnings 2016-07-28 18:04:08 +02:00
Alexander Bock
8f325f5cd6 Update CppCheck suppressions file 2016-07-28 15:46:08 +02:00
Alexander Bock
07e8a059d1 Correctly output CMake messages about dependency only when they are needed 2016-07-27 20:46:56 +02:00
Alexander Bock
8dc2cdbbea Correctly set SGCT default values 2016-07-20 16:24:00 +02:00
Alexander Bock
6a56e4c83c Link GLFW library requirements 
Update SGCT reference
 2016-07-20 14:52:24 +02:00
Alexander Bock
65ddeba70c Add SGCT as submodule 
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
 2016-07-20 14:31:30 +02:00
Alexander Bock
eeb20d2cb7 Add Spice as a submodule 2016-07-19 15:03:23 +02:00
Alexander Bock
c4e9c88e91 Only display actually included modules in the CMake log (closing #122) 2016-07-18 12:02:29 +02:00
Alexander Bock
bfbf823959 Update default Qt version to 5.6 
Fixed compilation issue on Mac
 2016-04-30 10:24:49 +02:00
Alexander Bock
de8255f8ed Updated convert_tabs script 2016-04-27 14:24:41 +02:00
Alexander Bock
248014b6c2 Add Python script that converts tabs into spaces 2016-04-18 20:06:48 +02:00
Alexander Bock
cf517f5309 Replacing CMake-based version setting with C++-based version 
Adding function to OpenSpace that returns the license header
 2016-04-14 10:27:59 -04:00
Alexander Bock
5181d812cd Update Ghoul repository 2016-03-20 23:30:54 +01:00
Alexander Bock
66fdf4b6a4 Increasing required Visual Studio version to 2015 
Moving external library handling from OpenSpace to Ghoul
 2016-02-07 20:35:25 +01:00
Alexander Bock
86e6c21f96 - Make missing SGCT a non-fatal error in CMake 
- Add screen sizes to the abuffer dictionary
- Use the new method for setting the screen size in the star rendering
 2016-02-04 21:41:17 +01:00
Alexander Bock
85ce552cc8 Remove unused CMakeLists file 2016-01-18 18:39:19 +01:00
Alexander Bock
fc60692aeb Remove hard-coded C++ version checking from CMake and replaced with CXX_STANDARD CMake property 2016-01-18 18:16:02 +01:00
Alexander Bock
875de328aa Update Ghoul version 
Make the modules depend on C++14
Change the OpenSpace code to the new Ghoul version
 2015-12-07 18:54:17 -05:00
Alexander Bock
31db5c1603 Merge branch 'feature/fontrendering' into feature/cleanup 2015-11-23 22:31:53 -05:00
Alexander Bock
fbc501450a Updated support files to enable SPICE on MSVC14 2015-11-23 22:24:13 -05:00
Alexander Bock
01c1586616 Updated OpenSpace's requirement to C++14 
Adopted changes from Ghoul cleanup
 2015-11-22 02:53:44 -05:00
Alexander Bock
1ca4b9c285 Enable NOMINMAX compiler defintions in Windows on default 2015-10-13 00:15:44 +02:00
Alexander Bock
6801c4e9a9 Continue using CheckCXXCompilerFlag on unix 2015-07-17 14:15:13 +02:00
Alexander Bock
d104bd29ea Fix in CXX_STANDARD definition for modules in Apple and Unix 2015-07-17 14:06:12 +02:00
Alexander Bock
0ed8a36071 Change from CheckCXXCompilerFlag to CXX_STANDARD 2015-07-16 20:37:42 +02:00
Alexander Bock
ccab7ec32c Correctly Set the CMAKE_PREFIX_PATH for Qt on Mac 2015-07-04 21:48:21 +02:00
Alexander Bock
8fc343b57f Non-Windows compile fix 2015-07-04 20:34:32 +02:00
Alexander Bock
1510aca448 Add stylesheets and general improvements 2015-07-04 13:22:03 +02:00
Alexander Bock
febb9f87ee Set Launcher as default application 
Don't copy curl.dll on non-windows system
 2015-06-22 18:45:12 +02:00
Alexander Bock
249081c556 Correct CURL cmake specification 2015-06-22 18:34:38 +02:00
Alexander Bock
4fbf08b6b8 Add the FindCurl module from CMake into the support directory 2015-06-22 18:29:51 +02:00
Alexander Bock
88917f1ede Remove unused build GUI option from CMakeLists 2015-06-18 16:57:06 +02:00
Alexander Bock
613b6b3193 Move Spice kernels to new location 
Enable loading of openspace.cfg in Loader
Make save locations based on FileSys tokens
Disable LIBCMT linking of applications that link against libOpenSpace
 2015-06-17 00:23:57 +02:00