mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,237 Commits 99 Branches 46 Tags
64668e9febff4e9ce9fe11ce3dfb1504dbac3794
Commit Graph

3237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Broberg
64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -04:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Erik Broberg
e832b953c1 Reenable showing height intensities and resolution (after commit 06a5336961) 2016-08-02 18:09:14 -04:00
Alexander Bock
22c2e705f9 Added ESRI AHTSE test datasets (probably incorrectly) 2016-08-02 11:40:55 +02:00
Alexander Bock
06a5336961 Fix debugging with Clang 
Removed include of vertex operations in fragment shader
 2016-08-02 11:39:57 +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
bf4989d396 Changing request URL for the Launcher 
Update gitignore file
 2016-08-01 13:59:10 +02:00
Alexander Bock
81c18b2b62 Updated URLs in code or comments 2016-08-01 11:05:50 +02:00
Alexander Bock
48b5ae9166 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-08-01 09:39:49 +02:00
Alexander Bock
93b30f5078 Some cleanup of RenderableShadowCylinder 2016-07-31 22:23:20 +02:00
Alexander Bock
3fb6d3aa84 Some cleanup of RenderableFov 2016-07-31 21:43:55 +02:00
Alexander Bock
484ef636c7 PerformanceManager will automatically delete SharedMemory object if it was left previously 2016-07-31 21:24:47 +02:00
Alexander Bock
7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Alexander Bock
5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock
052e6007cd Rename static constants in Property class 2016-07-31 19:27:13 +02:00
Alexander Bock
6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties 
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
 2016-07-31 19:26:55 +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
Matthew Territo
c159e027ee Fix for GUI on multi-node setups. 
Reinstated tests for _isMaster and isRegularRendering() with GUI to prevent slave crashes
 2016-07-29 14:27:58 -06:00
Matthew Territo
04eec9e2b7 Remove hardcoded set(BOOST_ROOT) 2016-07-29 11:44:10 -06:00
Alexander Bock
e39a7983aa Generate keyboard mappings on default 2016-07-29 13:37:38 +02:00
Alexander Bock
405c66d6f8 Enable separate orientation setting for non-equatorial rings 2016-07-29 13:28:44 +02:00
Alexander Bock
9f1abc67a2 Enable setting the texture offset for rings 
Enable setting the color-based transparency for rings
 2016-07-29 13:23:43 +02:00
Alexander Bock
635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +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
e13ef7fdc2 Update Ghoul reference 2016-07-28 15:43:39 +02:00
Alexander Bock
f83f0cd2f4 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-07-28 15:42:57 +02:00
Alexander Bock
d8c6b3ddc8 Removing extra space in autumn.tf 2016-07-28 15:42:53 +02:00
Matthew Territo
1943e069a0 FIXED: Extended temporary fade functionality 
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max

Flipped a variable between compiles and apparently lost track of which was the correct one :-/
 2016-07-27 19:32:06 -06:00
Matthew Territo
9a435ac74d Extended temporary fade functionality 
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max
 2016-07-27 19:25:49 -06:00
Matthew Territo
94625e541b FIXED: Slightly rearrange/cleanup OpenspaceEngine::initialize 
Simplify scene file config/commandline logic, group scene and renderEngine work

(Stashed changes took over real changes)
 2016-07-27 17:02:24 -06:00
Matthew Territo
10e00b0d3c Slightly rearrange/cleanup OpenspaceEngine::initialize 
Simplify scene file config/commandline logic, group scene and renderEngine work
 2016-07-27 16:58:04 -06:00
Matthew Territo
10f9742213 Activate scene change dropdown in Global Properties/SettingsEngine 
Included some cleanup how the Scene::update function works with the InteractionHandler
 2016-07-27 16:49:01 -06:00
Matthew Territo
fdb90f74ac Added scene selector in the SettingsEngine, in the GUI under Global Properties. 
Has placeholder functionality for what's coming in the next commit.
 2016-07-27 16:45:43 -06:00
Alexander Bock
035f5ba989 Remove extra whitespace is autumn.tf 2016-07-27 20:49:51 +02:00
Alexander Bock
07e8a059d1 Correctly output CMake messages about dependency only when they are needed 2016-07-27 20:46:56 +02:00
Matthew Territo
f53c4b6193 OptionProperty: ability to get the string description by passing a value 
string getDescriptionByValue(int)
 2016-07-27 09:25:28 -06:00
Alexander Bock
98e7b62834 Update Ghoul repository 2016-07-27 14:42:17 +02:00
Alexander Bock
444f7b6e25 Enable additional warnings 
Update Ghoul reference
Fix relative path in test_gdalwms
 2016-07-27 14:38:37 +02:00
Alexander Bock
f4f4e7de9e More Jenkins compile fixes 2016-07-27 11:01:58 +02:00
Alexander Bock
60ce1872bd Include correct directory for GDAL on non-Win32 systems 2016-07-27 09:25:17 +02:00
Alexander Bock
53b1ff9dea Small change triggering Jenkins update 2016-07-26 20:18:55 +02:00
Alexander Bock
22da60528a Small change triggering Jenkins update 2016-07-26 20:00:15 +02:00
Alexander Bock
5d7aaa1ec6 Small change triggering Jenkins update 2016-07-26 19:58:23 +02:00
Alexander Bock
e197486375 Small change triggering Jenkins update 2016-07-26 19:53:02 +02:00
Alexander Bock
c977a0920f Small change triggering Jenkins update 2016-07-26 19:49:43 +02:00
Alexander Bock
4e61595fc1 Update Ghoul repository 2016-07-26 19:47:34 +02:00