77eaa45702
Merge remote-tracking branch 'origin/master' into HEAD
...
Conflicts:
src/Engine/Rendering/CubeMapPass.cpp
src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:11:27 +01:00
Jace
e47201ff61
First person shoot animations
2016-02-11 17:06:34 +01:00
Jace
666ef6589e
Crouching!
2016-01-23 15:06:47 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
f197993beb
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
2016-01-19 15:31:15 +01:00
c8fe6853c0
Removed ShootEvent from CapturePoint
2016-01-15 11:17:22 +01:00
59be714fdc
1 Component added: CapturePoint
...
1 System added: CapturePointSystem
1 Test added: CapturePointTest
added 1 variable in PlayerComponent (TeamNumber)
added 2 variables in CapturePoint (CaptureTimer,OwnedBy)
CapturePointSystem is now handling 2 events: OnTriggerTouch,OnTriggerLeave
Added the CapturePointSystem to Game.cpp
2016-01-13 15:58:52 +01:00
4b672b11e7
EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type
2016-01-13 15:58:52 +01:00
ec4d5fbfa8
xml/xsd files changed type to double. fixed cooldownbug in PlayerSystem. Added 4 tests in ShootEventTest and generalized it a lot
2016-01-13 15:58:52 +01:00
184af95507
New Event: EShoot. New Components: PrimaryItem,SecondaryItem. New Test: ShootEventTest. Added LeftMouseRelease->Shoot in PlayerSystem
...
TODO: generalize the test
2016-01-13 15:58:52 +01:00
b698a0d36f
WIP
...
Adding models now crashes. Threading
Added a create player event that currently is not used.
2015-12-15 11:21:46 +01:00
c2435fda2d
Added Component to Components.xsd and Entity.xsd
2015-12-11 14:27:54 +01:00
80f028edf2
Added a very basic PlayerSystem, and a PlayerComponent.
2015-12-11 13:45:19 +01:00
Teejoon
Jace
verysecrethero
stiffly