Jocke 7de76376cf Merge remote-tracking branch 'origin/master' into TCPConnections ...

# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp

2016-02-12 05:16:30 +01:00

..

Collision

Fixed EntityFirstHitByRay not returning outDistance properly

2016-02-11 20:01:23 +01:00

Core

Merge pull request #104 from teamfisk/AmmoPickup

2016-02-12 02:08:29 +01:00

Editor

Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.

2016-02-08 13:33:55 +01:00

GUI

PNG is now a resource.

2016-02-10 17:50:17 +01:00

Input

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

2016-02-11 15:19:01 +01:00

Network

Reverted last commit. Also testing to delay OnPlayerSpawn event for clients. No progress...

2016-02-11 21:23:53 +01:00

Rendering

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

2016-02-11 23:48:30 +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