Jace b95c1fdfa4 Merge remote-tracking branch 'origin/Menu' ...

# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Game/Game.cpp

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

..

Collision

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

2016-01-24 14:40:52 +01:00

Core

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

2016-01-24 21:21:51 +01:00

Editor

Ignoring interpolation and rendering for local player entities!

2016-01-23 00:40:37 +01:00

GUI

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

Input

Basic jumping!

2016-01-23 12:15:33 +01:00

Network

Network snapshot buffer size increased, needs to be looked over later

2016-01-24 23:05:26 +01:00

Rendering

Merge remote-tracking branch 'origin/Menu'

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

Sound

Now calculating the velocity for the listener correctly.

2016-01-15 15:43:20 +01:00

Common.h

Added a stats window

2016-01-18 18:54:57 +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