 Michael Nilsson
|
74df9be099
|
fieldline lua table creation logic moved to luacygnetconverter
|
2016-06-27 11:54:46 -04:00 |
|
|
Michael Nilsson
|
78ee734b56
|
create luacygnetconverter
|
2016-06-27 09:40:40 -04:00 |
|
|
Michael Nilsson
|
a0d11ada41
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-24 14:18:14 -04:00 |
|
|
Michael Nilsson
|
53c2534df6
|
refactor iswamanager
|
2016-06-24 14:18:00 -04:00 |
|
|
Sebastian Piwell
|
5c5e668f49
|
Moved some files
|
2016-06-24 09:45:43 -04:00 |
|
|
Sebastian Piwell
|
320b7efa43
|
Linux compile fix
|
2016-06-23 15:38:58 -04:00 |
|
|
Michael Nilsson
|
16618e4f48
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-23 11:27:12 -04:00 |
|
|
Michael Nilsson
|
65daa4223b
|
add const to iswamanager functions and another fix for filter
|
2016-06-23 11:26:57 -04:00 |
|
|
Sebastian Piwell
|
11cbfcf949
|
Merge branch 'develop' into feature/iSWA
|
2016-06-23 11:22:39 -04:00 |
|
|
Sebastian Piwell
|
f9a6338cbf
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-23 11:22:09 -04:00 |
|
|
Sebastian Piwell
|
66303c6960
|
Update ghoul
|
2016-06-23 11:21:56 -04:00 |
|
|
Michael Nilsson
|
427c8ad29a
|
solve merge conflict
|
2016-06-23 10:49:14 -04:00 |
|
|
Sebastian Piwell
|
a7b9ecc14c
|
Some cleanup
|
2016-06-23 10:40:10 -04:00 |
|
|
Michael Nilsson
|
4486fd9a80
|
fix for duplicate dataoptions dropdown in gui
|
2016-06-23 10:31:45 -04:00 |
|
|
Sebastian Piwell
|
efb141c66c
|
Auto filter and normalize values bug fix
|
2016-06-23 09:55:18 -04:00 |
|
|
Sebastian Piwell
|
ffe82f922a
|
Filter between values
|
2016-06-23 09:24:56 -04:00 |
|
|
Sebastian Piwell
|
10839285ab
|
Solved merge conflict
|
2016-06-22 15:17:33 -04:00 |
|
|
Sebastian Piwell
|
a14cfe2018
|
Normalize based on entropy
|
2016-06-22 15:11:45 -04:00 |
|
|
Michael Nilsson
|
cd7ce765a9
|
made member variables private in dataprocessor
|
2016-06-22 14:41:28 -04:00 |
|
|
Michael Nilsson
|
22d03a3bcd
|
get dimensions from metadata differently, documentation, change dataprocessor method args to const
|
2016-06-22 14:17:59 -04:00 |
|
|
Michael Nilsson
|
db4b241485
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-22 09:56:00 -04:00 |
|
|
Alexander Bock
|
debe475647
|
Updating to newest Ghoul version
Reenabling default.scene as the default scene
releases/v0.3.4
|
2016-06-22 15:30:16 +02:00 |
|
|
Alexander Bock
|
5cc5f52abd
|
Merge branch 'develop' into release/ips
# Conflicts:
# ext/ghoul
|
2016-06-22 10:01:48 +02:00 |
|
|
Alexander Bock
|
c913979d6f
|
Add Resolution tag to the single file, enforcing a smaller framebuffer resolution on Mac systems
|
2016-06-22 10:00:27 +02:00 |
|
|
Alexander Bock
|
37e18441dc
|
Support GDAL on non-Windows platforms
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
|
2016-06-22 08:51:58 +02:00 |
|
|
Alexander Bock
|
c3b3e1107e
|
Updated Ghoul version
|
2016-06-22 08:28:01 +02:00 |
|
|
Alexander Bock
|
342ed2f161
|
Let Downloadmanager use new thread methods
|
2016-06-22 08:27:24 +02:00 |
|
|
Michael Nilsson
|
7cbd558dda
|
change from http to http for heroku server
|
2016-06-21 13:16:05 -04:00 |
|
|
Michael Nilsson
|
8ea1259c58
|
removed includes
|
2016-06-21 11:31:06 -04:00 |
|
|
Michael Nilsson
|
122f44384b
|
windows fix
|
2016-06-21 11:21:37 -04:00 |
|
|
Michael Nilsson
|
8f0c8e422b
|
get initial group properties, cleanup of includes
|
2016-06-21 10:53:08 -04:00 |
|
|
Alexander Bock
|
e671a59ede
|
Merge branch 'develop' into release/ips
|
2016-06-21 14:24:53 +02:00 |
|
|
Alexander Bock
|
3775bbe6b1
|
Always write values to the projected texture even when normal-test fails (closing #103)
|
2016-06-21 14:24:23 +02:00 |
|
|
Michael Nilsson
|
1110abc02c
|
correct filter span without histogram
|
2016-06-20 15:26:20 -04:00 |
|
|
Michael Nilsson
|
294a29d99a
|
merge conflict + update ghoul ref
|
2016-06-20 13:46:38 -04:00 |
|
|
Sebastian Piwell
|
c285f4b156
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-20 12:01:31 -04:00 |
|
|
Sebastian Piwell
|
16bdc88633
|
Correctly unnormalize standardscroe normalization
|
2016-06-20 12:01:21 -04:00 |
|
|
Michael Nilsson
|
2d47eb7a6d
|
fix for crash when plain format file downloaded to screenspacecygnet and texturecygnet
|
2016-06-17 16:22:21 -04:00 |
|
|
Alexander Bock
|
f7502de92f
|
Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips
|
2016-06-17 22:06:58 +02:00 |
|
|
Kalle Bladin
|
dd70733c2a
|
Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable.
|
2016-06-17 15:52:32 -04:00 |
|
|
Alexander Bock
|
c3eda5e4e6
|
Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips
|
2016-06-17 21:37:43 +02:00 |
|
|
Sebastian Piwell
|
8468742d6b
|
Better auto contrast
|
2016-06-17 14:20:06 -04:00 |
|
|
Michael Nilsson
|
c5b1a5e53a
|
fix bug crash if load screenspaceimage from disk + catch textureloading exception texturecygnet
|
2016-06-17 14:03:23 -04:00 |
|
|
Kalle Bladin
|
153d239790
|
Catch exceptions when not able to read a GDAL dataset.
|
2016-06-17 13:07:15 -04:00 |
|
|
Alexander Bock
|
da0190ae1c
|
Remove default-performance measurements from default scene
|
2016-06-17 18:31:51 +02:00 |
|
|
Alexander Bock
|
82f97943c5
|
Use correct histograms for ENLIL
|
2016-06-17 18:31:39 +02:00 |
|
|
Alexander Bock
|
8bf06cdff2
|
Set fieldlines scene to the correct time of January 1st, 2015
|
2016-06-17 18:30:56 +02:00 |
|
|
Alexander Bock
|
0cefde84d2
|
Fix shader compile error for inside volume raycasting
|
2016-06-17 18:30:39 +02:00 |
|
|
Alexander Bock
|
c587b5cdb9
|
Fix tabs
|
2016-06-17 18:30:12 +02:00 |
|
|
Alexander Bock
|
190bd4726f
|
Add performance measurements to ABufferRenderer
|
2016-06-17 18:30:01 +02:00 |
|