66f442f1af
Added HealthGain to HealthPickup component. Changed PickupSpawnSystem so it copies the values from the old to the new entity.
2016-02-05 16:13:59 +01:00
2542397511
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.
2016-02-05 15:35:51 +01:00
fe6fd0bbe3
PickupSpawnSystem now spawns a new HealthPickup after the respawnTimer is up. Added HealthPickup.xml entity. Event PickupSpawned now gets published when a new HealthPickup spawns. Player now gains health as he picks up the HealthPickup.
2016-02-05 15:15:04 +01:00
e3a44d37d2
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
428dca003d
Tiny bug fix.
2016-02-05 14:40:50 +01:00
4fe9e4f1c3
Debug cleanup and some bug fixes.
2016-02-05 14:38:08 +01:00
e90f802d48
Merge remote-tracking branch 'origin/master' into Sound
2016-02-05 13:59:21 +01:00
d61e605093
Can walk up "stair-steps". Cleanup WIP.
...
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
2016-02-05 10:56:34 +01:00
71a86cab11
removed event that's not being used
2016-02-05 10:07:56 +01:00
c526a7af55
WIP stencil stuff
2016-02-04 17:58:36 +01:00
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +01:00
7c582898f4
Working stencil buffer for the shield.
2016-02-04 14:33:39 +01:00
Jace
ff26e1235c
Merge pull request #77 from teamfisk/AMDCrashFix
...
AMD crash fix???????????
2016-02-04 12:05:05 +01:00
Jace
6990e473b3
Adding a clear here makes AMD drivers NOT crash for some reason. We're fixing the symptom but not the underlying cause.
2016-02-04 11:53:35 +01:00
d4292d4b43
Merge pull request #63 from teamfisk/AssaultDash
...
Added AssaultDash
2016-02-04 11:50:00 +01:00
035c79564b
Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.
2016-02-04 11:41:21 +01:00
379d211832
some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate
2016-02-04 11:13:26 +01:00
0a8ee1623f
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# assets
2016-02-04 10:47:30 +01:00
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +01:00
0bbaf1d576
Oops! Removed DebugCode...
2016-02-04 10:04:44 +01:00
bc01e147c2
Some state stuff, some draw stuff, some QA map stuff
2016-02-03 18:09:44 +01:00
7b5a2a5388
Dashing now works great both with shift and doubletap. Added Dash Component. Changed default Player.xml to have a Dash Component. Disabled Sprint. You can now disable DoubleTapToDash in Input.Ini. Added command "SpecialAbility".
2016-02-03 17:30:46 +01:00
2e3e59a1e2
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-02-03 16:52:33 +01:00
Jace
bd2da7bc9f
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
...
This reverts commit b56824786c
2016-02-03 16:30:00 +01:00
Jace
b56824786c
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
...
This reverts commit 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
c2833b10c4
Hard coded (read retarded) improvements added to player walk logic
2016-02-03 15:55:32 +01:00
938caa6ba2
Now uses OnComponentAttached event. Can now queue sound on a source.
2016-02-03 15:48:25 +01:00
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +01:00
5665c0f298
Models with Shield and shielded component now added to queues
2016-02-03 14:20:47 +01:00
7ffbd8455f
Added Queues for the models with shield and shielded components.
2016-02-03 13:53:57 +01:00
9d3171540d
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
2016-02-03 11:54:14 +01:00
2391a0dbe9
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 11:51:26 +01:00
2961f198b3
PlayerDeathSystem is now working well. Changed so the model is oriented correctly. Changed so camera is behind the player. Copied the current animation and froze it.
2016-02-03 11:48:22 +01:00
455e59a04f
Made the TEMPORARY capture point boxes transparent.
2016-02-03 11:39:18 +01:00
39653a1e4c
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-03 10:38:21 +01:00
Jace
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
...
Fixed warnings associated with Network
2016-02-03 10:37:10 +01:00
a64d227cab
Assured the volume channels were working. Playing around with drumloop
2016-02-03 10:17:53 +01:00
73ab9bb4c6
Merge remote-tracking branch 'origin/master' into AssaultDash
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-03 09:52:54 +01:00
73716c28e2
pickpass fix
2016-02-02 17:40:22 +01:00
a3b7bd7df5
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
2016-02-02 17:39:57 +01:00
214dad2afc
Removed commented code.
2016-02-02 17:25:59 +01:00
affcc5305b
Collision affects velocity correctly, no wierd ice cream sliding along walls.
2016-02-02 17:19:59 +01:00
5e472cd69c
DeathExplosion is now an XML file, changed PlayerDeathSystem accordingly. The effect should show as soon as the explosioneffect-fix is merged into master. TODO: remove the test
2016-02-02 17:18:12 +01:00
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +01:00
b131f56f5e
Made a quality assurance world that will need to be used before creating a pull request
2016-02-02 16:06:42 +01:00
7236da09b4
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-02 15:13:00 +01:00
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
88ad127d8d
plays notification on captured/lost point
2016-02-02 14:57:03 +01:00
2085d9ec9e
Merge remote-tracking branch 'origin/master' into DoubleJump
2016-02-02 14:22:00 +01:00
d763789490
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# src/Engine/Sound/SoundSystem.cpp
2016-02-02 13:38:49 +01:00
verysecrethero
William Moberg
stiffly
Tleety
Jace