7dbb9e452b
Added a announcer volume channel.
2016-02-24 15:08:39 +01:00
feeff5b164
Debug tool for different CubeMap
...
changed cubemap influence.
2016-02-24 14:47:47 +01:00
cf3d1b5b00
Changed the default reference distance for emitters. Should be heard all over the map
2016-02-24 14:19:38 +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
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
27669b7383
Merge remote-tracking branch 'origin/master' into HUDDesync
2016-02-23 11:09:44 +01:00
fb80d088e4
Redid many a thing for the sake of efficiency
2016-02-23 10:06:21 +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
127edb4e60
Fixed some memory leaks
2016-02-22 17:47:30 +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
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
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
3c9c95cff4
Animation blending improved and Animation Override added
2016-02-18 16:34:18 +01:00
b81bb9eeea
Changed SprintAbility to take StrengthOfEffect. PlayerMovementSystem: if Sniper is sprinting he will now move faster.
2016-02-18 15:17:19 +01:00
b2304a95f8
Fixed some XML documentation
2016-02-18 13:49:22 +01:00
7f489b3569
Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage.
2016-02-18 10:40:09 +01:00
178402e964
cascade shadow wip
2016-02-18 10:08:29 +01:00
c3ed429377
Added BoostSystem, Added BoostAssault entity XML
2016-02-17 18:11:36 +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
56bc1fee3d
Added LifeTimeOfEffect in BoostAssault,BoostDefender components.
2016-02-17 16:43:38 +01:00
1c9a1a9904
playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted.
2016-02-17 16:04:44 +01:00
debb1881bf
BoneAttachment working
2016-02-17 15:48:45 +01:00
e8aff02c4e
Merge remote-tracking branch 'origin/master' into AssaultBoost
2016-02-17 14:58:28 +01:00
db8bc612bd
AdditiveBlend now working, needs cleanup
2016-02-17 14:55:02 +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
f7303ad787
Merge remote-tracking branch 'origin/master' into AssaultBoost
2016-02-17 14:38:04 +01:00
3e4b87da7c
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 14:32:59 +01:00
stiffly
Tleety
viktorljung
FakeShemp
Teejoon
William Moberg
Jace
verysecrethero