Michal Marcinkowski 175874adc7 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz ...

Conflicts:
	src/rendering/model/wavefrontgeometry.cpp

2015-02-23 09:57:26 -05:00

..

abuffer

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

engine

Added boolean to OpenSpaceEngine declaring if this node is the master or not.

2015-02-20 10:45:33 +01:00

gui

Adding 'property' prefix to subowner methods in PropertyOwner

2015-02-22 22:05:25 +01:00

interaction

Changed behavior in LuaConsole autocomplete to only autocomplete until the next separator

2015-02-17 21:24:57 +01:00

interface

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

properties

Adding 'property' prefix to subowner methods in PropertyOwner

2015-02-22 22:05:25 +01:00

query

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

rendering

More changes to RenderableStars using the AMNH test target

2015-02-22 23:51:26 +01:00

scenegraph

Adding 'property' prefix to subowner methods in PropertyOwner

2015-02-22 22:05:25 +01:00

scripting

Merge branch 'develop' into plutoViz

2015-02-19 14:45:11 +01:00

tests

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

util

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

2015-02-23 09:57:26 -05:00