 William Moberg
|
e4145cf292
|
Fixed dash effect to be supported with the new animations using Fade components.
Added bool Loop field in Fade component.
|
2016-03-13 22:49:24 +01:00 |
|
 viktorljung
|
93f4384da6
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 21:10:39 +01:00 |
|
|
viktorljung
|
3a0cff7a83
|
boost check for defender
|
2016-03-13 21:10:22 +01:00 |
|
 Tleety
|
27443d4e08
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 21:01:15 +01:00 |
|
|
Tleety
|
20e48eeb08
|
Killfeed should work now.
|
2016-03-13 21:01:04 +01:00 |
|
|
viktorljung
|
1da3ec3c74
|
ammo share fix?
|
2016-03-13 20:32:08 +01:00 |
|
|
viktorljung
|
389d27973f
|
Assault boost check
|
2016-03-13 18:55:45 +01:00 |
|
|
viktorljung
|
0d287ad5d1
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
# Conflicts:
# resources/Schema/Entities/RayAssaultBlue.xml
|
2016-03-13 16:45:57 +01:00 |
|
|
viktorljung
|
3cee4e4248
|
defender ray fixes
|
2016-03-13 16:42:07 +01:00 |
|
|
Tleety
|
041050ab2f
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 16:15:26 +01:00 |
|
|
Tleety
|
9f752ad3e9
|
Fadesystem, entities, weapon muzzles should now look good. reload for secondary
|
2016-03-13 16:15:06 +01:00 |
|
|
viktorljung
|
44f46cda8d
|
Merge remote-tracking branch 'origin/master' into Movement
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CP_Rocky2.xml
# resources/Schema/Entities/MuzzleFlashBlue.xml
# resources/Schema/Entities/MuzzleFlashFire.xml
# resources/Schema/Entities/MuzzleFlashRed.xml
# resources/Schema/Types/Entity.xsd
# resources/Shaders/Sprite.frag.glsl
# src/Game/Systems/AbilityCooldownHUDSystem.cpp
# src/Game/Systems/BoostIconsHUDSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
# src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
# src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
|
2016-03-13 15:17:15 +01:00 |
|
|
viktorljung
|
7d899a989c
|
Started working on boost HUD thingy
|
2016-03-13 15:09:50 +01:00 |
|
 Teejoon
|
f9e640ffc6
|
Added borders to capture points so that you can see if your inside of outside when not looking down
|
2016-03-13 14:59:57 +01:00 |
|
|
viktorljung
|
0963f61976
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 13:41:39 +01:00 |
|
|
viktorljung
|
bfb7a4139d
|
Tweaking
|
2016-03-13 13:41:28 +01:00 |
|
 antc13
|
d0a083a1e3
|
Fixed rotation/translation on some objects on CP_Rocky2.
|
2016-03-13 13:13:14 +01:00 |
|
|
viktorljung
|
60c6aa2486
|
Defender first person tracers done
|
2016-03-13 02:35:02 +01:00 |
|
|
Tleety
|
8d809f30f7
|
Muzzleflash now very nice
|
2016-03-13 02:25:11 +01:00 |
|
|
Tleety
|
13f44c2086
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 01:24:01 +01:00 |
|
|
Tleety
|
f6a8534c15
|
New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation
|
2016-03-13 01:23:51 +01:00 |
|
|
viktorljung
|
51b8846b3a
|
Ammo sharing done
|
2016-03-12 18:29:49 +01:00 |
|
 Jace
|
ba93ebbe88
|
Go away crap maps.
|
2016-03-12 18:21:36 +01:00 |
|
|
antc13
|
beee2db5fb
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-12 17:08:21 +01:00 |
|
|
antc13
|
1bc4b89a53
|
Added new models with textures to the map. Every model on the map should now be using a texture.
|
2016-03-12 17:08:07 +01:00 |
|
|
Tleety
|
d51ea3cabd
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-12 17:04:00 +01:00 |
|
|
Tleety
|
548efeb11e
|
EndScreen should now show when a team win
|
2016-03-12 17:03:50 +01:00 |
|
|
viktorljung
|
4ba011a098
|
Ammosharing over network test WIP
|
2016-03-12 17:01:46 +01:00 |
|
|
viktorljung
|
01cb3afb4b
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
# Conflicts:
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerDefenderBlue.xml
|
2016-03-12 15:48:41 +01:00 |
|
|
viktorljung
|
0b26f23188
|
3rd person animations idle bug fixed
|
2016-03-12 15:47:19 +01:00 |
|
|
Tleety
|
8c2a665ccb
|
Some Entities for endscreen and some basic logic in the EndScreenSystem
|
2016-03-12 15:45:07 +01:00 |
|
|
Tleety
|
8e266984f4
|
Player HUD should now be ok, color of health still shit tho
|
2016-03-12 14:37:26 +01:00 |
|
|
viktorljung
|
060585a388
|
Aim fixed for all weapons
|
2016-03-12 02:39:06 +01:00 |
|
|
viktorljung
|
2a209c5d8e
|
AmmoSharing beta
|
2016-03-11 23:58:26 +01:00 |
|
|
Tleety
|
dc09ba9158
|
Resolution should now use a dropdown
|
2016-03-11 20:02:25 +01:00 |
|
|
viktorljung
|
e0a6b09d36
|
Defender early alpha
|
2016-03-11 19:16:34 +01:00 |
|
|
antc13
|
ac096bbf77
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
# Conflicts:
# resources/Schema/Entities/CP_Rocky2.xml
|
2016-03-11 15:46:39 +01:00 |
|
|
antc13
|
81634578d9
|
Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.
|
2016-03-11 15:43:20 +01:00 |
|
|
Tleety
|
26337ff243
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 15:07:52 +01:00 |
|
 FakeShemp
|
7bdb0d410f
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-11 15:04:52 +01:00 |
|
|
FakeShemp
|
172fb8dfc2
|
MuzzleFlash entities
|
2016-03-11 15:04:44 +01:00 |
|
|
William Moberg
|
f036817c0c
|
Merge pull request #203 from teamfisk/SplitSnapshots
Split snapshots
|
2016-03-11 14:35:18 +01:00 |
|
 verysecrethero
|
0aedeb61b4
|
CapturePointSystem now sets all children visible/not visible for each red/blue/spectator
|
2016-03-11 14:15:46 +01:00 |
|
|
Tleety
|
44398eac58
|
Options now has some different resolutions.
|
2016-03-11 14:11:58 +01:00 |
|
|
Tleety
|
8ceaae995d
|
Options menu started working on
|
2016-03-11 13:00:34 +01:00 |
|
|
Tleety
|
23e6a15c7f
|
Fixed the fill on sprites, added some config button components, started work on option menu
|
2016-03-11 11:31:53 +01:00 |
|
|
viktorljung
|
266aca467e
|
Merge remote-tracking branch 'origin/Weapons' into Movement
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
|
2016-03-11 11:25:43 +01:00 |
|
 Jocke
|
7febb7681c
|
Merge remote-tracking branch 'origin/master' into SplitSnapshots
|
2016-03-11 11:05:41 +01:00 |
|
|
Tleety
|
dab58e09a0
|
Merge branch 'master' into Menu
|
2016-03-11 10:20:25 +01:00 |
|
|
Tleety
|
cd6967b310
|
Merge
|
2016-03-11 10:20:13 +01:00 |
|