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
b8222c7b2e
The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml
2016-02-17 14:54:42 +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
8f28c760dd
You can now AssaultDash in the air
2016-02-17 11:47:10 +01:00
b13362360a
Fixed RespawnModel of Pickups
2016-02-17 11:22:42 +01:00
Jace
47a365a8fc
Inverted capture point numbers to fix HUD
2016-02-12 09:17:39 +01:00
Jace
0a31fa3dfd
Merge branch 'master' of github.com:teamfisk/TacticalZ
2016-02-12 09:08:17 +01:00
Jace
ca457d9c00
Player names
2016-02-12 09:07:59 +01:00
a08e54a147
Blocked up a path in the Spawns a bit more.
2016-02-12 08:44:40 +01:00
ba4877c3f7
Moved Spawn locations and added ammo/health pickups around the map.
2016-02-12 08:16:12 +01:00
2ce7179d19
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-02-12 07:49:58 +01:00
Jace
b48d491ad7
Complete blue and red player entities
2016-02-12 07:45:51 +01:00
Jace
47f4711b85
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 07:18:20 +01:00
60b2c9bc9b
KillFeed
2016-02-12 05:41:05 +01:00
f49cacf167
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-02-12 02:47:50 +01:00
a5168bd1c2
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-02-12 02:46:52 +01:00
784e1eb69b
Changed Colors on some materials and changed bridges to red and blue bridges.
2016-02-12 02:46:44 +01:00
Jace
b5e372896f
Added spawner?
2016-02-12 02:46:42 +01:00
Jace
a54156fab3
Added HUD elements to player
2016-02-12 02:46:16 +01:00
Jace
47053285c8
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
2016-02-12 02:30:38 +01:00
Jace
b9ea314232
Merge remote-tracking branch 'origin/master' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-12 02:11:11 +01:00
Jace
71533b52ae
Map fix
2016-02-12 02:10:42 +01:00
6442254575
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# src/Game/Game.cpp
2016-02-12 02:09:14 +01:00
Jace
9f8b0f7aa9
Merge pull request #104 from teamfisk/AmmoPickup
...
Added AmmoPickupSystem with Component, Entity.
2016-02-12 02:08:29 +01:00
021c4e36d7
New HUD XML files
2016-02-12 02:08:24 +01:00
2417175914
New Map with Meshes WIP. Probably final for Playtest.
2016-02-12 02:06:52 +01:00
fb5164221f
HealthHUD redesigned
2016-02-12 01:57:53 +01:00
Jace
88c7c57671
Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-12 01:46:45 +01:00
Jace
5295133311
Hack to sync ammo over network until we have input replaying + Reload effect from all views
2016-02-12 01:45:54 +01:00
baff8301b3
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-12 01:43:52 +01:00
3e42c067ab
New Map with meshes WIP Update.
2016-02-12 01:43:20 +01:00
0370775820
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-02-12 00:28:24 +01:00
a36ed76a4e
AmmunitionHUDSystem now really working
2016-02-12 00:26:59 +01:00
af30e51564
Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.
2016-02-11 23:56:40 +01:00
Jace
30f454e6a4
Entity fixes
2016-02-11 23:50:57 +01:00
648d864d6e
Merge remote-tracking branch 'origin/master' into Animations
2016-02-11 23:48:30 +01:00
c1860ae383
AmmunitionHUD now working
2016-02-11 23:38:25 +01:00
Jace
c4c53944d9
Merge pull request #103 from teamfisk/WeaponSystem
...
Working weapon system
2016-02-11 23:16:44 +01:00
Jace
7cae84d4ee
Merge remote-tracking branch 'origin/master' into WeaponSystem
...
# Conflicts:
# include/Engine/Core/EPlayerDamage.h
# src/Game/Game.cpp
# src/Game/Systems/Weapon/WeaponSystem.cpp
2016-02-11 22:52:51 +01:00
4964e732ca
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 22:51:52 +01:00
Jace
d1213f9f59
Working damage dealing, a super cool reload effect and hit markers!
2016-02-11 22:50:44 +01:00
5bcadd5b1a
Merge pull request #95 from teamfisk/CapturePointTake
...
Fixed CapturePointTimer,Color
2016-02-11 21:10:30 +01:00
8f500965d4
Changed DamageIndicator.xml to not use a glowmap and not a depthsort.
2016-02-11 20:34:25 +01:00
2096779eb6
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 18:48:21 +01:00
1d14094e90
NewMap Updated. Still WIP
2016-02-11 16:52:10 +01:00
3301f66ad1
Merge remote-tracking branch 'origin/master' into DamageIndicator
...
# Conflicts:
# resources/Shaders/Sprite.vert.glsl
2016-02-11 16:36:48 +01:00
c9f815fd42
Merge remote-tracking branch 'origin/master' into CapturePointTake
...
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
2016-02-11 16:09:05 +01:00
38a3e88999
Merge pull request #87 from teamfisk/DoubleJumpEffect
...
Spawned DoubleJumpHexagon as the player doublejumps
2016-02-11 16:00:09 +01:00
4e23e7bf30
misc changes do the DoubleJumpHexagon.xml
2016-02-11 15:58:58 +01:00
a8ab49f202
Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
...
# Conflicts:
# include/Game/Systems/PlayerMovementSystem.h
2016-02-11 15:19:01 +01:00
Teejoon
verysecrethero
Jace
antc13
viktorljung
Tobias Dahl