 Tleety
|
a76a04260f
|
StartSystem skeleton and some changes to the StartMenu
|
2016-03-09 15:10:54 +01:00 |
|
|
Tleety
|
500ebfa08c
|
Menu should now show the correct server IP instead of default.
Start of a StartMenu entity that will show when the game is started.
|
2016-03-09 14:34:02 +01:00 |
|
 viktorljung
|
70ec075887
|
3rd person aim improvements
|
2016-03-09 13:19:56 +01:00 |
|
|
Tleety
|
704242597a
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/NewMapWSpectatorCam.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Game.cpp
|
2016-03-09 11:49:42 +01:00 |
|
|
Tobias Dahl
|
697da620d3
|
Merge pull request #179 from teamfisk/TeamPickCamera
Spectator camera system
|
2016-03-09 11:41:05 +01:00 |
|
 William Moberg
|
b782e73556
|
Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements.
|
2016-03-09 10:56:05 +01:00 |
|
|
Tleety
|
95f68cc888
|
ConnectRequest event and some other shit
|
2016-03-08 22:24:32 +01:00 |
|
|
Tleety
|
3394d65055
|
Servers now show up in the server list.
|
2016-03-08 18:13:21 +01:00 |
|
 verysecrethero
|
7ee4ea637b
|
Merge remote-tracking branch 'origin/master' into TeamPickCamera
|
2016-03-08 17:30:22 +01:00 |
|
|
Tleety
|
ba9208085b
|
WIP
|
2016-03-08 16:52:56 +01:00 |
|
|
Tleety
|
f8ab52c72c
|
WIP
|
2016-03-08 16:15:54 +01:00 |
|
|
viktorljung
|
f934f972e8
|
Merge remote-tracking branch 'origin/Weapons' into Movement
# Conflicts:
# resources/Schema/Entities/PlayerDefenderBlue.xml
|
2016-03-08 14:34:21 +01:00 |
|
|
viktorljung
|
8d1877321a
|
Fixed BoneAttachment offset rotation
|
2016-03-08 14:32:50 +01:00 |
|
|
Tleety
|
a0ca4df3be
|
Some server list components and entities.
|
2016-03-08 13:29:21 +01:00 |
|
|
viktorljung
|
f77a610519
|
Dash now looking good
|
2016-03-08 13:26:01 +01:00 |
|
|
William Moberg
|
d7f09b1a8f
|
Added clickable buttons to switch to class/team screens, as a better alternative to Comma/Period on the keyboard.
|
2016-03-08 11:59:15 +01:00 |
|
|
viktorljung
|
2ba245368b
|
Improved movement animaitons
Added a SetBlendWeight event that sets the weight for all nodes with a name.
|
2016-03-08 11:21:40 +01:00 |
|
|
Tleety
|
01f29b6d4e
|
Blur behind buttons/sprites should now be working as intended.
|
2016-03-08 11:14:09 +01:00 |
|
 stiffly
|
ec3ed1f46f
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
|
2016-03-08 10:39:52 +01:00 |
|
|
Tleety
|
5c0d9070c7
|
WIP
|
2016-03-07 23:25:06 +01:00 |
|
 FakeShemp
|
e494f6a495
|
Merge branch 'master' into Shadows
|
2016-03-07 19:46:04 +01:00 |
|
|
FakeShemp
|
2049d630e9
|
Revert "Revert "Shadows""
This reverts commit 73b8bff1f3.
|
2016-03-07 19:45:46 +01:00 |
|
 Jace
|
3fda25b604
|
Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon
|
2016-03-07 19:38:49 +01:00 |
|
|
Jace
|
67ce6c5ae6
|
Added Speed and Delay fields to explosion effect.
|
2016-03-07 19:38:02 +01:00 |
|
|
Jace
|
b000bb2597
|
Cleaned up old entities
|
2016-03-07 17:53:11 +01:00 |
|
|
William Moberg
|
fcf87104c3
|
Replaced test textures for class picking with more proper icons.
|
2016-03-07 17:50:03 +01:00 |
|
|
stiffly
|
9e8df340b3
|
Merge remote-tracking branch 'origin/master' into NetworkComponent
# Conflicts:
# src/Engine/Network/Server.cpp
|
2016-03-07 17:21:24 +01:00 |
|
|
stiffly
|
b629ed5e2b
|
Updated some known xml entities that should be send in snapshots.
|
2016-03-07 17:15:56 +01:00 |
|
|
Tleety
|
7de95d4cb5
|
Mainmenu entity
|
2016-03-07 16:34:56 +01:00 |
|
|
stiffly
|
f585f9ada9
|
Created the NetworkComponent xml file
|
2016-03-07 16:11:19 +01:00 |
|
|
FakeShemp
|
ee99821164
|
Add reverse and scalar for ColorByDistance
|
2016-03-07 15:45:06 +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 |
|
|
William Moberg
|
962521fa59
|
Merge branch 'master' into TeamPickCamera
# Conflicts:
# src/Game/Systems/PlayerDeathSystem.cpp
|
2016-03-07 15:20:46 +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 |
|
 Teejoon
|
b38ebbe676
|
Shadows now working on NVIDIA cards too
|
2016-03-07 14:00:08 +01:00 |
|
|
FakeShemp
|
243276707a
|
Merge remote-tracking branch 'origin/master' into ExplosionEffectV2
|
2016-03-07 13:52:29 +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 |
|
|
viktorljung
|
c1f5cf65a7
|
Movement animations
|
2016-03-04 09:39:16 +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 |
|
|
viktorljung
|
7ba0e4ea9d
|
Run, Strafe and jump animations now playing
|
2016-03-04 08:35:02 +01:00 |
|