Commit Graph

12 Commits

Author SHA1 Message Date
stiffly 729ebe6c8b Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
#	README.md
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
2016-01-12 14:50:10 +01:00
Jace b908a9f9c6 Revert "Forward+" 2016-01-11 13:48:55 +01:00
Tleety 2bd60be741 Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
#	resources/Schema/Types/Entity.xsd
2016-01-08 14:14:43 +01:00
stiffly d8c4c6e5ff Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet. 2016-01-07 15:22:46 +01:00
verysecrethero 638c236ceb HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass 2016-01-07 14:53:31 +01:00
Tleety e7bb8954bf Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/Renderer.cpp
2016-01-06 11:35:55 +01:00
viktorljung ef4cbfece8 Added PointLight Component in XML files 2015-12-18 13:20:55 +01:00
William Moberg 59095c2ce5 Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder. 2015-12-14 17:08:00 +01:00
stiffly c2435fda2d Added Component to Components.xsd and Entity.xsd 2015-12-11 14:27:54 +01:00
sippeangelo 0367826f16 Added RaptorCopter example system 2015-12-10 10:17:18 +01:00
sippeangelo 1e1ce4e127 Added Model component to schema 2015-12-08 18:21:24 +01:00
sippeangelo 1a8784b4be Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas 2015-11-20 16:06:30 +01:00