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

..

documentation

More coding style conformance

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

engine

Add Lua functions to query keyboard bindings and remove individual keybinds

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

interaction

Add Lua functions to query keyboard bindings and remove individual keybinds

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

mission

Add strict test for whitespace at end of line

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

network

More coding style conformance

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

performance

More coding style conformance

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

properties

Move Space/Time component into simple menu version

2017-12-07 17:06:55 -05:00

query

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

rendering

Merged master into NewAtmosphere.

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

scene

Strict coding style adherence

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

scripting

More coding style conformance

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

util

Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere

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