Teejoon 37414ce124 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO ...

Conflicts:
	include/Engine/Rendering/Renderer.h
	src/Engine/Rendering/Renderer.cpp

2016-02-22 14:51:42 +01:00

..

Collision

Merge branch 'master' into BoxModelCollision

2016-02-19 14:17:17 +01:00

Core

Merge pull request #122 from teamfisk/WorldSnapshots

2016-02-19 15:12:31 +01:00

Editor

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

2016-02-17 16:59:26 +01:00

GUI

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

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

Input

Fixes #66 warnings

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

Network

Fixed crash in Client::parsePlayerDamage.

2016-02-19 16:18:16 +01:00

Rendering

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO

2016-02-22 14:51:42 +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