 Tleety
|
01f29b6d4e
|
Blur behind buttons/sprites should now be working as intended.
|
2016-03-08 11:14:09 +01:00 |
|
|
Tleety
|
5c0d9070c7
|
WIP
|
2016-03-07 23:25:06 +01:00 |
|
|
Tleety
|
7de95d4cb5
|
Mainmenu entity
|
2016-03-07 16:34:56 +01:00 |
|
|
Tobias Dahl
|
3edc2f4819
|
Merge pull request #174 from teamfisk/CapturePointFixBranch
CapturePoints now have red/blue/spectator model-children
|
2016-03-07 15:25:22 +01:00 |
|
|
Tleety
|
47ece6a5bf
|
Changed shield component to track Active, so it and sprint glow full if they are active.
Changed how reflections are calculated with light.
|
2016-03-07 14:42:50 +01:00 |
|
 verysecrethero
|
64df3fd7ad
|
CapturePoints now have red/blue/spectator model-children
|
2016-03-07 14:30:27 +01:00 |
|
|
Tleety
|
388fe7c259
|
Fixed some stuff on the player HUD
|
2016-03-07 11:28:10 +01:00 |
|
|
Tleety
|
c7099de9e4
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
# Conflicts:
# assets
|
2016-03-07 10:58:55 +01:00 |
|
|
Tleety
|
cb9dad5c67
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
|
2016-03-07 10:49:57 +01:00 |
|
|
Tleety
|
a8f2d0a8e6
|
Some assets, some fixes to the scoreboard
|
2016-03-07 10:48:46 +01:00 |
|
 Jace
|
b7a7f7fd5e
|
????
|
2016-03-04 15:02:01 +01:00 |
|
|
Jace
|
434ff1e7eb
|
????
|
2016-03-04 10:06:49 +01:00 |
|
|
Jace
|
4557455e49
|
HUD stuff
|
2016-03-04 09:41:12 +01:00 |
|
|
Jace
|
a8ad85b004
|
Merge remote-tracking branch 'origin/IconsForPlaytest' into Weapons
|
2016-03-04 09:39:11 +01:00 |
|
|
Jace
|
3ac8a5c7ef
|
Working map
|
2016-03-04 09:38:38 +01:00 |
|
|
Jace
|
42cccfbac0
|
Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons
# Conflicts:
# assets
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
|
2016-03-04 08:56:58 +01:00 |
|
|
Jace
|
2b55450c18
|
Cray cray weapons
|
2016-03-04 08:54:59 +01:00 |
|
 Jocke
|
d78a7e20e2
|
Merge branch 'master' into Weapons
|
2016-03-04 08:29:33 +01:00 |
|
|
Jocke
|
5b80ba4398
|
Made 3 new healthHUDs 1 for each class.
|
2016-03-04 08:22:48 +01:00 |
|
|
Jocke
|
2187df080a
|
Merge branch 'master' into IconsForPlaytest
|
2016-03-04 05:17:54 +01:00 |
|
|
Jace
|
177667eef5
|
The only working branch ever
|
2016-03-04 05:02:25 +01:00 |
|
 antc13
|
1f047ea300
|
Latest Map version (Hopefully) Now with textures. Made some very minor tweaks as well, by removing duplicated meshes.
|
2016-03-04 04:22:04 +01:00 |
|
|
Joachim Pettersson
|
e6472b9745
|
Merge pull request #170 from teamfisk/ScoreBoard
I Hope To God That This Works.
|
2016-03-04 04:03:46 +01:00 |
|
|
Tleety
|
19ee66fc75
|
Fix
|
2016-03-04 03:57:37 +01:00 |
|
|
Tobias Dahl
|
7675af1ef6
|
Merge pull request #168 from teamfisk/SniperSprintBranch
Sniper sprint effect
|
2016-03-04 03:31:53 +01:00 |
|
|
Jocke
|
2507516a85
|
Tweaked values for the effect to look better
|
2016-03-04 03:28:58 +01:00 |
|
|
Jace
|
3a8f7c5d03
|
First attempt at AssaultWeapon animations!
|
2016-03-04 02:48:03 +01:00 |
|
|
Tleety
|
778bbd13ca
|
double's should now be displayed with only 1 decimal.
|
2016-03-04 02:19:13 +01:00 |
|
|
antc13
|
86306b3132
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
# Conflicts:
# resources/Schema/Entities/NewMap2version2.xml
|
2016-03-04 01:15:42 +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 |
|
 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 |
|
|
Tleety
|
0a21fe15dd
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
|
2016-03-03 22:56:39 +01:00 |
|
|
Tleety
|
011aa53bc0
|
ScoreScreen things
|
2016-03-03 22:55:18 +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 |
|
|
Jocke
|
984b8ad3e9
|
SprintEffect defaults to 30% extra speed.
|
2016-03-03 21:57:27 +01:00 |
|
|
Tleety
|
f5ea4e06c7
|
Map
|
2016-03-03 21:37:18 +01:00 |
|
|
Jocke
|
b1148c0c6c
|
Added a afterimage SprintEffect for the Sniper.
|
2016-03-03 21:24:31 +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 |
|
|
Tleety
|
00c585de3c
|
Score should now track to all clients
|
2016-03-03 20:45:16 +01:00 |
|
|
Jace
|
c0e160833c
|
Playtest 2 Fallback Map
|
2016-03-03 20:43:28 +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 |
|