 Jace
|
2b55450c18
|
Cray cray weapons
|
2016-03-04 08:54:59 +01:00 |
|
|
Jace
|
177667eef5
|
The only working branch ever
|
2016-03-04 05:02:25 +01:00 |
|
|
Jace
|
dbafab2cef
|
fixup! First attempt at AssaultWeapon animations!
|
2016-03-04 03:07:36 +01:00 |
|
|
Jace
|
609f6619a6
|
Merge remote-tracking branch 'origin/Animations' into Weapons
|
2016-03-04 03:04:36 +01:00 |
|
|
Jace
|
03ea9bcf40
|
fixup! Duration no longer needed
|
2016-03-04 03:00:03 +01:00 |
|
|
Jace
|
d37b7c2277
|
fixup! First attempt at AssaultWeapon animations!
|
2016-03-04 02:55:19 +01:00 |
|
 viktorljung
|
1bd71931b8
|
Fixed crash when trying to blend to a nonexistent node
|
2016-03-04 02:53:23 +01:00 |
|
|
Jace
|
b7fa7f9119
|
Duration no longer needed
|
2016-03-04 02:50:03 +01:00 |
|
|
Jace
|
608e339172
|
Merge remote-tracking branch 'origin/Animations' into Weapons
|
2016-03-04 02:48:41 +01:00 |
|
|
Jace
|
3a8f7c5d03
|
First attempt at AssaultWeapon animations!
|
2016-03-04 02:48:03 +01:00 |
|
|
viktorljung
|
1ff91a5c5d
|
fixup! Blend duration can now be 0.0
Commited input test stuff
|
2016-03-04 02:30:05 +01:00 |
|
|
viktorljung
|
49802fed91
|
Blend duration can now be 0.0
|
2016-03-04 02:24:13 +01:00 |
|
|
viktorljung
|
1616fb20d1
|
Skinned meshes now in T-Pose when not it's blendtree is null
|
2016-03-04 02:03:50 +01:00 |
|
|
Jace
|
4dd46e2e21
|
Merge branch 'master' into Weapons
|
2016-03-03 23:46:46 +01:00 |
|
|
Jace
|
7e6d32aaec
|
Fixed AssaultWeapon reload logic
|
2016-03-03 23:45:28 +01:00 |
|
|
Jace
|
9426942988
|
Merge pull request #169 from teamfisk/Animations
Animations
|
2016-03-03 23:45:24 +01:00 |
|
|
viktorljung
|
bebdacabb4
|
Clean up
|
2016-03-03 23:41:08 +01:00 |
|
|
viktorljung
|
66c8a17b17
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-03-03 23:21:14 +01:00 |
|
|
viktorljung
|
e3fbd2082c
|
BlendQueues fully working
|
2016-03-03 23:20:13 +01:00 |
|
|
Jace
|
217c3fe55c
|
Fixes
|
2016-03-03 22:58:45 +01:00 |
|
|
Jace
|
80ad76c023
|
Merge branch 'Playtest2-Fallback' of github.com:teamfisk/TacticalZ into Playtest2-Fallback
|
2016-03-03 22:25:46 +01:00 |
|
|
Jace
|
c84d7ebb8f
|
PlayerAssaultFallbackBlue and PlayerAssaultFallbackRed
|
2016-03-03 22:25:07 +01:00 |
|
 Tleety
|
f5ea4e06c7
|
Map
|
2016-03-03 21:37:18 +01:00 |
|
|
viktorljung
|
68332102ea
|
Can now blend non unique nodes
|
2016-03-03 21:20:55 +01:00 |
|
|
Jace
|
6532e9896e
|
fixup! Playtest 2 Fallback Map
|
2016-03-03 21:05:21 +01:00 |
|
|
Jace
|
e24a0b127b
|
Added Ability cooldown UI and missing texture
|
2016-03-03 20:59:30 +01:00 |
|
|
Jace
|
c0e160833c
|
Playtest 2 Fallback Map
|
2016-03-03 20:43:28 +01:00 |
|
|
Jace
|
cbb2ec2fd6
|
Unique ids for entity nodes in the editor to prevent weird behaviour when multiple entities have the same name
|
2016-03-03 20:43:28 +01:00 |
|
|
Jace
|
c467d54d44
|
Merge pull request #167 from teamfisk/Weapons
Working Assault Weapon
|
2016-03-03 20:43:13 +01:00 |
|
|
Jace
|
0e5810d39e
|
Merge branch 'master' into Weapons
|
2016-03-03 20:41:50 +01:00 |
|
|
Jace
|
eba296196c
|
Merge remote-tracking branch 'origin/master' into Weapons
# Conflicts:
# src/Game/Game.cpp
|
2016-03-03 20:05:10 +01:00 |
|
|
Jace
|
b2371f4a43
|
Working AssaultWeapon
|
2016-03-03 20:00:42 +01:00 |
|
 maqu14
|
f1c5df1418
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-03 19:58:53 +01:00 |
|
|
Jace
|
e55a399bad
|
Merge pull request #165 from teamfisk/PickClassCamera
Pick class camera
|
2016-03-03 18:41:04 +01:00 |
|
 Joachim Pettersson
|
2dfcd3ad95
|
Merge pull request #158 from teamfisk/SniperSprintBranch
Looks good// William
|
2016-03-03 18:25:38 +01:00 |
|
 Adam Byléhn
|
44924ea1f9
|
Merge pull request #166 from teamfisk/FixNetworkBugs
Hot fix: Infinite loop when a player disconnected from the server.
|
2016-03-03 18:22:13 +01:00 |
|
|
Jocke
|
7943fc7ad6
|
Hot fix: Infinite loop when a player disconnected from the server.
|
2016-03-03 18:14:33 +01:00 |
|
 verysecrethero
|
be331cb778
|
fixed
|
2016-03-03 18:05:10 +01:00 |
|
|
viktorljung
|
a3494b92c8
|
Blending queues now working
|
2016-03-03 17:48:25 +01:00 |
|
|
verysecrethero
|
a72dc94d5d
|
Merge branch 'SniperSprintBranch' of github.com:teamfisk/TacticalZ into SniperSprintBranch
# Conflicts:
# include/Engine/Input/FirstPersonInputController.h
|
2016-03-03 17:35:17 +01:00 |
|
|
verysecrethero
|
c5f3bfc0cd
|
Fixed the stuff in comments
|
2016-03-03 17:33:41 +01:00 |
|
 William Moberg
|
98366ec038
|
PickClass used for class-picking, SwapToClassPick to swap camera.
|
2016-03-03 16:59:17 +01:00 |
|
|
William Moberg
|
398bc725b6
|
When pick class buttons are clicked they send an InputCommand, not an ButtonClicked event.
|
2016-03-03 16:32:24 +01:00 |
|
|
Tobias Dahl
|
fe36e8b423
|
Merge pull request #164 from teamfisk/FixNetworkBugs
Fixed invisible players and connect crash.
|
2016-03-03 15:57:02 +01:00 |
|
|
William Moberg
|
8859f652b9
|
Input ClassPick now switches to a camera with class buttons, they do nothing now and have test textures.
|
2016-03-03 15:48:55 +01:00 |
|
|
stiffly
|
a7bff92899
|
The readBuffer now checks if the whole packet has arrived before attempting to parse it.
|
2016-03-03 15:16:42 +01:00 |
|
|
Tobias Dahl
|
bfcf7b240e
|
Merge pull request #163 from teamfisk/revert-145-Shadows
Revert "Shadows"
|
2016-03-03 14:25:10 +01:00 |
|
|
Tobias Dahl
|
73b8bff1f3
|
Revert "Shadows"
|
2016-03-03 14:24:43 +01:00 |
|
|
Tobias Dahl
|
1deb506fb2
|
Merge pull request #145 from teamfisk/Shadows
Shadows
|
2016-03-03 14:06:48 +01:00 |
|
|
viktorljung
|
8957b0b464
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-03-03 14:05:43 +01:00 |
|