Jace 34e551663f Merge remote-tracking branch 'origin/master' into Weapons ...

# Conflicts:
#	assets
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
#	resources/Schema/Entities/PlayerAssaultFallbackRed.xml
#	resources/Schema/Entities/PlayerAssaultRed.xml
#	resources/Schema/Entities/aaaatestremoveme.xml
#	resources/Schema/Entities/aim_rays.xml

2016-03-09 15:52:13 +01:00

..

Network

Updated snapshot filter to ignore the new animation components

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

Systems

Merge remote-tracking branch 'origin/master' into Weapons

2016-03-09 15:52:13 +01:00

CMakeLists.txt

MiniDump.cpp was not added to CMakeLists.txt.

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

Game.cpp

Merge remote-tracking branch 'origin/master' into Weapons

2016-03-09 15:52:13 +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