antc13 16c39df439 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer ...

# Conflicts:
#	include/Engine/Collision/Collision.h
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RawModelAssimp.cpp

2016-01-15 18:00:30 +01:00

..

Collision

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

2016-01-15 18:00:30 +01:00

Core

Added a bool option to disable threads in in the configfile regarding resource loading.

2016-01-15 16:18:39 +01:00

Editor

Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)

2016-01-14 15:26:06 +01:00

GUI

Camera component and RenderQueue changes

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

Input

MouseInputHandler

2015-12-12 13:42:46 +01:00

Network

Removed Close method from Client, Server and Network.

2016-01-12 17:47:03 +01:00

Rendering

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

2016-01-15 18:00:30 +01:00

Sound

Now calculating the velocity for the listener correctly.

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

Common.h

Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode.

2015-12-17 13:31:54 +01:00

GLM.h

Engine puzzle completed

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

OpenGL.h

Engine puzzle completed

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