8740e8b77a
experimental fix for pickup
2016-02-25 15:23:00 +01:00
bc227c3d61
Merge remote-tracking branch 'origin/master' into AndersTestNetwork
...
# Conflicts:
# include/Game/Systems/DamageIndicatorSystem.h
# src/Game/Systems/DamageIndicatorSystem.cpp
# src/Game/Systems/SoundSystem.cpp
2016-02-25 10:30:35 +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
cca237b33f
miscellaneous tests
2016-02-24 17:43:24 +01:00
2609a0253d
Merge pull request #129 from teamfisk/HUDDesync
...
Networking improvements
2016-02-24 15:22:01 +01:00
27669b7383
Merge remote-tracking branch 'origin/master' into HUDDesync
2016-02-23 11:09:44 +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
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
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
e15a7b9485
You can now change resolution without any apparent bugs.
2016-02-18 18:00:26 +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
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
833015f45e
Small code cleanup for PerformanceTimer
2016-02-17 13:44:41 +01:00
657125b469
Moved menu code into GUI
...
Button events are now sent when you click.
2016-02-17 13:44:11 +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
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
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
verysecrethero
William Moberg
Tobias Dahl
stiffly
Teejoon
Jace
antc13
viktorljung