0908be1e02
Shadows are pretty much done.
2016-02-29 19:45:56 +01:00
2ed5fad699
The shadows are working
2016-02-29 19:17:16 +01:00
70374fa10e
It compiles, but no shadows
2016-02-29 18:20:32 +01:00
20468cba1b
Merge branch 'master' into Shadows
...
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
2016-02-29 18:03:00 +01:00
7749fc5474
Small fixing up
2016-02-28 19:46:50 +01:00
6dd7f1a657
Buggy transparent shadows.
...
Transparent textures might glow.
2016-02-28 18:00:23 +01:00
14b0a64720
begin fixing transparent object's shadows
2016-02-27 18:42:51 +01:00
8647267cad
Make code less dumb, save 7 fps
2016-02-27 18:04:33 +01:00
ecab5de056
Various shadow calculation methods implemented and ready for use.
2016-02-27 16:35:15 +01:00
38d8cdded2
Texture Array is now working. Enjoy your single Bind().
2016-02-27 15:53:28 +01:00
22c391df54
Initial work on texture arrays
2016-02-26 17:40:35 +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
89d0d5753f
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
2016-02-25 16:16:24 +01:00
da1c7b3093
Merge pull request #133 from teamfisk/AndersTest
...
Ammo,HealthPickup now takes in account for possible parenting/childin…
2016-02-25 09:58:14 +01:00
ef87102d1f
Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling
2016-02-24 17:53:37 +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
2609a0253d
Merge pull request #129 from teamfisk/HUDDesync
...
Networking improvements
2016-02-24 15:22:01 +01:00
feeff5b164
Debug tool for different CubeMap
...
changed cubemap influence.
2016-02-24 14:47:47 +01:00
607e83134d
Cubemaps working
2016-02-24 14:16:49 +01:00
6f9ce8a0c1
WIP
2016-02-24 13:57:54 +01:00
8d23c531af
Cubemaps kinda functioning, still somthing wierd with the vectors.
2016-02-23 17:17:50 +01:00
91b0ac5fbd
Some groundwork for cubemaps.
2016-02-23 16:00:43 +01:00
27669b7383
Merge remote-tracking branch 'origin/master' into HUDDesync
2016-02-23 11:09:44 +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
fe3e0bac5b
Changed SpritIndicator values on player
2016-02-22 18:45:02 +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
833006744a
WIP
2016-02-22 17:00:25 +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
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
4c87ca10b9
Merge branch 'master' into BoxModelCollision
2016-02-19 14:17:17 +01:00
22664848dc
You should not be able to fall through ground or dash thru walls. Very thin objects may still be possible to go through, e.g. the grid border walls in GameMap.xml.
2016-02-19 14:16:22 +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
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
178402e964
cascade shadow wip
2016-02-18 10:08:29 +01:00
c4d3c515e4
Marge with Master
2016-02-17 18:04:49 +01:00
7cc58dc94c
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates
2016-02-17 18:00:30 +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
8845054965
Merge remote-tracking branch 'origin/master' into PerformanceTiming
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 16:59:26 +01:00
7dfd68467e
Merge branch 'Menu-Tobias' into ResolutionChange
2016-02-17 16:54:06 +01:00
4fd0108443
Working billbording
2016-02-17 16:50:24 +01:00
b8222c7b2e
The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml
2016-02-17 14:54:42 +01:00
FakeShemp
William Moberg
verysecrethero
Tleety
stiffly
Teejoon
Jace