Jace b2213dbe9a Merge remote-tracking branch 'origin/master' into PlayerMovement ...

# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp

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

..

Util

EntityFilePreprocessor

2016-01-11 14:35:15 +01:00

AABB.h

Basic collisions using Octree. Seems buggy over octree boundaries.

2016-01-13 15:34:43 +01:00

ComponentInfo.h

Packets now dynamically allocates more memory when they need it.

2016-01-12 12:00:19 +01:00

ComponentPool.h

Fixed returning address to temporary in functions. AABB also constructible from glm::vec4s.

2015-12-16 12:19:43 +01:00

ComponentWrapper.h

Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it.

2016-01-11 14:35:41 +01:00

ConfigFile.h

Added GetAll function to config file that returns a list of all top level keys in a config file

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

EComponentAttached.h

Start of a movement system with collisions against AABBs

2016-01-14 14:54:12 +01:00

EFileDropped.h

Created a FileDropped event for when a file is dropped onto the client by the OS

2015-12-17 15:30:43 +01:00

EGamepadAxis.h

Engine puzzle completed

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

EGamepadButton.h

Engine puzzle completed

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

EKeyboardChar.h

Added KeyboardChar event for keyboard text input

2015-12-14 13:56:24 +01:00

EKeyDown.h

Engine puzzle completed

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

EKeyUp.h

Engine puzzle completed

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

ELockMouse.h

Engine puzzle completed

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

EMouseMove.h

Engine puzzle completed

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

EMousePress.h

Engine puzzle completed

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

EMouseRelease.h

Engine puzzle completed

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

EMouseScroll.h

Added MouseScroll event to input manager

2015-12-14 13:57:49 +01:00

Entity.h

EntityWrapper to uniquely identify entities and make using them a little easier

2016-01-14 15:43:19 +01:00

EntityFactory.h

Basic and working entity system with a really ugly test case

2015-12-03 15:07:35 +01:00

EntityFile.h

Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.

2016-01-15 18:31:32 +01:00

EntityFileParser.h

Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.

2016-01-15 18:31:32 +01:00

EntityFilePreprocessor.h

First work on EntityFileWriter for saving levels

2016-01-11 14:35:41 +01:00

EntityFileWriter.h

Now writes entities to file instead of stdout...

2016-01-11 14:35:41 +01:00

EntityWrapper.h

Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems

2016-01-15 18:32:47 +01:00

EPlayerDamage.h

HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes

2016-01-07 14:53:31 +01:00

EPlayerDeath.h

HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes

2016-01-07 14:53:31 +01:00

EPlayerHealthPickup.h

HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes

2016-01-07 14:53:31 +01:00

Event.h

Added Event Broker

2015-11-24 10:37:21 +01:00

EventBroker.h

Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems

2016-01-15 18:32:47 +01:00

InputController.h

Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement.

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

InputManager.h

Created a FileDropped event for when a file is dropped onto the client by the OS

2015-12-17 15:30:43 +01:00

MemoryPool.h

Fixed returning address to temporary in functions. AABB also constructible from glm::vec4s.

2015-12-16 12:19:43 +01:00

ObjectPool.h

Added MemoryPool and ObjectPool to project.

2015-12-01 16:03:07 +01:00

Octree.h

Basic collisions using Octree. Seems buggy over octree boundaries.

2016-01-13 15:34:43 +01:00

Ray.h

Changed to relative #include paths.

2016-01-13 15:53:55 +01:00

ResourceManager.h

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

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

System.h

EntityWrapper to uniquely identify entities and make using them a little easier

2016-01-14 15:43:19 +01:00

SystemPipeline.h

EntityWrapper to uniquely identify entities and make using them a little easier

2016-01-14 15:43:19 +01:00

Transform.h

Fixes for #30

2016-01-14 18:15:38 +01:00

World.h

Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems

2016-01-15 18:32:47 +01:00