 Michael Nilsson
|
99ef3c13da
|
update ghoul reference
|
2016-05-20 14:11:56 -04:00 |
|
|
Michael Nilsson
|
8ca457b14c
|
solve merge conflict with develop
|
2016-05-20 09:33:41 -04:00 |
|
|
Emil Axelsson
|
ca46661d3e
|
fix compile errors for osx
|
2016-05-20 00:39:29 +02:00 |
|
|
Sebastian Piwell
|
672933cd05
|
Choose slice of kameleonPlane
|
2016-05-19 15:14:11 -04:00 |
|
|
Sebastian Piwell
|
0d54a24891
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-05-19 14:05:18 -04:00 |
|
|
Sebastian Piwell
|
bb2da4dd2a
|
Choose resolution of KameleonPlane
|
2016-05-19 14:05:13 -04:00 |
|
|
Michael Nilsson
|
cd5431cb33
|
add try catch around json parse in kameleonwrapper, add doc comments to methods
|
2016-05-19 11:23:01 -04:00 |
|
|
Alexander Bock
|
7b525d1b29
|
Move keybindings for the newhorizons scene into its own file
|
2016-05-19 17:20:38 +02:00 |
|
|
Alexander Bock
|
50d8b93d30
|
Convert projected images instead of swizzling for RenderablePlanetProjection
|
2016-05-19 17:17:18 +02:00 |
|
|
Sebastian Piwell
|
91b159cb74
|
Merge fix
|
2016-05-19 11:16:46 -04:00 |
|
|
Sebastian Piwell
|
e3c7624605
|
Read cdf slice of any axis
|
2016-05-19 10:55:59 -04:00 |
|
|
Alexander Bock
|
f9358d4e45
|
Remove debugging code from RenderableTrail
|
2016-05-19 16:45:15 +02:00 |
|
|
Michael Nilsson
|
8306df2618
|
solve merge conflict
|
2016-05-19 10:11:50 -04:00 |
|
|
Michael Nilsson
|
b7343398d0
|
fieldlines selection added to kamelionplane
|
2016-05-19 10:08:51 -04:00 |
|
|
Alexander Bock
|
b964cbe1a2
|
Remove comments in Downloadmanager
|
2016-05-19 13:25:47 +02:00 |
|
|
Alexander Bock
|
54fa1c8cbc
|
Merge branch 'feature/rosetta' into develop
|
2016-05-19 13:24:26 +02:00 |
|
|
Alexander Bock
|
caae5336b5
|
Make use of new thread priority scheme
Updated Ghoul repository
|
2016-05-19 13:23:40 +02:00 |
|
|
Alexander Bock
|
94bac5d886
|
Fix RenderableTrails artifacts with high delta time (closing #84)
|
2016-05-19 12:46:11 +02:00 |
|
|
Alexander Bock
|
92df988bb6
|
Show some information when NewHorizons is not present
|
2016-05-18 21:37:41 +02:00 |
|
|
Alexander Bock
|
dba650c80d
|
Create separate key bindings for rosetta mission
Prolong rosetta trail
|
2016-05-18 21:37:27 +02:00 |
|
|
Sebastian Piwell
|
100a1e8749
|
Process Kameleon data
|
2016-05-18 15:06:35 -04:00 |
|
|
Sebastian Piwell
|
9387e6d993
|
Fill option function
|
2016-05-18 14:44:16 -04:00 |
|
|
Alexander Bock
|
ecf1862eb3
|
Only show Pluto text information when NewHorizons node is present
|
2016-05-18 20:40:38 +02:00 |
|
|
Sebastian Piwell
|
19c301f769
|
Options to Kameleonplane
|
2016-05-18 14:26:29 -04:00 |
|
|
Alexander Bock
|
7d32dba5cb
|
Enable SingleSphereGeometry to have more segments
Another fix for RenderablePlanetProjection heightmap offset
|
2016-05-18 20:19:47 +02:00 |
|
|
Alexander Bock
|
ccffe60eee
|
Use new Rosetta kernels for image projections
|
2016-05-18 19:18:59 +02:00 |
|
|
Alexander Bock
|
e6abbcd73a
|
Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop
|
2016-05-18 19:11:54 +02:00 |
|
|
Alexander Bock
|
0c96a08afa
|
Rename Pluto heightmap and normalmap
|
2016-05-18 19:11:29 +02:00 |
|
|
Alexander Bock
|
0ab3f0c026
|
Some fixes on heightmap displacement for RenderablePlanet
Some fixes on heightmap displacement for RenderablePlanetProjection
Enable optional normal map on RenderablePlanetProjection
|
2016-05-18 19:03:03 +02:00 |
|
|
Sebastian Piwell
|
f5b33158bd
|
Add KameleonPlanes again
|
2016-05-18 11:10:04 -04:00 |
|
|
Sebastian Piwell
|
093d265dff
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-05-18 09:33:43 -04:00 |
|
|
Sebastian Piwell
|
94d8360e73
|
Moved renderproperties functions
|
2016-05-18 09:33:32 -04:00 |
|
|
Emil Axelsson
|
fe4fde67de
|
remove incorrect include path
|
2016-05-18 13:31:33 +02:00 |
|
|
Emil Axelsson
|
5cd8cdd250
|
Merge pull request #82 from OpenSpace/feature/dataconverter
volume conversion tools and really basic data converter app
|
2016-05-18 13:09:01 +02:00 |
|
|
Alexander Bock
|
caeb8618a8
|
Enable heightmaps for RenderablePlanet (closing #21)
|
2016-05-18 12:12:28 +02:00 |
|
|
Emil Axelsson
|
2911168e5b
|
volume conversion tools and really basic data converter app
|
2016-05-18 11:56:06 +02:00 |
|
|
Alexander Bock
|
2f69520331
|
Fix Pluto.mod file
|
2016-05-18 11:30:32 +02:00 |
|
|
Alexander Bock
|
74c7413115
|
Adding functionality to clear projections on RenderableModelProjection (closing #22)
|
2016-05-18 00:36:11 +02:00 |
|
|
Michael Nilsson
|
c3a8bb9bde
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-05-17 17:22:00 -04:00 |
|
|
Michael Nilsson
|
2af533e6fe
|
fetchFile in downloadmanager will fail when response status is 400 or above
|
2016-05-17 17:21:46 -04:00 |
|
|
Sebastian Piwell
|
cd35cea0ee
|
Updated Kameleon plane
|
2016-05-17 17:18:09 -04:00 |
|
|
Sebastian Piwell
|
85e1f01ad5
|
Merge fix
|
2016-05-17 16:17:02 -04:00 |
|
|
Sebastian Piwell
|
ff39239b0f
|
Auto filter of 'background'
|
2016-05-17 16:11:57 -04:00 |
|
|
Michael Nilsson
|
20f43a8110
|
solve merge conflict
|
2016-05-17 16:04:32 -04:00 |
|
|
Michael Nilsson
|
459350707c
|
using fetchFile in IswaManagers addIswaCygnet method
|
2016-05-17 16:00:22 -04:00 |
|
|
Sebastian Piwell
|
08f0204a66
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-05-17 14:10:44 -04:00 |
|
|
Michael Nilsson
|
ae131f88c5
|
changed the naming of min and max value in histogram class
|
2016-05-17 14:02:40 -04:00 |
|
|
Alexander Bock
|
e7f728868d
|
Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop
|
2016-05-17 19:47:46 +02:00 |
|
|
Alexander Bock
|
ed8cebbb9d
|
Fix crash with incidenttargetlist for rosetta
|
2016-05-17 19:47:41 +02:00 |
|
|
Alexander Bock
|
8a5b087d12
|
Remove frame limitation on single.xml
|
2016-05-17 19:26:11 +02:00 |
|