mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,645 Commits 99 Branches 46 Tags
012bcaefaf3661708c041d9742cd7054bb58d22f
Commit Graph

29 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
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Michael Nilsson
c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Alexander Bock
906470f28e Untabify the rest of the source files 
Update Ghoul repository
 2016-04-18 20:14:29 +02:00
Sebastian Piwell
a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -04:00
Sebastian Piwell
20c1fa0cfa Compile fix for Linux, included string 2016-04-08 10:47:59 -04:00
Alexander Bock
8c354e5e37 Add Lua functions to add and remove SceneGraphNodes 2016-04-08 13:35:04 +02:00
Alexander Bock
21276f2cd8 Adding methods to add and remove scenegraphnodes from the scenegraph at runtime 2016-04-08 13:11:54 +02:00
Alexander Bock
019092e98e Correctly set child nodes for SceneGraphNode%s 2016-04-04 20:26:10 +02:00
Emil Axelsson
ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +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
cd3a819541 Updating Ghoul version 
Applying new Ghoul changes
 2015-12-09 14:41:50 -05:00
Alexander Bock
4dddafcec9 Fixing more memory leaks 2015-05-26 21:44:49 +02:00
Alexander Bock
e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock
fdead75cfa Remove move values from constants.h 
Disable ghosting in ephemeris to remove dependency on imagesequencer
 2015-05-20 17:42:47 +02:00
Alexander Bock
4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +02:00
Alexander Bock
9e02d35d8a Fix spelling errors in method names 2015-05-19 01:13:53 +02:00
Michal Marcinkowski
0a1c0164ef Fixes to trails, fov and adding some keybindings 2015-05-04 20:15:34 -04:00
Anton Arbring
641107a106 Commented currently unused functions in new parenting system 2015-04-21 20:22:58 -04:00
Anton Arbring
2b8b8c0416 Solving merge conflicts with develop 2015-04-18 16:10:05 -04:00
Alexander Bock
f5f1b03bc8 More Linux fixes 2015-04-17 13:45:20 +02:00
Alexander Bock
b254f56a5e Linux compile fix 2015-04-17 13:38:30 +02:00
Alexander Bock
c01bb7834b Merge branch 'develop' into feature/scenegraphloader 
Conflicts:
	src/abuffer/abuffer.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
 2015-04-17 13:31:39 +02:00
Alexander Bock
607988f35e Renamed functions to something more reasonable 2015-04-17 11:35:26 +02:00
Alexander Bock
ccd58b7224 More restructuring work on SceneGraph 2015-04-12 14:50:43 +02:00
Alexander Bock
a65e48b0e3 More work on SceneGraph 2015-04-10 01:38:59 +02:00
Alexander Bock
79f3052887 More work on SceneGraphLoader 
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
 2015-04-09 21:43:13 +02:00