Commit Graph

1925 Commits

Author SHA1 Message Date
Michael Nilsson
07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Sebastian Piwell
9bb326b7eb Uncomment important line 2016-04-20 14:52:41 -04:00
Sebastian Piwell
201963a2f2 Solved merge conflict 2016-04-20 14:46:37 -04:00
Sebastian Piwell
f6ddce7929 Seperated coordinate scale and spatial scale 2016-04-20 14:38:12 -04:00
Michael Nilsson
2701d483c1 check if node with same name already exist before create cygnet 2016-04-20 13:55:03 -04:00
Michael Nilsson
b7dc02d421 solve merge conflict 2016-04-20 13:29:05 -04:00
Michael Nilsson
6aa8536d8c create both textureplane and dataplane through gui easier 2016-04-20 13:21:14 -04:00
Sebastian Piwell
7b510dae98 Add dataplane when time is running 2016-04-20 10:48:49 -04:00
Sebastian Piwell
cb49805b07 Update ghoul 2016-04-20 10:28:53 -04:00
Michael Nilsson
a068ca2030 load cygnets through mod file 2016-04-20 09:47:20 -04:00
Sebastian Piwell
64a9dd8069 Update screenspacerenderables 2016-04-19 18:03:29 -04:00
Sebastian Piwell
3d229fdc3a Update textureplane and delete dataplane 2016-04-19 16:59:40 -04:00
Sebastian Piwell
b2f25b5ca7 Multiple data values on the same plane 2016-04-19 15:14:23 -04:00
Michael Nilsson
c0e3eed9e3 loading image cygnets from localhost 2016-04-19 09:54:18 -04:00
Sebastian Piwell
4d487fc810 Stream data 2016-04-19 09:07:17 -04:00
Sebastian Piwell
02c2ee9ef6 DataPlane reads from server 2016-04-18 15:16:11 -04:00
Alexander Bock
248014b6c2 Add Python script that converts tabs into spaces 2016-04-18 20:06:48 +02:00
Sebastian Piwell
86bf771cdd Read data file from server 2016-04-18 13:05:50 -04:00
Alexander Bock
6c6555bbce Print out the number of warnings, errors, and fatal errors that happened during initialization and each frame after
Updated to new Ghoul version
2016-04-18 16:44:44 +02:00
Alexander Bock
a59a1bd758 Turn off logging flush for increased performance 2016-04-18 15:15:42 +02:00
Alexander Bock
a21c9538b6 Untabify more files 2016-04-18 15:15:30 +02:00
Alexander Bock
c8da825098 Rename ImageSequencer2 to ImageSequencer 2016-04-18 15:14:59 +02:00
Alexander Bock
f0748505b7 Include VisualStudioOutputLog
Correctly allow '/' character in SceneGraph description files
2016-04-18 15:12:40 +02:00
Alexander Bock
f76d65cf19 Remove high-resolution Mars kernel and fall back to regular de430 kernel
Use correct PlutoProject path instead of previous PlutoProjectionHybrid
Updated Ghoul version
2016-04-18 15:11:13 +02:00
Alexander Bock
4936a4a084 Remove sgct.h inclusion from LuaConsole
Untabify more files
2016-04-18 11:12:12 +02:00
Alexander Bock
990f22bc6d Update the ghoul library 2016-04-18 09:23:19 +02:00
Alexander Bock
9c375db635 Updated Ghoul repository 2016-04-17 12:17:44 +01:00
Alexander Bock
7e44ac0621 Fixed Launcher to work with new possible module directory structure 2016-04-15 15:05:24 -04:00
Alexander Bock
c73404a1de Rename PlutoProjectionHybrid module to PlutoProjection
Remove outdated PlutoProjection module
2016-04-15 10:37:24 -04:00
Alexander Bock
04af38f546 Enable subdirectories by specifying an intermediate directory in the scene file 2016-04-15 10:27:41 -04:00
Alexander Bock
588bc74a88 Enable subdirectories for modules
Move newhorizons scene modules into subdirectories
2016-04-15 09:52:08 -04:00
Alexander Bock
46b207b379 Removing some cppcheck warnings 2016-04-14 22:49:03 -04:00
Alexander Bock
b43a454e9f Fix GCC compiler warnings 2016-04-14 22:40:25 -04:00
Alexander Bock
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
Alexander Bock
dcf5507e1c Add the images of the plutoprojection into gitignore
Add a data directive to the plutoprojection that will download the New Horizons LORRI images
releases/v0.3.2
2016-04-14 21:17:19 -04:00
Alexander Bock
f5012d496d Compile fix for the SyncWidget in the Launcher 2016-04-14 21:16:25 -04:00
Alexander Bock
cf517f5309 Replacing CMake-based version setting with C++-based version
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -04:00
Alexander Bock
6b5681626b Removing clang-analyze warnings 2016-04-13 11:46:07 -04:00
Sebastian Piwell
fa3fc8dc87 Transfer function to dataplan and ColorBar 2016-04-13 11:36:43 -04:00
Emil Axelsson
48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Sebastian Piwell
e292f79697 Get metadata and add new images 2016-04-11 17:45:41 -04:00
Sebastian Piwell
5af317e594 Functions to create iSWAcygnets 2016-04-11 15:15:58 -04:00
Sebastian Piwell
6d74bd3b29 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-11 14:41:38 -04:00
Sebastian Piwell
d4ade042c1 Parse json string to Lua table 2016-04-11 14:41:31 -04:00
Michael Nilsson
0d298e7232 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-11 14:27:02 -04:00
Michael Nilsson
d5d79e01b3 add and remove iswaCygnets through lua scripts 2016-04-11 14:26:53 -04:00
Sebastian Piwell
6c72494859 Small json parse fix 2016-04-11 14:10:37 -04:00
Sebastian Piwell
f64804d043 Add frame from json 2016-04-11 13:57:03 -04:00
Sebastian Piwell
a820d0a4dd Parse json to lua table string 2016-04-11 12:11:38 -04:00
Alexander Bock
e4f8f8c830 Clang compile fixes 2016-04-11 11:18:50 -04:00