e6b3bbeb54
Merge remote-tracking branch 'origin/master' into Respawning
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-03-02 17:50:59 +01:00
01def459a1
Merge pull request #159 from teamfisk/FloatingEffect
...
Added a FloatingEffectSystem to the game.
2016-03-02 17:49:25 +01:00
7d15313209
Added a FloatingEffectSystem to the game. Pickups now move up and down, if so desired.
2016-03-02 17:22:44 +01:00
92d5ec70ba
Merge remote-tracking branch 'origin/master' into DashAbiltyEffect
2016-03-02 16:57:07 +01:00
4ef76f6c45
Merge branch 'master' into Respawning
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-03-02 16:51:24 +01:00
f8f4b4d939
Merge pull request #151 from teamfisk/CPArrow
...
CapturePoint indicator HUD
2016-03-02 16:48:52 +01:00
a5c086e389
Dash effect now working over network, by sending events. Similar to jump effect.
2016-03-02 16:48:38 +01:00
91dbbb9c11
Merge branch 'master' into Respawning
2016-03-02 16:47:55 +01:00
dc10661e6b
Respawn time now only displays numbers, centered below CPHUD.
2016-03-02 16:45:43 +01:00
3c8df35be9
Merge remote-tracking branch 'origin/master' into AssaultBoost
...
# Conflicts:
# src/Game/Game.cpp
2016-03-02 15:59:16 +01:00
1217b25d02
DashEffect will now spawn a player model behind the player that will fade out .
2016-03-02 14:15:20 +01:00
a2b938d8f6
Merge branch 'master' into CPArrow
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerRed.xml
2016-03-02 13:58:44 +01:00
ab7fd89546
Should now correctly track if another player takes your last capture point
2016-03-02 13:56:35 +01:00
06d60f9884
Merge branch 'master' into Respawning
2016-03-02 13:47:03 +01:00
629ebb871f
SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work.
2016-03-02 13:45:49 +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
96768e66de
Redplayer arrow fix
2016-03-02 09:57:41 +01:00
799990f44d
Next CP indicator should now be fully working.
2016-03-01 22:54:13 +01:00
6281e20000
Arrow should now track the CapturePoint specified in the Component.
2016-03-01 20:31:09 +01:00
a9762f44ca
Merge branch 'master' into Respawning
2016-03-01 17:34:23 +01:00
3d4427dd20
Added entity SpectatorCamera that shows respawntime, will activate when explosion effect is deleted.
2016-03-01 17:32:14 +01:00
77eaa45702
Merge remote-tracking branch 'origin/master' into HEAD
...
Conflicts:
src/Engine/Rendering/CubeMapPass.cpp
src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:11:27 +01:00
c7dad79e72
Merge branch 'master' into JumpHeightAdjustment
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerRed.xml
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-29 17:28:40 +01:00
Jace
bb76c9d248
WIP multi-weapon behaviours
2016-02-29 06:58:57 +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
cd315bbaa0
Added DoubleJump component and JumpSpeed in Player component so jumpheight can be adjusted for regular jump and double jump.
2016-02-25 12:12:44 +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
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
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
c3ed429377
Added BoostSystem, Added BoostAssault entity XML
2016-02-17 18:11:36 +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
1c9a1a9904
playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted.
2016-02-17 16:04:44 +01:00
e8aff02c4e
Merge remote-tracking branch 'origin/master' into AssaultBoost
2016-02-17 14:58:28 +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
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
William Moberg
Tobias Dahl
antc13
stiffly
Joachim Pettersson
verysecrethero
Teejoon
Jace