Alexander Bock a406aaf039 Merge branch 'feature/guisorting' ...

# Conflicts:
#	modules/imgui/include/guipropertycomponent.h
#	modules/imgui/src/guipropertycomponent.cpp

2017-12-07 01:15:52 -05:00

..

documentation

More coding style conformance

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

engine

Issue/417 (#421)

2017-11-24 11:00:53 -05:00

interaction

More coding style conformance

2017-11-11 11:25:49 -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

Merge branch 'feature/guisorting'

2017-12-07 01:15:52 -05:00

query

Fix byte order mark commits

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

rendering

Display error message on loading screen in case of catastrophic scene loading (closes #423)

2017-11-30 21:49:39 -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

Remove deprecation warning from camera functions

2017-12-06 17:00:50 -05:00