cc81c125b4
Merged with problems.
2018-03-14 14:43:16 -04:00
9558d58cee
Preparing branch for merging with stereo
2018-03-14 14:20:12 -04:00
3912936b18
Fixing satellite asset
2018-03-14 14:19:09 -04:00
7503af1f3a
Merge branch 'master' into satellite_asset
2018-03-14 13:30:09 -04:00
0ce8605b97
Print error message when a resource synchronization is rejected ( #546 )
...
* Print error message when a resource synchronization is rejected
2018-03-14 13:29:38 -04:00
bc5712bc5b
Remove setPropertyValue to explicitly disable shading and use the asset specification instead
2018-03-14 13:20:03 -04:00
d2fa7140d7
Fixed compiling issues with log, reset night layer configuration and disabled earth's shading by default. ( #552 )
2018-03-14 13:18:42 -04:00
206ff69e41
Fixed normals. ( #553 )
2018-03-14 13:18:19 -04:00
600f11b5f6
Update Transformationmanager
2018-03-14 13:16:32 -04:00
2bfab657f3
Various small fixes
2018-03-14 13:13:23 -04:00
7d1ee75577
Fix a _loggerCat declaration
2018-03-14 11:37:18 -04:00
968cbef474
Merged master into PerformanceATM
2018-03-13 17:17:34 -04:00
1feb3ea771
Merge branch 'master' into feature/PerformanceATM
2018-03-13 16:51:51 -04:00
880b39b821
Fixed night layer.
2018-03-13 15:15:19 -04:00
737e82584a
Issue/24 ( #549 )
...
* Implemented property animation mechanism
* Added easing functions to Ghoul and make them usable in animation
* Make sure that we don't leave properties around if SceneGraphNodes are deleted
* Adding opacity settings to base renderables
2018-03-13 10:35:10 -04:00
f38c26eff0
Remove warnings
2018-03-12 22:31:01 +01:00
cf3992bbc8
Merge remote-tracking branch 'origin/feature/shader-const'
2018-03-10 19:33:09 -05:00
31cdee1fa1
Make URLSynchronization and HTTPSynchronization download into temporary files and if the download succeeds, transactionally move the temporary file into the correct destination
2018-03-10 05:08:14 -05:00
5b6ae62bab
Add Override parameter for URLSynchronization
...
Add PerformShading asset parameter for RenderablePlanet
Disable shading on default for Earth
2018-03-09 11:42:32 -05:00
92a168f644
Fixes in fieldlinesequence
2018-03-09 02:46:55 -05:00
7ccb42545c
Remove Clang warnings
2018-03-08 20:18:18 +01:00
06ebd75b21
Try to fix Jenkins Windows builds
2018-03-08 19:24:37 +01:00
9709b22bac
Turn Configuration keys from std::string to constexpr const char* for better startup performance
2018-03-08 19:24:03 +01:00
c353e75135
Squeezed the Bits a little more.
2018-03-08 12:28:33 -05:00
ae3b6fe850
Support stb_image based texture reader ( closes #541 )
2018-03-08 17:38:35 +01:00
5a3ef0fda2
Apply coding styles
2018-03-08 05:32:46 -05:00
c5c95a5640
Introduce property to toggle dashboard globally ( closes #545 )
2018-03-08 03:04:57 -05:00
f9d086ee95
Removed warning.
2018-03-07 20:11:45 -05:00
7a549f421d
Merge branch 'master' into feature/PerformanceATMOnline
2018-03-07 20:10:26 -05:00
366ac49cc6
Minor improvements
2018-03-07 20:08:58 -05:00
cc292dd330
Include the build id into the Jenkins path
2018-03-07 19:48:57 -05:00
a744bce0bd
Merge branch 'master' into feature/PerformanceATMOnline
2018-03-07 19:07:45 -05:00
f662e031e6
Undo change in globebrowsing.asset file
2018-03-07 18:17:23 -05:00
33d9ed19f7
Undo change in World_Imagery file
2018-03-07 18:16:45 -05:00
e9d2188028
Update Ghoul repository
2018-03-07 18:15:46 -05:00
a3c849843f
Feature/new formatting ( #547 )
...
* Change to new logging format (closes #542 )
* Adds a screenshots folder that uses the application startup time
* Creating focus nodes for VRT files if the info files contain location information
* Fix issue with removing virtual properties
* Add a method for returning the cartesian coordinates for a geolocation on a planet
2018-03-07 18:10:32 -05:00
4675554471
One Property Tree ( #500 )
...
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
2018-03-06 16:59:06 +01:00
99a9d1e4f2
Merge branch 'master' into feature/PerformanceATM
2018-03-05 09:57:50 -05:00
a098a8edf3
Satellites are now working with new asset architecture
2018-03-02 18:47:27 -07:00
2b4d449329
Put all satellite assets into a single asset file
2018-03-02 18:05:56 -07:00
17c1b03b85
Improved performance even more.
2018-03-02 17:05:03 -05:00
e39ae09b81
Improved performance a little bit.
2018-03-02 11:50:42 -05:00
ebd69d1333
Cleanup FieldlineSequence classes
2018-03-01 19:55:50 -05:00
cd227040b5
Removed commented code.
2018-03-01 17:04:16 -05:00
099bf08922
Updated openspace.cfg
2018-03-01 16:53:12 -05:00
d7183ad362
Added uniform caching.
2018-03-01 16:48:05 -05:00
1b9622c7dd
Improved performance in shaders and transformations.
2018-03-01 16:24:20 -05:00
268a84d776
Merge branch 'master' into satellite_asset
2018-03-01 11:41:04 -07:00
e9ec44fa72
Modifying satellite files for asset architecture
2018-03-01 11:35:28 -07:00
cf8371f304
Fix crash if screenshot folder already existed
2018-02-28 15:32:16 -05:00
Jonathas Costa