3d4e1ec19c
Merge branch 'develop' into release/ips
...
Conflicts:
tests/main.cpp
2016-06-17 11:31:11 +02:00
5925bd9c63
Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp
2016-06-16 17:03:48 +02:00
da956af2bc
Update matrix type in atmosphere (new issues present to be fixed).
2016-06-09 15:21:12 -04:00
b2c895dab0
Merged branch Atmosphere.
2016-06-09 11:45:56 -04:00
012bcaefaf
Solve merge conflicts.
2016-06-07 12:54:52 -04:00
388bb15461
Initial implementation of Atmosphere Effects. Use framebuffer to render it.
2016-06-07 10:35:18 -04:00
700f411784
Merged develop branch into PlanetShadows.
2016-06-06 17:19:11 -04:00
4ac19f21b7
Solve merge conflict.
2016-05-19 12:10:14 -04:00
7549beb5f2
solve merge conflict
2016-05-17 12:53:29 -04:00
3fa5ed39d5
Planet Shadows
2016-05-16 15:41:04 -04:00
ffdaeeedcc
Renamed default_nh.scene to newhorizons.scene
...
Remove all 'projection' suffices from newhorizons classes
2016-05-16 09:30:27 +02:00
04a363bab1
Merge branch 'develop' into feature/globebrowsing
2016-05-04 15:57:44 -04:00
0d49076c54
solve merge conflict with develop
2016-05-03 17:11:28 -04:00
dfd1968f0b
Lua script to add cygnet
2016-05-03 13:24:17 -04:00
d237ae4e1c
Remove generated shaders path
2016-05-01 13:16:26 +02:00
75175512a8
First implementation of moving the startup scripts into the scene description files
2016-04-27 16:46:31 +02:00
07dfafeddb
solve merge conflict with develop
2016-04-20 15:03:51 -04:00
4073f4e6cb
Merged in branch develop to feature/globebrowsing
2016-04-18 20:02:42 -04:00
a59a1bd758
Turn off logging flush for increased performance
2016-04-18 15:15:42 +02:00
ef2981f535
Enable global variables for module Lua scripts (closing #172 )
...
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
299cd27f2c
Fixed bug Camera (view rot matrix had translation components) and structured Camera code
2016-04-14 12:47:12 -04:00
fa3fc8dc87
Transfer function to dataplan and ColorBar
2016-04-13 11:36:43 -04:00
506c624a73
Created new scene with a debug globe in the center.
2016-04-05 15:37:10 -04:00
ba57bd4cf8
solve merge conflict
2016-03-31 09:50:50 -04:00
c935ce6fe0
renamed module dataplane to iswa
2016-03-30 15:27:31 -04:00
333e7886db
Change name of RenderableCelestialBody to Planet
2016-03-30 12:49:54 -04:00
6504919331
Create separate module for planet browsing with an empty class for rendering planets.
2016-03-29 17:41:41 -04:00
48978f38fc
removed mouseinteraction test for screenspacerenderables
2016-03-21 09:20:47 -04:00
5c81ad94f0
Simple test dataplane
2016-03-18 17:55:22 -04:00
8bc736acec
Add render functions to screenspaceframebuffer
2016-03-17 17:52:07 -04:00
994530265d
Added new scene files to the configuration file (These new files are commented by default).
2016-03-16 09:10:52 -04:00
cae966ba56
Remove the hard-coded ABuffer implementation for support on Mac
2016-02-07 14:05:54 +01:00
7e3024959a
Remove the disabling of the blend function after an image projection that caused flickering
...
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +01:00
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
bae8d0aa76
Making OpenSpaceTest application compile with API change
...
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +01:00
d84edc4090
More work on transitioning to windowwrapper for keyboard and mouse interaction
2015-10-25 17:34:03 -05:00
7bf24ec74e
Remove the rendering method override
2015-06-26 23:31:51 +02:00
4411a4e4b2
Disable postFX for global blackout
2015-06-18 16:19:25 +02:00
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
e212d0b34f
Making SyncWidget and ShortcutWidget modal windows
...
Enable correct progress callback for DownloadManager
2015-06-14 20:17:09 +02:00
da812f3564
More cleanup of Launcher
...
Added Infowidget
2015-06-12 23:48:11 +02:00
f1791d9816
Merge branch 'develop' into feature/downloadmanager
...
Conflicts:
openspace.cfg
src/engine/openspaceengine.cpp
support/cmake/support_macros.cmake
2015-06-10 02:13:32 +02:00
8ad7702b75
Automatically detect which rendering method to use based on the available OpenGL version
2015-06-03 13:31:42 +02:00
a9e3044d6a
Changed openspace-data file token to point to correct data folder
...
Print detected OpenGL version
2015-06-03 12:36:20 +02:00
38c2477492
Rename DownloadEngine to DownloadManager
2015-05-27 17:14:20 +02:00
3a8a178c6a
Undo change in openspace.cfg
2015-05-25 19:38:21 +02:00
659326b9a9
Remove 1500+ memory leaks in OpenSpace and Ghoul
2015-05-25 19:37:56 +02:00
ca7dcd4762
Move shaders into their correct modules
...
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
e51df4b2a0
Sorting more classes into the correct modules
2015-05-20 21:40:52 +02:00
Alexander Bock