William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-05 14:59:14 +01:00

..

Components

Merge branch 'master' into BoxModelCollision

2016-02-05 14:59:14 +01:00

Entities

Merge branch 'master' into BoxModelCollision

2016-02-05 14:59:14 +01:00

Types

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +01:00

Components.xsd

Merge pull request #77 from teamfisk/AMDCrashFix

2016-02-04 12:05:05 +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