William Moberg c7dad79e72 Merge branch 'master' into JumpHeightAdjustment ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-29 17:28:40 +01:00

..

Components

Merge branch 'master' into JumpHeightAdjustment

2016-02-29 17:28:40 +01:00

Entities

Merge branch 'master' into JumpHeightAdjustment

2016-02-29 17:28:40 +01:00

Types

WIP multi-weapon behaviours

2016-02-29 06:58:57 +01:00

Components.xsd

Merge branch 'master' into JumpHeightAdjustment

2016-02-29 17:28:40 +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