22c391df54
Initial work on texture arrays
2016-02-26 17:40:35 +01:00
b3038ef713
Includes are now supported in shader with the key #GLSL
2016-02-26 16:33:55 +01:00
0805375483
Deleted SSAO sliders except Quality
2016-02-26 13:25:19 +01:00
f56705d921
You can now change the quality of SSAO by sliding the SSAO Quality
2016-02-26 11:51:20 +01:00
f220d8088c
Begin clean-up
2016-02-26 10:53:16 +01:00
5c3b472a4d
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Engine/Rendering/Skeleton.cpp
2016-02-26 10:21:22 +01:00
af034673f6
BoneAttachments now working and BlendTrees are created in the AnimationSystem
2016-02-26 10:17:47 +01:00
df2e4abb52
WE HAVE WORKING CASCADE SHADOWS
2016-02-25 21:21:38 +01:00
8867e7ac3c
Working shadows, no cascade blend yet
2016-02-25 20:29:41 +01:00
Jace
0343683678
Fixed cubemaps being generated over and over again each frame.
2016-02-25 17:51:40 +01:00
c97d0d9381
Fixed memory leaks and cleaned up Skeleton and BlendTree
2016-02-25 11:30:09 +01:00
fc18932068
Merge remote-tracking branch 'origin/master' into CubeMap
...
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
2016-02-24 15:45:30 +01:00
b874ea8641
Merge pull request #131 from teamfisk/ResizeWindowFixFromSSAOMerge
...
Have fix the resizing errors
2016-02-24 15:22:12 +01:00
feeff5b164
Debug tool for different CubeMap
...
changed cubemap influence.
2016-02-24 14:47:47 +01:00
6f9ce8a0c1
WIP
2016-02-24 13:57:54 +01:00
6465fe6ed6
Have fix the resizing errors
2016-02-24 13:22:41 +01:00
8d23c531af
Cubemaps kinda functioning, still somthing wierd with the vectors.
2016-02-23 17:17:50 +01:00
606a9bf94f
BlendTree now working but has some memory leaks
2016-02-23 17:06:41 +01:00
91b0ac5fbd
Some groundwork for cubemaps.
2016-02-23 16:00:43 +01:00
4ffb03fdd5
Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-23 10:02:53 +01:00
fa4f007604
Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one
2016-02-22 18:35:00 +01:00
127edb4e60
Fixed some memory leaks
2016-02-22 17:47:30 +01:00
6fab971734
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates
...
Conflicts:
include/Engine/Rendering/SpriteJob.h
resources/Schema/Components.xsd
resources/Schema/Entities/Player.xml
resources/Schema/Entities/PlayerRed.xml
2016-02-22 16:43:18 +01:00
09aec08d0e
Pull request fixes
2016-02-22 16:38:20 +01:00
abd36c81f8
Added BlendTree that stores and blends multiple animations
2016-02-22 15:58:38 +01:00
4cf8c3d8d7
Fixed PerformanceTimer start and stop in Renderer.cpp since I have changed a little code there
2016-02-22 15:02:20 +01:00
37414ce124
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO
...
Conflicts:
include/Engine/Rendering/Renderer.h
src/Engine/Rendering/Renderer.cpp
2016-02-22 14:51:42 +01:00
adceccf402
SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once.
...
Changed so that the picking pass get drawn once in the beginning so that the AO shatde could calculate AO from the depthbuffer generated during pthe pickingpass.
In the ImGUI debugg window there is now sliders to change the behavior of the AO shader. Only the minimum ambient lightning is HardCoded in to the frowardPlus fragmentshaders with a define in the begining.
2016-02-22 14:48:20 +01:00
201480b17f
SSAO is working, but is kinda crappy. You can change shade variables in the debug window.
2016-02-19 16:50:04 +01:00
97fcdb342d
Bloom should now show behind transparent objects.
2016-02-19 14:23:40 +01:00
d135ea2da6
Small fix
2016-02-19 13:53:43 +01:00
949ee76f55
Fallow and name fix
2016-02-19 13:52:16 +01:00
cf2bf4e14d
Merge remote-tracking branch 'origin/master' into ResolutionChange
2016-02-19 13:17:31 +01:00
Jace
2ac584bafb
Merge pull request #113 from teamfisk/Menu-Tobias
...
Menu tobias
2016-02-19 13:16:50 +01:00
fc5d054cb2
Entity is now sent with the click events.
...
Fixed small things
2016-02-19 12:49:07 +01:00
8c9f4bb84b
Resize should now be working correctly.
2016-02-19 11:42:52 +01:00
73a4336206
Try some stuff
2016-02-18 23:33:10 +01:00
f2ab02d860
More WIP
...
Switching between levels seem to work, but I borked all matrices
2016-02-18 22:38:50 +01:00
bf376f54b6
WIP
...
I think this is now finding the different segments of the cascade
2016-02-18 20:48:39 +01:00
e15a7b9485
You can now change resolution without any apparent bugs.
2016-02-18 18:00:26 +01:00
3c9c95cff4
Animation blending improved and Animation Override added
2016-02-18 16:34:18 +01:00
178402e964
cascade shadow wip
2016-02-18 10:08:29 +01:00
5e3af7ac5d
Player Indicator now working OK. Scaling depending on how far away you are makes the Indicator to hide players head behind it. Shields are making indicators to disappear.
2016-02-17 17:58:01 +01:00
3e7936ef00
You can now change resolution by pressing buttons.
2016-02-17 17:44:33 +01:00
4fd0108443
Working billbording
2016-02-17 16:50:24 +01:00
debb1881bf
BoneAttachment working
2016-02-17 15:48:45 +01:00
db8bc612bd
AdditiveBlend now working, needs cleanup
2016-02-17 14:55:02 +01:00
e7118ce8e5
WIP
2016-02-17 10:52:50 +01:00
42b49f9dba
Added more timers to Rendering.
2016-02-16 17:51:39 +01:00
8f84a5ddd6
Buttons are now clickable
2016-02-16 16:28:19 +01:00
FakeShemp
Tleety
Teejoon
viktorljung
Jace
verysecrethero