Teejoon d8f9f15d34 Merge branch 'master' into DDS ...

Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp

2016-03-10 19:55:25 +01:00

..

Network

Updated snapshot filter to ignore the new animation components

2016-03-07 17:53:47 +01:00

Systems

Removed forced player color on spawn

2016-03-09 20:11:07 +01:00

CMakeLists.txt

MiniDump.cpp was not added to CMakeLists.txt.

2016-02-12 08:19:47 +01:00

Game.cpp

Merge branch 'master' into DDS

2016-03-10 19:55:25 +01:00

main.cpp

We only uses one depth buffer now

2016-02-29 11:44:29 +01:00

MiniDump.cpp

MiniDump name now depends on time e.g. TacticalZ Fri 04-20-49.

2016-02-12 04:22:11 +01:00