Alexander Bock 2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere ...

# Conflicts:
#	modules/imgui/src/renderproperties.cpp

2017-12-11 09:12:13 -05:00

..

blockplaneintersectiongeometry.h

Strict coding style adherence

2017-11-26 14:57:26 -05:00

boxgeometry.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

camera.h

Merged master into NewAtmosphere.

2017-12-07 11:31:51 -05:00

concurrentjobmanager.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

concurrentjobmanager.inl

Pr/core threadpool (#401)

2017-09-22 13:22:03 +02:00

concurrentqueue.h

Pr/core threadpool (#401)

2017-09-22 13:22:03 +02:00

concurrentqueue.inl

Pr/core threadpool (#401)

2017-09-22 13:22:03 +02:00

distanceconstants.h

Show distance from current focus object

2017-11-25 18:30:13 -05:00

distanceconversion.h

Show distance from current focus object

2017-11-25 18:30:13 -05:00

factorymanager.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

factorymanager.inl

Cleanup for coding style

2017-11-08 10:35:39 -06:00

gpudata.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

histogram.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

keys.h

Add Lua functions to query keyboard bindings and remove individual keybinds

2017-12-08 14:58:18 -05:00

mouse.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

openspacemodule.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

powerscaledcoordinate.h

Strict coding style adherence

2017-11-26 14:57:26 -05:00

powerscaledscalar.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

powerscaledsphere.h

Strict coding style adherence

2017-11-26 14:57:26 -05:00

progressbar.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

screenlog.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

spicemanager.h

More coding style conformance

2017-11-11 11:25:49 -05:00

syncbuffer.h

More coding style conformance

2017-11-11 11:25:49 -05:00

syncdata.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

task.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

taskloader.h

More coding style conformance

2017-11-11 11:25:49 -05:00

threadpool.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

time.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

timeconversion.h

Show distance from current focus object

2017-11-25 18:30:13 -05:00

timeline.h

More coding style conformance

2017-11-11 11:25:49 -05:00

timeline.inl

More coding style conformance

2017-11-11 11:25:49 -05:00

timemanager.h

Fix error with preInitialization timestep being overwritten

2017-10-10 12:34:11 -04:00

timerange.h

More coding style conformance

2017-11-11 11:25:49 -05:00

transformationmanager.h

More coding style conformance

2017-11-11 11:25:49 -05:00

updatestructures.h

Pull request changes.

2017-08-15 18:15:56 -04:00