Commit Graph

62 Commits

Author SHA1 Message Date
verysecrethero 8beddca89a Merge remote-tracking branch 'origin/master' into AndersTest 2015-12-17 17:48:28 +01:00
Jace c1b9404e52 Created a FileDropped event for when a file is dropped onto the client by the OS 2015-12-17 15:30:43 +01:00
Jace bd6adcc157 Added SetParent to World 2015-12-16 12:05:37 +01:00
verysecrethero 1910ab705b AndersTest misc small mergefixes 2015-12-15 13:48:14 +01:00
verysecrethero f9508657f5 Merge remote-tracking branch 'origin/master' into AndersTest
# Conflicts:
#	include/Engine/Core/InputController.h
#	include/Game/Game.h
2015-12-15 11:32:47 +01:00
Jace 07c4744436 Added World DeleteEntity, HasComponent and GetEntityChildren 2015-12-14 13:58:27 +01:00
Jace 2f3843e595 Editor version 1 2015-12-14 13:57:55 +01:00
Jace 9a119f38bb Added events processing to SystemPipeline 2015-12-14 13:57:54 +01:00
Jace 2018ba27ae Added KnowsEntity function to ComponentPool to query whether an entity has a component attached 2015-12-14 13:57:52 +01:00
Jace 8a6030bf57 Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components. 2015-12-14 13:57:51 +01:00
Jace af14d60493 Added MouseScroll event to input manager 2015-12-14 13:57:49 +01:00
Jace 653b4689b5 Added KeyboardChar event for keyboard text input 2015-12-14 13:56:24 +01:00
Jace 013f911ae2 Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement. 2015-12-12 13:42:34 +01:00
Jace 5d46a10a4e 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
verysecrethero b3bb0e543f Added EventBroker Test from the other project 2015-12-11 16:17:23 +01:00
stiffly 3da69c8a1b Fixed indentation 2015-12-11 15:29:57 +01:00
stiffly 16d636a87c Removed Initialize function for systems. 2015-12-11 15:23:56 +01:00
stiffly 0b60979c7b Added a Initialize function for systems. 2015-12-11 14:03:00 +01:00
stiffly 80f028edf2 Added a very basic PlayerSystem, and a PlayerComponent. 2015-12-11 13:45:19 +01:00
verysecrethero e535f629bc Merge branch 'master' into PlayerTakeCapturePoint
# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp
2015-12-10 11:50:29 +01:00
verysecrethero c60e968836 Removed a boxclear in the end of the test2 method 2015-12-10 11:03:40 +01:00
sippeangelo 352074da04 Created base for systems 2015-12-10 10:17:08 +01:00
sippeangelo 90a79c702f Added crude absolute positioning when rendering 2015-12-09 15:26:49 +01:00
sippeangelo 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld 2015-12-09 14:25:41 +01:00
sippeangelo 3085ccdfbf Added temporary Release function to resource manager to be able to reload a resource 2015-12-09 14:23:49 +01:00
William Moberg 14bcb7ea0d Added Update call in Game to test OctTree by using collision. 2015-12-09 13:52:17 +01:00
William Moberg bad42fae1c OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method. 2015-12-09 13:27:00 +01:00
sippeangelo c9b140bd6b Semi-working entity loading from XML files! 2015-12-09 12:29:32 +01:00
sippeangelo c9d1ba6cae EntityIDs should start at 1, because 0 is world 2015-12-09 11:07:46 +01:00
Jace d597c7e60e Cleaned up custom type conversion code 2015-12-08 22:51:35 +01:00
sippeangelo d7de4fc694 Component definitions now loaded from schema. No default values yet. 2015-12-08 18:07:32 +01:00
William Moberg a7fb77d998 OctTree can check if a box collides with a box in the OctTree. 2015-12-08 17:12:58 +01:00
William Moberg 32d2aa6a93 AABB can also be created with center position and its size. 2015-12-08 17:01:50 +01:00
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
William Moberg 648ba502bb Added small test for OctTree. 2015-12-07 17:27:57 +01:00
William Moberg 04a8eeebe8 Added test get methods and some comments. 2015-12-07 16:25:01 +01:00
William Moberg 955c9ce534 Removed superfluous function declaration. 2015-12-07 16:00:34 +01:00
William Moberg e8d23f3b3f Added AABBVsAABB function. 2015-12-07 15:59:41 +01:00
sippeangelo aeb6c39603 Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful 2015-12-03 19:31:55 +01:00
William Moberg 8e21b1fe35 Added ray collision detection in leaf nodes. Fixed possible bug in OctTree::AddBox 2015-12-03 19:25:40 +01:00
William Moberg af5b3a9302 Fixed wrong paths and added an outDistance to RayVsAABB. 2015-12-03 17:24:53 +01:00
William Moberg abb61d2cd6 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
# Conflicts:
#	include/Engine/Core/Collision.h
#	src/Engine/Core/Collision.cpp
2015-12-03 17:11:35 +01:00
William Moberg 2f13f5da7a Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree. 2015-12-03 17:03:27 +01:00
sippeangelo d3d2e594fe Basic and working entity system with a really ugly test case 2015-12-03 15:07:35 +01:00
sippeangelo c7430a9338 Fixed ComponentWrapper string scope error 2015-12-02 15:37:20 +01:00
sippeangelo 61b7aa6b3d Merge branch 'master' into ecs 2015-12-02 15:07:55 +01:00
sippeangelo b3e68c6c34 Implemented ComponentPool and initial tests for it 2015-12-02 15:07:48 +01:00
verysecrethero fd99562c7a yrryr567yry567 2015-12-02 15:03:55 +01:00
William Moberg c698149bdd Added Ray, AABB structs, and basic rayVsAABB test function. 2015-12-02 14:24:21 +01:00
William Moberg fa0ace8c68 Added empty OctTree files. 2015-12-02 11:32:56 +01:00