viktorljung 66c8a17b17 Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	resources/Schema/Types/Entity.xsd

2016-03-03 23:21:14 +01:00

..

Collision

Only do physics and collision calculations on the clients side, and only for their own entity.

2016-03-03 11:39:00 +01:00

Core

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

2016-03-03 23:21:14 +01:00

Editor

DefenderWeapon and SidearmWeapon

2016-03-03 01:13:39 +01:00

GUI

PickClass used for class-picking, SwapToClassPick to swap camera.

2016-03-03 16:59:17 +01:00

Input

Fixes #66 warnings

2016-02-01 17:53:01 +01:00

Network

Hot fix: Infinite loop when a player disconnected from the server.

2016-03-03 18:14:33 +01:00

Rendering

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

2016-03-03 23:21:14 +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

CMakeLists.txt

Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added

2016-02-16 16:57:46 +01:00