 Tleety
|
26dde21e3d
|
Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu
|
2016-03-11 11:32:18 +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 |
|
 Teejoon
|
e96ad44e44
|
BlurHUDPass now works correct when resizing window.
|
2016-03-11 11:23:23 +01:00 |
|
 stiffly
|
a3ab844cc4
|
Makes sure m_CurrentSelection is valid before using it.
|
2016-03-11 11:12:49 +01:00 |
|
|
stiffly
|
03493df213
|
Merge remote-tracking branch 'origin/master' into EntitiesWithoutTransform
|
2016-03-11 11:06:23 +01:00 |
|
 Jocke
|
7febb7681c
|
Merge remote-tracking branch 'origin/master' into SplitSnapshots
|
2016-03-11 11:05:41 +01:00 |
|
|
Teejoon
|
e000408593
|
Getting ShaderID one time per material in total instead of one time every frame
|
2016-03-11 11:03:09 +01:00 |
|
|
Jocke
|
33627f917c
|
removed debug info.
|
2016-03-11 11:01:10 +01:00 |
|
 verysecrethero
|
0869afd529
|
Merge pull request #193 from teamfisk/BoxModelCollision
Removed collision jittering effects
|
2016-03-11 10:48:25 +01:00 |
|
|
Adam Byléhn
|
56a13d03fc
|
Merge pull request #197 from teamfisk/SpectatorCamera
Properly unlocked mouse
|
2016-03-11 10:43:29 +01:00 |
|
|
Adam Byléhn
|
dad18a200f
|
Merge pull request #202 from teamfisk/Trigger
Triggersystem updated for the capturepoints
|
2016-03-11 10:38:20 +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 |
|
 FakeShemp
|
937bf823f3
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 21:59:23 +01:00 |
|
|
FakeShemp
|
e35b09cc68
|
Add alpha clipping
Tobbe sa att jag fick pusha direkt
|
2016-03-10 21:59:01 +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 |
|
 William Moberg
|
b172526e62
|
Merge pull request #199 from teamfisk/CapturePointTake
The children of the CapturePointModels now also get their visibility changed
|
2016-03-10 16:37:53 +01:00 |
|
|
viktorljung
|
0d2e8c1cbe
|
Merge branch 'master' into Movement
|
2016-03-10 16:31:45 +01:00 |
|
|
viktorljung
|
b3ea26779a
|
Added Unpickable component, which skips the entity in the PickingPass
|
2016-03-10 16:29:13 +01:00 |
|
|
Tleety
|
ab70aed840
|
WIP
|
2016-03-10 16:15:57 +01:00 |
|
|
verysecrethero
|
551745b0a6
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
|
2016-03-10 16:14:18 +01:00 |
|
|
William Moberg
|
d6e3a47182
|
Merge branch 'master' into Trigger
|
2016-03-10 16:14:17 +01:00 |
|
|
verysecrethero
|
8b89df0095
|
Changed to a better validator
|
2016-03-10 16:09:54 +01:00 |
|
|
viktorljung
|
59e487f9bb
|
PlayerDefenderBlue Updated blendtree
|
2016-03-10 16:05:46 +01:00 |
|
|
William Moberg
|
038a706e28
|
Don't collide against disabled (invisible) models. Triggers uses model vs. box instead of only box vs. box.
|
2016-03-10 16:05:30 +01:00 |
|
|
Tleety
|
f9808a61f7
|
Changed sprite text
|
2016-03-10 16:02:03 +01:00 |
|
|
Jocke
|
a8a4b5d2a2
|
Disconnect on udp
|
2016-03-10 15:59:55 +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 |
|
|
FakeShemp
|
b094b9feca
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 15:01:27 +01:00 |
|
|
Jocke
|
67dfbfff01
|
Fixed multiply connections
|
2016-03-10 14:44:06 +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 |
|
|
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 |
|
|
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 |
|