fad93ca5aa
Merge remote-tracking branch 'origin/master' into RendererBugFixes
...
Conflicts:
include/Engine/Rendering/DrawFinalPass.h
2016-03-09 16:54:26 +01:00
91cad561a4
Some more optimization and fixed sorting of render job objects in RenderSystem
2016-03-09 16:51:24 +01:00
d51bea798a
Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes
2016-03-08 16:20:23 +01:00
e902110d4b
Commiting the files since they didn't get commited
2016-03-08 11:16:56 +01:00
01f29b6d4e
Blur behind buttons/sprites should now be working as intended.
2016-03-08 11:14:09 +01:00
6b7f598c4d
WIP
2016-03-07 23:35:58 +01:00
5c0d9070c7
WIP
2016-03-07 23:25:06 +01:00
fd994ca93d
Deleting texture thats getting rended too.
2016-03-07 17:52:47 +01:00
7ba0e4ea9d
Run, Strafe and jump animations now playing
2016-03-04 08:35:02 +01:00
1ff91a5c5d
fixup! Blend duration can now be 0.0
...
Commited input test stuff
2016-03-04 02:30:05 +01:00
49802fed91
Blend duration can now be 0.0
2016-03-04 02:24:13 +01:00
1616fb20d1
Skinned meshes now in T-Pose when not it's blendtree is null
2016-03-04 02:03:50 +01:00
bebdacabb4
Clean up
2016-03-03 23:41:08 +01:00
e3fbd2082c
BlendQueues fully working
2016-03-03 23:20:13 +01:00
a3494b92c8
Blending queues now working
2016-03-03 17:48:25 +01:00
362378536e
Switching rooms
2016-03-03 01:39:12 +01:00
1aefa1dec6
AutoAnimationBlend now working correctly for unique nodes
2016-03-02 17:06:51 +01:00
8422742a9e
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-03-02 13:50:08 +01:00
07ccb9c041
AutoAnimationBlend on unique node working but scale is not working correctly
2016-03-02 13:30:04 +01:00
de9657700b
Fixed draw final pass with shided objects having to many if-statments.
...
Shields is working with transparancy
Player cameras should have nearclip fater away and far clip nearer.
Defaultconfig push
2016-03-02 11:59:48 +01:00
ef66f3ebe5
Transparancy with shild fix
2016-03-01 23:14:23 +01:00
5bc0483f49
Removed AnimationOffset and improved BlendTree
2016-02-29 15:51:37 +01:00
df7ace6626
We only uses one depth buffer now
2016-02-29 11:44:29 +01:00
9cbc6f7755
Added GenerateTexture, GenerateMipMapTexture and DeleteTexture to CommonFunctions
2016-02-28 16:16:22 +01:00
d3a245606a
SSAO and Glow is no longe conflicting with each other.
...
Texture should get the id = 0 when they are deleted and not assigned a new texture after. Else they will start to conflict with each other.
2016-02-28 15:02:40 +01:00
b320d8d1e4
WIP
2016-02-26 18:01:38 +01:00
b3038ef713
Includes are now supported in shader with the key #GLSL
2016-02-26 16:33:55 +01:00
62e22d3821
Fix
2016-02-26 13:32:16 +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
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
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
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
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
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
722b795d37
Fixed spelling
2016-02-19 13:30:41 +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
Teejoon
Tleety
viktorljung
Jace