Michael Nilsson
3a80405c30
solve merge conflict
2016-05-04 12:10:49 -04:00
Sebastian Piwell
355e70ca0a
Remove cygnet groups
2016-05-03 17:13:28 -04:00
Michael Nilsson
0d49076c54
solve merge conflict with develop
2016-05-03 17:11:28 -04:00
Sebastian Piwell
a0efc00408
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-05-03 15:35:38 -04:00
Sebastian Piwell
1e4e8919c3
Set attributes of screenspacerenderable through dictionary
2016-05-03 15:35:33 -04:00
Michael Nilsson
57cd5c0bf7
solve merge conflict
2016-05-03 15:14:31 -04:00
Michael Nilsson
f05672436e
removed iswamanager update function and create cygnet through scripts instead
2016-05-03 15:07:22 -04:00
Sebastian Piwell
810bcbb4e1
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-05-03 13:46:18 -04:00
Sebastian Piwell
7eae57b02f
Removed iswacontainer
2016-05-03 13:46:02 -04:00
Michael Nilsson
2f7d2e294f
solve merge conflict
2016-05-03 13:37:19 -04:00
Michael Nilsson
c34fa48c73
add script to remove screenspacerenderables from renderengine
2016-05-03 13:30:22 -04:00
Sebastian Piwell
dfd1968f0b
Lua script to add cygnet
2016-05-03 13:24:17 -04:00
Michael Nilsson
d6b5976298
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-05-03 10:39:41 -04:00
Michael Nilsson
4d61694f75
ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory
2016-05-03 10:39:32 -04:00
Sebastian Piwell
c57a9b7be1
Replaced string with enum
2016-05-03 10:06:47 -04:00
Sebastian Piwell
8bde97fdfa
ISWAGroup for manipulation of multiple dataplanes
2016-05-02 17:32:25 -04:00
Michael Nilsson
aa40e3a8b3
fix bug where screenspace cygnets crash program if moved to fast
2016-05-02 10:03:07 -04:00
Alexander Bock
cfb895e2e9
Move fboPass shader into NewHorizons module
2016-05-01 13:14:36 +02:00
Alexander Bock
20532d704f
Rename Lua functions to preInitialization and postInitialization
...
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
Alexander Bock
b4fa20bfaa
Changing interaction handler to have a default inverted roll
...
Updated Ghoul
2016-04-30 13:16:41 +02:00
Alexander Bock
95751691b0
Merge branch 'develop' into feature/startupscripts
2016-04-30 10:26:24 +02:00
Alexander Bock
bfbf823959
Update default Qt version to 5.6
...
Fixed compilation issue on Mac
2016-04-30 10:24:49 +02:00
Sebastian Piwell
434f8bfabb
Some clean up and small fixes
2016-04-27 14:48:22 -04:00
Sebastian Piwell
b67180e325
Add transferFunction to dataplane
2016-04-27 14:47:06 -04:00
Alexander Bock
75175512a8
First implementation of moving the startup scripts into the scene description files
2016-04-27 16:46:31 +02:00
Alexander Bock
25702a787f
Add Lua function that returns the current time
2016-04-27 16:17:50 +02:00
Alexander Bock
b46f40030b
Untabify more files
2016-04-27 14:24:58 +02:00
Sebastian Piwell
3fc25492f2
Read texture from memory with bare pointer
2016-04-25 11:26:15 -04:00
Sebastian Piwell
f13367e717
Kameleon plane
2016-04-25 10:37:06 -04:00
Sebastian Piwell
0246cd482e
Solved merge conflict
2016-04-22 20:01:15 -04:00
Sebastian Piwell
f6bbce8b4c
Add extension to futurefile
2016-04-22 17:39:45 -04:00
Michael Nilsson
3d3e59eabe
solve merge conflict with develop
2016-04-20 16:38:41 -04:00
Michael Nilsson
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
Michael Nilsson
07dfafeddb
solve merge conflict with develop
2016-04-20 15:03:51 -04:00
Michael Nilsson
a068ca2030
load cygnets through mod file
2016-04-20 09:47:20 -04:00
Alexander Bock
c14aa7b11b
Fix inverted texture problem
...
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +02:00
Alexander Bock
ea91d50b87
Start correcting fixes for wrong image origin
2016-04-20 13:07:01 +02:00
Alexander Bock
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02: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
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
4936a4a084
Remove sgct.h inclusion from LuaConsole
...
Untabify more files
2016-04-18 11:12:12 +02: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
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
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
Emil Axelsson
48bd41ad9f
merge in changes from develop
2016-04-12 16:29:35 +02:00
