Jocke 0eb51a0fea Merge remote-tracking branch 'origin/Networking' into Networking ...

# Conflicts:
#	include/Engine/Network/Packet.h
#	src/Engine/Network/Packet.cpp

2015-12-18 10:16:31 +01:00

..

Core

Added SetParent to World

2015-12-16 12:05:37 +01:00

Editor

Slightly more usable entity tree

2015-12-16 12:05:55 +01:00

GUI

Engine puzzle completed

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

Input

MouseInputHandler

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

Network

Merge remote-tracking branch 'origin/Networking' into Networking

2015-12-18 10:16:31 +01:00

Rendering

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

2015-12-17 14:10:02 +01:00

Sound

Initial directory structure

2015-11-20 15:01:37 +01:00

Common.h

Engine puzzle completed

2015-11-30 17:02:24 +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