 Teejoon
|
ec7ab417e6
|
Added so that mipmaps can have diferant formats. Bloom also uses RGB8 on all texture now
|
2016-03-13 01:47:37 +01:00 |
|
|
Teejoon
|
2e89227061
|
Merge remote-tracking branch 'origin/master' into MSAA
|
2016-03-13 00:09:07 +01:00 |
|
|
Teejoon
|
958850903a
|
Moved ViewSpacePosition calculation from fragmenst shader to vertexshader
|
2016-03-13 00:08:49 +01:00 |
|
 Jace
|
7ea90bede7
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-12 23:49:44 +01:00 |
|
|
Jace
|
2bfbd72189
|
EntityWrapper::Clone should no longer cause freezes
|
2016-03-12 23:44:28 +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 |
|
|
Teejoon
|
5146d21173
|
MSAA is now working
|
2016-03-12 22:22:53 +01:00 |
|
|
Teejoon
|
70b0ca8776
|
Merge remote-tracking branch 'origin/master' into MSAA
|
2016-03-12 18:04:26 +01:00 |
|
|
Teejoon
|
90d848e8d9
|
Made texture getters from draw finalpass from const
|
2016-03-12 18:04:10 +01:00 |
|
|
Jace
|
ce0d3b9fbe
|
Fixed texture freeing. Destructor was never called because base destructors weren't virtual.
|
2016-03-12 17:53:34 +01:00 |
|
 stiffly
|
cc10e5500b
|
2x jump now only plays for local player
|
2016-03-12 15:31:44 +01:00 |
|
|
Jace
|
068e151741
|
Merge pull request #173 from teamfisk/ExplosionEffectV2
Explosion effect v2
|
2016-03-12 15:25:12 +01:00 |
|
|
stiffly
|
9bac141a6b
|
WIP fixing pull request
|
2016-03-12 15:14:36 +01:00 |
|
|
stiffly
|
9942747d41
|
WIP pull request fixes
|
2016-03-12 14:26:09 +01:00 |
|
|
stiffly
|
28d576bfc0
|
Now the bgm should loop again.
|
2016-03-11 21:04:33 +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 |
|
|
Teejoon
|
1ad087dc75
|
MSAA mostly working. Only merging the MS render buffer to a single texture so that others could use the AA texture easly
|
2016-03-11 19:05:34 +01:00 |
|
|
stiffly
|
157a54e845
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
|
2016-03-11 18:19:22 +01:00 |
|
|
Tleety
|
7759af2c5a
|
Log remove
|
2016-03-11 15:52:47 +01:00 |
|
|
Tobias Dahl
|
2f61171d16
|
Merge pull request #185 from teamfisk/TextColor
Text that handles color, alpha and icon parsing
|
2016-03-11 15:25:06 +01:00 |
|
|
Tleety
|
26337ff243
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 15:07:52 +01:00 |
|
|
Tleety
|
0ca627eb8b
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 14:57:59 +01:00 |
|
|
Tobias Dahl
|
530c0fd9b0
|
Merge pull request #204 from teamfisk/RendererBugFixes
Getting ShaderID fewer times
|
2016-03-11 14:57:36 +01:00 |
|
 William Moberg
|
f036817c0c
|
Merge pull request #203 from teamfisk/SplitSnapshots
Split snapshots
|
2016-03-11 14:35:18 +01:00 |
|
 Jocke
|
06bddd9d54
|
Fixed requests.
|
2016-03-11 14:07:03 +01:00 |
|
|
Jocke
|
5f959ded89
|
Did changes upon pull request's request.
|
2016-03-11 12:54:59 +01:00 |
|
|
Jocke
|
0fbc482f9c
|
Changed getters to return reinterpret_casted data.
|
2016-03-11 12:22:55 +01:00 |
|
|
Jocke
|
2eb863757b
|
renamed variabels
|
2016-03-11 11:55:16 +01:00 |
|
|
Teejoon
|
cac0522ae7
|
Fixed glow on window resize
|
2016-03-11 11:41:02 +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 |
|
|
Tleety
|
ab70aed840
|
WIP
|
2016-03-10 16:15:57 +01:00 |
|
|
William Moberg
|
d6e3a47182
|
Merge branch 'master' into Trigger
|
2016-03-10 16:14:17 +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 |
|
|
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 |
|
|
William Moberg
|
c9fef65c4f
|
Merge pull request #198 from teamfisk/Menu
Menu
|
2016-03-10 15:38:06 +01:00 |
|