viktorljung ada1bac2a7 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-24 20:48:17 +01:00

..

CapturePointSystem.h

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

2016-01-21 16:16:35 +01:00

HealthSystem.h

Changed System to take World through constructor and store it instead, cause it makes more sense.

2016-01-18 23:59:33 +01:00

InterpolationSystem.h

Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky

2016-01-23 11:44:16 +01:00

PlayerHUD.h

HealthMeter

2016-01-23 14:53:17 +01:00

PlayerMovementSystem.h

Source-like movement

2016-01-23 19:45:23 +01:00

PlayerSpawnSystem.h

Infinite respawning for now

2016-01-23 15:06:41 +01:00

RaptorCopterSystem.h

Changed System to take World through constructor and store it instead, cause it makes more sense.

2016-01-18 23:59:33 +01:00

SpawnerSystem.h

Changed System to take World through constructor and store it instead, cause it makes more sense.

2016-01-18 23:59:33 +01:00

WeaponSystem.h

Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)

2016-01-21 17:36:47 +01:00