verysecrethero 01e0e41122 Merge remote-tracking branch 'origin/master' into AndersTest ...

# Conflicts:
#	include/Engine/Core/MemoryPool.h
#	include/Engine/Network/Packet.h
#	include/Game/Systems/AmmoPickupSystem.h
#	include/Game/Systems/PickupSpawnSystem.h
#	resources/Schema/Entities/NewMap2version2.xml
#	src/Game/Game.cpp
#	src/Game/Systems/AmmoPickupSystem.cpp
#	src/Game/Systems/PickupSpawnSystem.cpp

2016-03-14 10:31:03 +01:00

..

Events

Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

2016-03-13 14:23:56 +01:00

Network

Major networking refactoring to allow for snapshot filtering outside of netcode

2016-02-09 13:22:21 +01:00

Systems

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

2016-03-14 10:31:03 +01:00

Game.h

Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation

2016-03-02 18:53:40 +01:00

MiniDump.h

On crash, takes minidump, then show MessageBox, and exit app.

2016-02-12 03:32:42 +01:00