Tleety 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Game.cpp

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

..

Collision

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

2016-03-01 12:11:27 +01:00

Core

Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value!

2016-03-03 01:35:32 +01:00

Editor

HACK: Added Activate button for spawners in editor. Right now it includes the event from Game, but SpawnerSystem should probably be moved to Engine.

2016-03-02 22:48:01 +01:00

GUI

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

2016-02-19 13:17:31 +01:00

Input

Removed unnecessary comments, variables and functions.

2016-03-02 17:39:27 +01:00

Network

Some new events and changes to ScoreSystem

2016-03-03 11:25:06 +01:00

Rendering

Fixed draw final pass with shided objects having to many if-statments.

2016-03-02 11:59:48 +01:00

Sound

When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter.

2016-02-10 11:15:49 +01:00

Common.h

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

2016-01-25 01:21:15 +01:00

GLM.h

EditorWidgetSystem that takes care of moving widgets around

2016-01-21 10:30:19 +01:00

OpenGL.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00