 Jace
|
9d2ce5af8a
|
Player is now spawned as the correct class that they picked.
|
2016-03-13 23:05:52 +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
|
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 |
|
 William Moberg
|
ac20e41a5d
|
Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.
|
2016-03-13 14:23:56 +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 |
|
|
William Moberg
|
4f99f6ef74
|
Merge branch 'master' into RestartMap
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
|
2016-03-13 13:37:51 +01:00 |
|
|
viktorljung
|
60c6aa2486
|
Defender first person tracers done
|
2016-03-13 02:35:02 +01:00 |
|
|
Tleety
|
bbe61f300c
|
Fade in/out should now work with models and sprites
|
2016-03-13 02:03:49 +01:00 |
|
|
Jace
|
4bd2e7995a
|
fixup! Cheeki breeki
|
2016-03-13 01:32:29 +01:00 |
|
|
Jace
|
45bfc374de
|
Cheeki breeki
|
2016-03-13 01:25:13 +01:00 |
|
|
Tleety
|
f6a8534c15
|
New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation
|
2016-03-13 01:23:51 +01:00 |
|
|
Jace
|
95f9065037
|
Merge branch 'master' into Dirtybit
# Conflicts:
# include/Engine/Sound/SoundManager.h
|
2016-03-13 01:07:17 +01:00 |
|
|
Jace
|
a1fda82d3a
|
Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself
|
2016-03-13 00:57:00 +01:00 |
|
|
Jace
|
1e7f6941ba
|
Merge pull request #208 from teamfisk/Kill-streak-sounds
Various sound improvements/additions
|
2016-03-12 23:06:57 +01:00 |
|
 Jocke
|
60df30fa59
|
Scoreboard is now works.
|
2016-03-12 19:36:12 +01:00 |
|
|
William Moberg
|
a3b3351e55
|
Merge branch 'master' into Dirtybit
# Conflicts:
# include/Engine/Rendering/ExplosionEffectJob.h
# src/Game/Systems/ExplosionEffectSystem.cpp
|
2016-03-12 17:59:50 +01:00 |
|
|
Jocke
|
c544f349fd
|
The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.
|
2016-03-12 17:49:50 +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 |
|
|
Tleety
|
8c2a665ccb
|
Some Entities for endscreen and some basic logic in the EndScreenSystem
|
2016-03-12 15:45:07 +01:00 |
|
|
Jace
|
068e151741
|
Merge pull request #173 from teamfisk/ExplosionEffectV2
Explosion effect v2
|
2016-03-12 15:25:12 +01:00 |
|
|
Tleety
|
4334ea067e
|
System skeleton
|
2016-03-12 14:44:03 +01:00 |
|
 stiffly
|
9942747d41
|
WIP pull request fixes
|
2016-03-12 14:26:09 +01:00 |
|
|
Jace
|
01db8e0615
|
Merge remote-tracking branch 'origin/master' into Dirtybit
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-03-12 04:09:53 +01:00 |
|
|
viktorljung
|
060585a388
|
Aim fixed for all weapons
|
2016-03-12 02:39:06 +01:00 |
|
|
Jace
|
80649ce51d
|
Updated the ENTIRE CODEBASE TO MATCH
|
2016-03-12 00:38:33 +01:00 |
|
|
viktorljung
|
2a209c5d8e
|
AmmoSharing beta
|
2016-03-11 23:58:26 +01:00 |
|
|
stiffly
|
66d0f9fa47
|
Added menu music
|
2016-03-11 20:28:09 +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 |
|
|
stiffly
|
157a54e845
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
|
2016-03-11 18:19:22 +01:00 |
|
|
Tleety
|
0ca627eb8b
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 14:57:59 +01:00 |
|
|
Tleety
|
44398eac58
|
Options now has some different resolutions.
|
2016-03-11 14:11:58 +01:00 |
|
|
Tleety
|
bb0531a459
|
WIP
|
2016-03-11 13:10:08 +01:00 |
|
|
Tleety
|
8ceaae995d
|
Options menu started working on
|
2016-03-11 13:00:34 +01:00 |
|
|
Adam Byléhn
|
56a13d03fc
|
Merge pull request #197 from teamfisk/SpectatorCamera
Properly unlocked mouse
|
2016-03-11 10:43:29 +01:00 |
|
|
Jace
|
1992b6cde1
|
WIP Defender tracers
|
2016-03-10 21:15:27 +01:00 |
|
|
Jace
|
c82be79bb8
|
Functionally working defender weapon
|
2016-03-10 19:26:14 +01:00 |
|
 verysecrethero
|
0a94373f3f
|
The children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1
|
2016-03-10 14:38:20 +01:00 |
|
|
William Moberg
|
bdcb33d992
|
Mouse always unlocked on game start and on disconnecting (i.e when menu shows).
|
2016-03-10 12:46:06 +01:00 |
|
 FakeShemp
|
6c072aae45
|
Merge remote-tracking branch 'origin/master' into ExplosionEffectV2
# Conflicts:
# resources/Schema/Components/ExplosionEffect.xml
# resources/Shaders/ExplosionEffect.geom.glsl
# src/Game/Systems/ExplosionEffectSystem.cpp
|
2016-03-10 11:49:51 +01:00 |
|
|
stiffly
|
e444a86ec5
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
|
2016-03-10 10:36:20 +01:00 |
|
|
Jace
|
1f14087734
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-09 18:02:11 +01:00 |
|