 Tleety
|
8bd38bc465
|
Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu
|
2016-03-11 13:00:43 +01:00 |
|
|
Tleety
|
8ceaae995d
|
Options menu started working on
|
2016-03-11 13:00:34 +01:00 |
|
 Teejoon
|
91aedcbb14
|
Merge branch 'Menu' of https://github.com/teamfisk/TacticalZ into Menu
|
2016-03-11 11:41:11 +01:00 |
|
|
Teejoon
|
cac0522ae7
|
Fixed glow on window resize
|
2016-03-11 11:41:02 +01:00 |
|
|
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 |
|
|
Teejoon
|
e96ad44e44
|
BlurHUDPass now works correct when resizing window.
|
2016-03-11 11:23:23 +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 |
|
 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 |
|
|
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 |
|
|
verysecrethero
|
8b89df0095
|
Changed to a better validator
|
2016-03-10 16:09:54 +01:00 |
|
|
Tleety
|
f9808a61f7
|
Changed sprite text
|
2016-03-10 16:02:03 +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 |
|
|
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 |
|
|
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 |
|
|
Tleety
|
592edf7dba
|
Sprites can now be rendered with the texture ratio in mind
|
2016-03-09 23:31:54 +01:00 |
|
|
Jace
|
012420b4da
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-09 23:07:44 +01:00 |
|
|
viktorljung
|
3a213be679
|
Picking on animated models fixed
|
2016-03-09 23:06:53 +01:00 |
|
|
Jace
|
50b0a091ec
|
Fixed editor widgets to take scale of the entity into account when they're moved
|
2016-03-09 22:45:55 +01:00 |
|
|
viktorljung
|
4e6ff16e58
|
Shadows for animated models and removed spam in console
|
2016-03-09 22:43:04 +01:00 |
|
|
Tleety
|
087facc22e
|
Textures are now able to keep their scale even though the sprite is scaled.
|
2016-03-09 22:22:32 +01:00 |
|
|
Jace
|
727b6ba871
|
Fixed Transform::AbsolutePosition to take scale into account properly maybe?
|
2016-03-09 22:04:13 +01:00 |
|
|
Tleety
|
f9935cad42
|
Merge branch 'master' into Menu
|
2016-03-09 21:07:40 +01:00 |
|
|
Jace
|
e11cdaa662
|
Removed forced player color on spawn
|
2016-03-09 20:11:07 +01:00 |
|
|
Tobias Dahl
|
d393f9ade1
|
Merge pull request #180 from teamfisk/Shadows
Shadows
|
2016-03-09 19:55:41 +01:00 |
|
 FakeShemp
|
e25c9ee690
|
Merge remote-tracking branch 'origin/master' into Shadows
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.vert.glsl
# resources/Shaders/ForwardPlusSkinned.vert.glsl
# src/Engine/Rendering/Renderer.cpp
|
2016-03-09 19:38:55 +01:00 |
|
|
Tleety
|
90b2c70215
|
Some sprite fixes
|
2016-03-09 19:12:06 +01:00 |
|
|
Jace
|
fce6e90f3c
|
First person assault weapon idle animation now correct
|
2016-03-09 19:07:02 +01:00 |
|
 antc13
|
07d85bacf6
|
Added file extension to CP_Rocky2 & moved spawn points on the Y axis.
|
2016-03-09 18:57:45 +01:00 |
|
|
antc13
|
15c1b238ef
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-09 18:46:43 +01:00 |
|