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

..

Components

Merge pull request #218 from teamfisk/DashEffect

2016-03-14 00:58:00 +01:00

Entities

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

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

Types

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Components.xsd

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Types.xsd

Basic movement and camera management between players and editor

2016-01-22 16:12:51 +01:00

xml.xsd

Updated schema

2015-11-25 18:04:11 +01:00