mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-03 01:59:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,292 Commits 99 Branches 46 Tags
a0e5fe34fea684e085f549e6331d04c8db6e1ffc
Commit Graph

790 Commits

Author SHA1 Message Date
Alexander Bock
c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop 
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
 2016-06-04 19:54:34 +02:00
Alexander Bock
30264fb00e Add Lua function to check whether a specific module is loaded (closing #36) 2016-06-04 19:38:56 +02:00
Alexander Bock
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Michael Nilsson
f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Alexander Bock
4c679c15ea Allow the disabling of ISWA components 2016-06-02 13:25:05 +02:00
Alexander Bock
0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Alexander Bock
a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop 
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
 2016-06-01 19:46:23 +02:00
Alexander Bock
c84972dee0 Updating versioning number to prerelease-9 (IPS) 2016-05-31 18:26:20 +02:00
Sebastian Piwell
c983ecfb89 Histogram eq with group dataprocessor 2016-05-20 16:46:33 -04:00
Emil Axelsson
f8007266e8 Merge branch 'feature/hybrid-renderer' into feature/galaxy 2016-05-19 15:25:10 +02:00
Sebastian Piwell
ff39239b0f Auto filter of 'background' 2016-05-17 16:11:57 -04:00
Michael Nilsson
ae131f88c5 changed the naming of min and max value in histogram class 2016-05-17 14:02:40 -04:00
Michael Nilsson
7549beb5f2 solve merge conflict 2016-05-17 12:53:29 -04:00
Michael Nilsson
d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Sebastian Piwell
e51b104ce8 Transformation Manager 2016-05-10 11:18:09 -04:00
Sebastian Piwell
39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Michael Nilsson
f2b802b317 MemoryFile har now char pointer and size instead of string 2016-05-06 16:39:24 -04:00
Michael Nilsson
d63dd7db44 remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile 2016-05-06 15:56:12 -04:00
Michael Nilsson
cbd6fd9234 iswacygnets now use new download funtions aswell 2016-05-06 15:09:09 -04:00
Michael Nilsson
47e2abf87d new download function using std::future and std::async 2016-05-06 10:48:27 -04:00
Michael Nilsson
d0e6c8dd6e removed progresscallback from downloadToMemory 2016-05-05 11:07:00 -04:00
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
1e4e8919c3 Set attributes of screenspacerenderable through dictionary 2016-05-03 15:35:33 -04:00
Michael Nilsson
c34fa48c73 add script to remove screenspacerenderables from renderengine 2016-05-03 13:30:22 -04:00
Michael Nilsson
4d61694f75 ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory 2016-05-03 10:39:32 -04: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
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
Emil Axelsson
7db9bf0d98 start on experimental hybrid renderer 2016-04-26 10:20:54 +02: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
906470f28e Untabify the rest of the source files 
Update Ghoul repository
 2016-04-18 20:14:29 +02:00
Alexander Bock
a21c9538b6 Untabify more files 2016-04-18 15:15:30 +02:00
Alexander Bock
4936a4a084 Remove sgct.h inclusion from LuaConsole 
Untabify more files
 2016-04-18 11:12:12 +02: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
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
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
Emil Axelsson
4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
Sebastian Piwell
a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -04:00
Alexander Bock
352e7283d6 Enable the usage of modifiers in bindKey calls (closing #158) 2016-04-08 18:03:09 +02:00
Sebastian Piwell
20c1fa0cfa Compile fix for Linux, included string 2016-04-08 10:47:59 -04:00