6fdd172428
Fix initialization order of image sequencer to remove an error of unknown token
2015-05-18 19:18:35 +02:00
15908e75a3
Undo sphere changes to make stars look proper again
2015-05-18 18:52:59 +02:00
36b921a017
More cleanup of RenderEngine
2015-05-18 18:34:48 +02:00
1ce07f205e
Cleaning up RenderEngine
2015-05-18 17:57:53 +02:00
66c06a411f
Updated Lua version
2015-05-18 17:49:44 +02:00
25343d78c5
Updated Ghoul version
2015-05-18 16:51:42 +02:00
217753bf86
Reverting last changes as they do not work on Windows
2015-05-17 13:59:30 +02:00
fe9b3172c6
Committing the depth hack for renderablemodel
...
Adding GL_STENCIL_BIT for Mac as it seems to help with an NSOpenGL error
2015-05-17 12:07:08 +02:00
6a9fdef2e0
Fixes for Mac rendering of stars and milkyway
2015-05-14 12:50:17 +02:00
8f5ba101e4
Remove stereo setting from single.xml
...
Create TimelineView in a bundle on Mac
2015-05-14 12:15:51 +02:00
cf4afc0159
Set default coordinate system to Jupiter to agree with the default time
2015-05-14 01:13:14 +02:00
1369e5caf5
adding capability to clear images on the fly
...
- (rest will be done on antons machine)
2015-05-13 15:19:41 -04:00
9366fd4b80
More clang fixes
2015-05-13 19:48:41 +02:00
597ed14014
Fixing CREDITS file
...
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
28abe46bcf
Fixing various issues that appeared in Mac
...
Fixing flat qualifier in shader
Fix default values
Disable postFX shader
2015-05-13 16:52:25 +02:00
41c1293cc4
Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx
2015-05-13 14:25:08 +02:00
42ed21b01d
Fix the instruments' color coding in timeline application
2015-05-13 14:17:58 +02:00
906bcf10a5
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/renderablecrawlingline.cpp
src/rendering/renderengine.cpp
2015-05-12 23:29:14 -04:00
481f247a23
Pre presentation mods
...
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
2015-05-12 23:23:29 -04:00
886c1e3fae
Prepare the timeline view for a switch to binary external controls
2015-05-13 00:53:41 +02:00
94c1e6e23c
Only create a handle message event with the correct size (in preparation for binary external controls)
2015-05-13 00:52:52 +02:00
15578dc10a
Improved handling of message data in TimelineView application
2015-05-13 00:21:06 +02:00
a96a34575c
Fix initial message queueing by introducing a sleeping timer
2015-05-13 00:17:46 +02:00
b5846cc69b
Initiate thread sleeping after each initial message to not spam clients
2015-05-12 22:41:53 +02:00
072b9d7bef
Fix a crash that appeared with strcpy -> strcpy_s change
2015-05-12 22:22:31 +02:00
aa7830fed5
Added error when Label projection directory does not exist
2015-05-12 13:50:13 +02:00
b5aa86873a
Fix many warnings
2015-05-12 13:05:35 +02:00
cf857fc0f2
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 18:41:25 -04:00
1cebc07939
Modified projections, removed fading and some key binds
2015-05-11 18:39:35 -04:00
c345774a0d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 23:30:12 +02:00
5027b32f9d
Add RenderableCrawlingLine for REX instrument on New Horizons
2015-05-11 23:29:27 +02:00
28f84eaab1
Removed printout..
2015-05-11 16:12:14 -04:00
70e50706c8
Merge branch 'develop' into trailmods
2015-05-11 15:28:31 -04:00
d6eaa0a81c
Added renderablePath with timestamps
...
Considered for using with 15 minute and hour timestamps
Added Shaders for the path
Included reparenting of the paths in renderengine
Modified start time for presentation
Changed model exaggeration to 1000 times original size
2015-05-11 14:41:27 -04:00
2eb54a4682
Added REX instrument parsing
2015-05-11 12:08:35 +02:00
9c16f088c1
Fixing errors that occured in OS X
...
Fixing a default success argument
Fixed \r line ending handling
Removed discarding a fragment in planetprojection
2015-05-08 19:26:29 +02:00
0f72d5ddda
Updated timeline application stylesheet and colors
2015-05-08 16:39:28 +02:00
d508998b45
Merge branch 'develop' into feature/osx
...
Conflicts:
ext/ghoul
2015-05-08 16:28:35 +02:00
db05279a35
Added style sheet to timeline application
...
Fixed various layout issues
2015-05-08 15:40:03 +02:00
16ed2f0d5d
Removed LuaScriptExternalControl
...
Prepared Timeline View for Stylesheets
2015-05-08 01:13:13 +02:00
b93aa9c80d
Set OpenSpace version string to prerelease-5
...
Only handle status messages in timeline application if playbooks are received
2015-05-07 23:40:31 +02:00
9188e59ded
Merge branch 'feature/timelinegui' into develop
2015-05-07 22:30:15 +02:00
a8d97089e5
Write HTML log on default
2015-05-07 22:29:59 +02:00
f5e6d8cf1c
Updated color mapping for Instruments
...
Updated playbook parsing
2015-05-07 22:29:38 +02:00
3352cd90f4
Updated layout of timeline application
...
Added userdefined instrument names
Added button to set focus to next target
2015-05-07 21:02:19 +02:00
157be78ab9
Add capabilities for multiple parsers into the timeline gui
...
Fix delta time controller
2015-05-07 18:27:18 +02:00
1177e4e4cf
Restructure parsers, send label parser information to GUI application
2015-05-07 18:26:23 +02:00
dac1f213b5
Fix instrumenttimes in labelparser
2015-05-07 17:42:37 +02:00
b2fcbe4fb0
Adding final keyword
2015-05-07 17:30:36 +02:00
b536c5c32f
Merge branch 'develop' into feature/parser
2015-05-07 17:27:28 +02:00
Alexander Bock