 verysecrethero
|
03a16b46b5
|
Dash component now has the dash-maxCoolDownVariable in it.
|
2016-02-04 10:28:28 +01:00 |
|
|
verysecrethero
|
0bbaf1d576
|
Oops! Removed DebugCode...
|
2016-02-04 10:04:44 +01:00 |
|
 Tleety
|
bc01e147c2
|
Some state stuff, some draw stuff, some QA map stuff
|
2016-02-03 18:09:44 +01:00 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
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 |
|
 stiffly
|
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 192de80782, reversing
changes made to 24aac6a00d.
|
2016-02-03 16:16:06 +01:00 |
|
|
stiffly
|
c2833b10c4
|
Hard coded (read retarded) improvements added to player walk logic
|
2016-02-03 15:55:32 +01:00 |
|
|
stiffly
|
938caa6ba2
|
Now uses OnComponentAttached event. Can now queue sound on a source.
|
2016-02-03 15:48:25 +01:00 |
|
|
verysecrethero
|
13161b4f57
|
Merge remote-tracking branch 'origin/master' into AssaultDash
|
2016-02-03 15:07:19 +01:00 |
|
|
Tleety
|
5665c0f298
|
Models with Shield and shielded component now added to queues
|
2016-02-03 14:20:47 +01:00 |
|
|
Tleety
|
7ffbd8455f
|
Added Queues for the models with shield and shielded components.
|
2016-02-03 13:53:57 +01:00 |
|
|
Tleety
|
83713b3b6d
|
Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.
|
2016-02-03 13:27:46 +01:00 |
|
|
Tleety
|
7bae2d0873
|
Added a ShieldComponent and a test area in QA map for defender shield
|
2016-02-03 11:58:06 +01:00 |
|
|
verysecrethero
|
9d3171540d
|
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
|
2016-02-03 11:54:14 +01:00 |
|
|
verysecrethero
|
2391a0dbe9
|
Merge remote-tracking branch 'origin/master' into AssaultDash
|
2016-02-03 11:51:26 +01:00 |
|
|
verysecrethero
|
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 |
|
|
Tleety
|
455e59a04f
|
Made the TEMPORARY capture point boxes transparent.
|
2016-02-03 11:39:18 +01:00 |
|
|
verysecrethero
|
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 |
|
 Jocke
|
7bf4f5c30e
|
Merge remote-tracking branch 'origin/master' into TCPConnections
|
2016-02-03 10:29:36 +01:00 |
|
|
Jocke
|
e133791369
|
WIP Reliable Message
|
2016-02-03 10:28:15 +01:00 |
|
|
stiffly
|
a64d227cab
|
Assured the volume channels were working. Playing around with drumloop
|
2016-02-03 10:17:53 +01:00 |
|
|
Tleety
|
51a588657e
|
QA map change
|
2016-02-03 10:11:53 +01:00 |
|
|
verysecrethero
|
73ab9bb4c6
|
Merge remote-tracking branch 'origin/master' into AssaultDash
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-03 09:52:54 +01:00 |
|
|
Tleety
|
73716c28e2
|
pickpass fix
|
2016-02-02 17:40:22 +01:00 |
|
|
Tleety
|
a3b7bd7df5
|
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
|
2016-02-02 17:39:57 +01:00 |
|
 William Moberg
|
c4fb604617
|
Merge branch 'BoxModelCollision' of github.com:teamfisk/TacticalZ into BoxModelCollision
|
2016-02-02 17:36:50 +01:00 |
|
 Teejoon
|
da49dc35ee
|
Added stuff to .gitignore file
|
2016-02-02 17:31:19 +01:00 |
|
|
William Moberg
|
214dad2afc
|
Removed commented code.
|
2016-02-02 17:25:59 +01:00 |
|
 antc13
|
d99bf60510
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-02 17:22:06 +01:00 |
|
|
antc13
|
9cb41fcebe
|
Fixed the exported animation matrices
|
2016-02-02 17:21:51 +01:00 |
|
|
William Moberg
|
affcc5305b
|
Collision affects velocity correctly, no wierd ice cream sliding along walls.
|
2016-02-02 17:19:59 +01:00 |
|
|
Tleety
|
11025b5466
|
QA-map stuff
|
2016-02-02 17:19:58 +01:00 |
|
|
Teejoon
|
4357759715
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-02 17:18:54 +01:00 |
|
|
Teejoon
|
bb4a65a1db
|
Non-skined mesh WIP
|
2016-02-02 17:18:42 +01:00 |
|
|
verysecrethero
|
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 |
|
|
Tleety
|
eba36b8492
|
Some QA-map fixes
|
2016-02-02 17:12:14 +01:00 |
|
|
Tleety
|
55854f5c0d
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
|
2016-02-02 16:30:57 +01:00 |
|
|
Tleety
|
12a181c1ff
|
Fixed a bug where normals scaled with model scale. Again.
|
2016-02-02 16:11:03 +01:00 |
|
|
Tleety
|
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 |
|
|
Jace
|
24aac6a00d
|
Merge pull request #62 from teamfisk/DoubleJump
You can now DoubleJump!
|
2016-02-02 15:31:03 +01:00 |
|
|
verysecrethero
|
7236da09b4
|
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
|
2016-02-02 15:13:00 +01:00 |
|
|
verysecrethero
|
45a92b362f
|
DoubleJumping now in InputController instead.
|
2016-02-02 15:10:11 +01:00 |
|
 viktorljung
|
89bc063ef0
|
Merge remote-tracking branch 'origin/Importer' into Animations
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
|
2016-02-02 15:01:34 +01:00 |
|
|
stiffly
|
88ad127d8d
|
plays notification on captured/lost point
|
2016-02-02 14:57:03 +01:00 |
|
|
viktorljung
|
dba2fbdc0c
|
WIP
|
2016-02-02 14:52:31 +01:00 |
|
|
antc13
|
69bb17aa90
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
# Conflicts:
# tools/MayaExporter/MayaExporter/Skeleton.cpp
|
2016-02-02 14:50:01 +01:00 |
|