971fee4a0c
DamageIndicatorSystem code looking good. Test working well. Sprite display fixed by Viktor
2016-02-09 15:38:21 +01:00
0e9fb16399
Work started on DamageIndicatorSystem. Made some initial tests and test calculations
2016-02-08 17:58:07 +01:00
db5301ff2c
Merge remote-tracking branch 'origin/Menu' into DamageIndicator
2016-02-08 15:03:45 +01:00
5987751add
Merge pull request #81 from teamfisk/HealthPickup
...
Health pickup
2016-02-08 11:50:47 +01:00
Jace
70f8237a16
Merge pull request #60 from teamfisk/3rdPersonDeathCam
...
3rd person death cam
2016-02-08 11:39:57 +01:00
Jace
99cbdd3c1e
Player death effect fixes
2016-02-08 11:39:29 +01:00
ce22854168
HealthPickups are now based on a percentage of player maxhealth. You can no longer pickup healthpacks if you are at max health. You can no longer gain more than maxHealth.
2016-02-08 11:22:28 +01:00
Jace
35b0193f15
Merge pull request #72 from teamfisk/BoxModelCollision
...
Collision in test phase
2016-02-08 10:29:41 +01:00
f8e514d21e
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-08 10:22:35 +01:00
fad25c6e16
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
...
# Conflicts:
# include/Engine/Core/EPlayerHealthPickup.h
2016-02-08 10:21:30 +01:00
4103c878ec
Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned
2016-02-05 18:05:46 +01:00
40788c7400
Merge pull request #80 from teamfisk/DashFixBranch
...
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSy…
2016-02-05 18:04:15 +01:00
59bdc614f2
Put SpecialAbility on left shift, and Sprint on left shift in DefaultInput.
2016-02-05 17:34:19 +01:00
8034b42c87
spriteComponent WIP
2016-02-05 16:43:57 +01:00
be628d9406
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-05 16:23:22 +01:00
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
7641ba49c7
Weapon doesn't explode in first person.
2016-02-05 15:16:24 +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
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
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +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
Jace
c87e4d4fd6
Added mutex to resource manager cache reading to avoid a potential race condition. We hope this is the actual bug we saw.
2016-02-04 11:53:11 +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
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
1bd4aa91ff
Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started.
2016-02-03 17:45:37 +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
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
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +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
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
Jace
192de80782
Merge pull request #75 from teamfisk/NormalSpecularMapping
...
Normal specular mapping
2016-02-03 10:34:22 +01:00
51a588657e
QA map change
2016-02-03 10:11: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
c4fb604617
Merge branch 'BoxModelCollision' of github.com:teamfisk/TacticalZ into BoxModelCollision
2016-02-02 17:36:50 +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
11025b5466
QA-map stuff
2016-02-02 17:19:58 +01:00
verysecrethero
William Moberg
Jace
viktorljung
Tleety