5 Commits

Author	SHA1	Message	Date
Jace	01db8e0615	Merge remote-tracking branch 'origin/master' into Dirtybit ... # Conflicts: # src/Engine/Collision/CollisionSystem.cpp # src/Engine/Core/Transform.cpp # src/Engine/Editor/EditorSystem.cpp # src/Engine/Rendering/AnimationSystem.cpp # src/Engine/Rendering/BoneAttachmentSystem.cpp # src/Game/Systems/CapturePointSystem.cpp # src/Game/Systems/ExplosionEffectSystem.cpp # src/Game/Systems/PlayerMovementSystem.cpp	2016-03-12 04:09:53 +01:00
Jace	80649ce51d	Updated the ENTIRE CODEBASE TO MATCH	2016-03-12 00:38:33 +01:00
Jace	1a403b9b88	TextFieldReader now loops through parents if the entity field was empty and the current entity didn't have a component of that type.	2016-03-07 17:55:00 +01:00
Tleety	778bbd13ca	double's should now be displayed with only 1 decimal.	2016-03-04 02:19:13 +01:00
Jace	0e8b97dbba	Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value!	2016-03-03 01:35:32 +01:00