David Rowe 2ac9f282c7 Merge branch 'master' into 20855		2016-03-31 17:00:09 +13:00
..
animation	AnimUtil: prevent accumulateTime from looping forever	2016-03-21 11:58:13 -07:00
audio	checkpoint	2015-11-20 15:19:45 -06:00
controllers	Reduce crashes on switching display plugins	2016-03-17 10:13:52 -07:00
entities	Ignite the atmosphere	2016-01-21 15:15:15 -08:00
gpu-test	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
jitter	checkpoint	2015-11-20 15:19:45 -06:00
mocha	Convert all simple one-liners containing ') { ' to instead take up three lines.	2016-02-10 12:03:07 -08:00
networking	checkpoint	2015-11-20 15:19:45 -06:00
octree	OctreeTests: added unit tests for EntityTreeElement child accessors	2016-03-30 16:15:29 -07:00
physics	patch btCompoundShape memory leak	2016-03-23 14:39:49 -07:00
recording	checkpoint	2015-11-20 15:19:45 -06:00
render-utils	More warning fixes	2015-12-11 16:17:41 -08:00
shaders	Update test shaders	2016-03-10 23:03:03 -08:00
shared	Updated AABox tests	2016-03-26 13:36:56 -07:00
ui	Style tabs and background	2016-03-19 14:52:40 +13:00
CMakeLists.txt	Fix build (and remove unneeded test file).	2016-02-08 09:33:32 -08:00
GLMTestUtils.h	add QCOMPARE_QUATS macro for easier tests	2015-08-12 17:52:54 -07:00
QTestExtensions.h	Changed grammar to support boolean and and or.	2015-12-15 10:35:35 -08:00