 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 |
|
|
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
|
bbe61f300c
|
Fade in/out should now work with models and sprites
|
2016-03-13 02:03:49 +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
|
c0fc36845f
|
Defender ability HUD fixed
|
2016-03-12 18:43:04 +01:00 |
|
|
viktorljung
|
51b8846b3a
|
Ammo sharing done
|
2016-03-12 18:29:49 +01:00 |
|
|
viktorljung
|
dfc30f4693
|
Boost fixes?
|
2016-03-12 17:39:50 +01:00 |
|
|
viktorljung
|
944d10f4bb
|
Some network fixes with sidearm
|
2016-03-12 17:34:32 +01:00 |
|
|
Tleety
|
f7363eeea4
|
Boost icon fix
|
2016-03-12 17:30:28 +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
|
4334ea067e
|
System skeleton
|
2016-03-12 14:44:03 +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 |
|
|
viktorljung
|
e0a6b09d36
|
Defender early alpha
|
2016-03-11 19:16:34 +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 |
|
|
viktorljung
|
cc127ad772
|
Updated defender blendtree
|
2016-03-10 21:31:19 +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 |
|
|
Jace
|
35a8d45fa4
|
Fixed skinned models not being able to be shielded
|
2016-03-10 19:20:21 +01:00 |
|
|
viktorljung
|
0d2e8c1cbe
|
Merge branch 'master' into Movement
|
2016-03-10 16:31:45 +01:00 |
|
|
viktorljung
|
59e487f9bb
|
PlayerDefenderBlue Updated blendtree
|
2016-03-10 16:05:46 +01:00 |
|
|
Jace
|
777f382772
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 15:48:05 +01:00 |
|
|
Jace
|
78129cf432
|
Fixed picking depth values after depth buffer was changed to a texture.
|
2016-03-10 15:47:47 +01:00 |
|
|
Jace
|
e734d0c953
|
Oops.
|
2016-03-10 15:47:32 +01:00 |
|
 William Moberg
|
c9fef65c4f
|
Merge pull request #198 from teamfisk/Menu
Menu
|
2016-03-10 15:38:06 +01:00 |
|
|
Tleety
|
7e6288c597
|
Some merge fixes and some sprite fixes.
|
2016-03-10 15:36:33 +01:00 |
|
|
Tleety
|
4322a5d8da
|
Some fixes for sprites
|
2016-03-10 15:21:11 +01:00 |
|
|
Tleety
|
79d0ef4529
|
Changed default value of glow intensity
|
2016-03-10 14:01:45 +01:00 |
|
|
Jace
|
dd63f4a1b4
|
Fixed FOV being used to calculate projection matrix being degrees when it should be radians, AGAIN. FOV angles are now correct!
|
2016-03-10 13:51:18 +01:00 |
|
|
Tleety
|
50dbbb4ed4
|
SSAO now send in 0 as Lod level and some optimizations in SSAO and Blur pass.
|
2016-03-10 13:47:16 +01:00 |
|
|
Tleety
|
329a15e08b
|
Bloom bad edge clamp fixed
|
2016-03-10 13:42:33 +01:00 |
|
 stiffly
|
28de31d84d
|
FIX #196: Some variables had not been properly initialized and would cause the game to crash.
|
2016-03-10 13:28:38 +01:00 |
|
|
Jace
|
e9ef0e7060
|
Disabled GLERROR macro for release builds
|
2016-03-10 13:19:26 +01:00 |
|
|
Jace
|
416f55b6ce
|
Merge pull request #196 from teamfisk/RendererBugFixes
Fixed on window resize memory leak
|
2016-03-10 13:11:23 +01:00 |
|
|
Jace
|
0346f81234
|
Renderer resizing updated to send EResolutionChanged when the resolution is updated so cameras can update their aspect ratio and have a correct FOV. Renderer::SetResolution actually changes the resolution now too.
|
2016-03-10 13:09:34 +01:00 |
|
|
Tleety
|
c3255519bf
|
Blur is now looking like real blur
|
2016-03-10 13:07:41 +01:00 |
|
 Teejoon
|
a6ef026db5
|
Fixed on window resize memory leak
|
2016-03-10 12:27:25 +01:00 |
|
|
Tleety
|
a2244e87ad
|
WIP, trying to get blur to work with mipmaps
|
2016-03-10 12:18:06 +01:00 |
|
 Viktor Ljung
|
f26b24ef6b
|
Merge pull request #195 from teamfisk/AnimationPickingFixes
Forgot one console spammer
|
2016-03-10 10:49:05 +01:00 |
|
|
viktorljung
|
b0e9cd3965
|
Forgot one console spammer
|
2016-03-10 10:47:58 +01:00 |
|
|
Adam Byléhn
|
5e747f53db
|
Merge pull request #194 from teamfisk/AnimationPickingFixes
Animation picking fixes
|
2016-03-10 10:33:29 +01:00 |
|