Michael Nilsson
f05672436e
removed iswamanager update function and create cygnet through scripts instead
2016-05-03 15:07:22 -04:00
Sebastian Piwell
dfd1968f0b
Lua script to add cygnet
2016-05-03 13:24:17 -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
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
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
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
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
Sebastian Piwell
cb10757b29
Merge branch 'feature/scenegraphmodification' into feature/iSWA
2016-04-08 10:23:44 -04:00
Alexander Bock
21276f2cd8
Adding methods to add and remove scenegraphnodes from the scenegraph at runtime
2016-04-08 13:11:54 +02:00
Sebastian Piwell
bf61f6f1e4
Load and read textures from memory
2016-04-06 14:17:29 -04:00
Michael Nilsson
49d8319938
merge with develop
2016-04-05 12:02:25 -04:00
Michael Nilsson
0d0f761d6e
downloadmanager return shared_ptr to FileFutures instead of bare pointers
2016-04-05 11:33:58 -04:00
Michael Nilsson
f4964b1628
request file extension
2016-04-01 16:32:18 -04:00
Michael Nilsson
d31adad2b0
Merge branch 'develop' into feature/iSWA
2016-03-31 09:05:00 -04:00
kalbl
86debebdd9
Fix compilation errors for OSX.
2016-03-30 15:20:20 -04:00
Michael Nilsson
5911149273
downloadmanager load to string. update texture function to renderabletextureplane
2016-03-23 16:57:25 -04:00
Alexander Bock
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
Alexander Bock
598409c4d1
Fix for crash from double deinitialization
2016-02-22 21:41:35 +01:00
Emil Axelsson
73cf15beb6
- Add currentDrawBufferResolution method in WindowWrapper
...
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
Emil Axelsson
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
Emil Axelsson
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
Alexander Bock
85d564767b
Fix #define None include error on X11 systems
2016-01-18 18:05:57 +01:00
Alexander Bock
aee6146d3f
Xlib compile error
2016-01-18 17:52:14 +01:00
Alexander Bock
13510e1085
Merge branch 'feature/cleanup' of openspace.itn.liu.se:/openspace into feature/cleanup
2016-01-02 21:40:29 +01:00
Alexander Bock
c87fdfd38b
Fixes for Windows
...
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
465715f652
Remove DummyWindowWrapper and implement default methods into WindowWrapper
2015-12-23 16:26:24 -05:00
Alexander Bock
0735d0fc2d
More cleanup of FactoryManager
2015-12-14 17:55:24 -08:00
Alexander Bock
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
Alexander Bock
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock
c99666e75a
Cleaning ConfigurationManager and OpenSpaceEngine
...
Updated Ghoul version
2015-12-14 16:44:13 -08:00
Alexander Bock
adfc7d244c
Cleanup of WindowWrapper classes
2015-12-14 15:55:28 -08:00
Alexander Bock
6eca5c0f68
More module cleanup
2015-12-14 11:46:44 -08:00
Alexander Bock
2fce471743
Started cleanup of module structure
2015-12-14 10:50:38 -08:00
Alexander Bock
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
8260f5701d
Updated Ghoul
...
Adapted to Ghoul API change
2015-12-12 13:29:09 -05:00
Alexander Bock
ae55078ff8
Updated Ghoul version
...
Adapted to changed Ghoul API
Reenable fading of ScreenLog messages
2015-12-11 16:50:21 -05:00
Alexander Bock
e5a3a7a80b
Updating Ghoul version
...
Adapting OpenSpaceEngine to new Ghoul API
2015-12-09 19:10:59 -05:00
Alexander Bock
ba35b834f7
Update Ghoul
...
Adapted to new ghoul version
2015-12-02 22:47:15 -05:00
Alexander Bock
0006e83f4b
Updated Ghoul
...
Adapted to cleanup in Ghoul
2015-11-30 17:50:26 -05:00
Alexander Bock
31db5c1603
Merge branch 'feature/fontrendering' into feature/cleanup
2015-11-23 22:31:53 -05:00
Alexander Bock
8f031e37ae
Merge branch 'feature/fontrendering' of openspace.itn.liu.se:/openspace into feature/fontrendering
2015-11-23 22:29:30 -05:00
Alexander Bock
fbc501450a
Updated support files to enable SPICE on MSVC14
2015-11-23 22:24:13 -05:00
Alexander Bock
94663e7bf7
Updated Ghoul version
2015-11-23 12:03:08 -05:00
