Alexander Bock 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop ...

Conflicts:
	data/scene/default.scene

2016-06-04 19:06:54 +02:00

..

dataprocessor.cpp

Clean up in DataProcessor

2016-06-02 17:14:51 -04:00

dataprocessor.h

Clean up in DataProcessor

2016-06-02 17:14:51 -04:00

dataprocessorjson.cpp

Refactor dataprocessor

2016-05-31 16:52:46 -04:00

dataprocessorjson.h

Refactor dataprocessor

2016-05-31 16:52:46 -04:00

dataprocessorkameleon.cpp

Change resolution and cdf file in KameleonPlane

2016-06-02 16:25:11 -04:00

dataprocessorkameleon.h

Merge fix

2016-06-01 16:55:20 -04:00

dataprocessortext.cpp

Refactor dataprocessor

2016-05-31 16:52:46 -04:00

dataprocessortext.h

Refactor dataprocessor

2016-05-31 16:52:46 -04:00

iswamanager_lua.inl

Load cdf files at start up

2016-05-24 14:42:38 -04:00

iswamanager.cpp

removed shared_ptr from group events.

2016-06-03 12:44:18 -04:00

iswamanager.h

Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop

2016-06-04 19:06:54 +02:00