a0042ef219
More last minute fixes
...
Fixed plane bug (again)
changed rex animation (again)
More key binds
etc
2015-05-13 16:15:50 -04: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
0f72d5ddda
Updated timeline application stylesheet and colors
2015-05-08 16:39:28 +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
e0fedb203d
Merge branch 'develop' into NewHorizonsMerge
2015-05-05 20:33:52 -04:00
15cb4e0a3a
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-05 20:24:56 -04:00
665d832454
optimization for projections
2015-05-05 20:19:19 -04:00
e1c87a49ed
Redesign parser
2015-05-05 21:43:46 +02:00
9150e52327
Updated openspace-data
2015-05-05 19:43:54 +02:00
33bc1733b6
Make time control in timeline view non-linear
2015-05-05 19:41:31 +02:00
02eaf6e7b9
Replaced asserts with ghoul_asserts
2015-05-05 17:57:18 +02:00
23a3950215
Fixing issue with linux
2015-05-05 17:46:51 +02:00
b35edde94a
Fixing issue with linux
2015-05-05 17:40:01 +02:00
e33c250bfc
Fixing issue with linux
2015-05-05 17:33:48 +02:00
dfca315293
Fixing issue with linux
2015-05-05 17:29:12 +02:00
0d11e6e2f8
Fixing issue with linux
2015-05-05 17:23:41 +02:00
b458e6c0f9
Yet another linux fix
2015-05-05 17:12:24 +02:00
335571879d
Fixing bug in linux with va_arg macros
2015-05-05 15:56:10 +02:00
b79acb1501
Fixing variable names to fix linux compile error
2015-05-05 15:45:00 +02:00
4b9c5a9de6
Linux compile fix with ImageSequencer2
2015-05-05 14:40:47 +02:00
47af7a5270
Disabling the GUI applications on default, added possibility to enable them with a switch
...
Added additional check into the model loader to guard against empty models
2015-05-05 14:37:24 +02:00
74a15338ff
Merge branch 'feature/timelinegui' into develop
2015-05-05 14:22:56 +02:00
Anton Arbring