BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,434 Commits 116 Branches 0 Tags
cd315bbaa05bb022d36ae80bdacffd0eadd6b71d
Commit Graph

228 Commits

Author SHA1 Message Date
William Moberg 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
William Moberg 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
verysecrethero 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
Tobias Dahl 2609a0253d Merge pull request #129 from teamfisk/HUDDesync 
Networking improvements
 2016-02-24 15:22:01 +01:00
stiffly 7394436e7a Removed unnecessary comment. 2016-02-24 14:23:54 +01:00
verysecrethero 5af4f9d8e7 Removed a comment originating from HUDDesynch branch 2016-02-24 14:06:41 +01:00
verysecrethero af68236e71 now using a define INDICATOR_TEST to activate the DamageIndicatorSystem test. 2016-02-24 13:58:05 +01:00
verysecrethero e2831c5593 CapturePointSystem fix, DamageIndicatorSystem fix 2016-02-23 17:29:33 +01:00
stiffly c42e1e0967 SoundSystem Fix. Now subscribes to an event that was thought to be listened to. 2016-02-23 11:07:41 +01:00
stiffly e5ff88d3c9 SoundSystem bug fix 2016-02-22 17:41:14 +01:00
stiffly 833006744a WIP 2016-02-22 17:00:25 +01:00
stiffly 4c1a284636 Server now does Capture point logic too. 2016-02-22 11:30:31 +01:00
stiffly c7d31cac2d Merge remote-tracking branch 'origin/master' into FriendlyHost/Join 
# Conflicts:
#	src/Engine/Network/Client.cpp
 2016-02-22 10:19:48 +01:00
stiffly a1e932d261 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join 2016-02-22 10:06:51 +01:00
Jocke 68f2d5327d added extra check in HealthSystem 2016-02-19 16:37:26 +01:00
William Moberg 23bb1a6405 Cannot respawn inside other players, unless all are blocked. 2016-02-17 14:54:59 +01:00
Jocke a006db9e63 WIP Fix dsync 2016-02-16 16:06:17 +01:00
Jace 969e7cb0d5 Merge remote-tracking branch 'origin/FixNetworkToPlayTest' 2016-02-12 09:18:32 +01:00
Jace ca457d9c00 Player names 2016-02-12 09:07:59 +01:00
Jocke 2c3122bbdb increased Network buffer size, fixed 2 crashes and re-added the ability to kill oneself with the use of a key bound to TakeDamage,Value. 2016-02-12 08:39:20 +01:00
stiffly 1cdcbf9b32 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-02-12 08:19:29 +01:00
stiffly af39b892cd Now plays a "Empty sound", "reload sound" and "hit mark sound" on appropriate occasions. 2016-02-12 08:05:35 +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
Jace bb66f95d43 Enabled server broadcasting PlayerDamage events to other players to make damage indicators work 2016-02-12 07:03:14 +01:00
Jace cc422cf73a Fixed PlayerDeath being fired multiple times per frame on the server, causing multiple spawns and other weirdness 2016-02-12 06:30:19 +01:00
viktorljung f146971db0 Fixed size 2016-02-12 05:45:17 +01:00
viktorljung 60b2c9bc9b KillFeed 2016-02-12 05:41:05 +01:00
Tleety d357e365cb Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem 
# Conflicts:
#	include/Engine/Network/Server.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
 2016-02-12 05:21:00 +01:00
Tleety a8a3366e8a Hopeless attempts to fix network bugs 2016-02-12 05:17:09 +01:00
Jocke 7de76376cf Merge remote-tracking branch 'origin/master' into TCPConnections 
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp
 2016-02-12 05:16:30 +01:00
stiffly 1da432ba23 WIP sounds 2016-02-12 04:03:35 +01:00
Jace a15e01596a Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-02-12 02:47:12 +01:00
Tleety 4f7a17ff62 ColorFix 2016-02-12 02:38:36 +01:00
viktorljung 987dafb44a Fixed Health text color 2016-02-12 02:38:11 +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 1dc3756533 Fixed respawn crash when a player died that had never spawned 2016-02-12 02:23:13 +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
viktorljung 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
viktorljung fb5164221f HealthHUD redesigned 2016-02-12 01:57:53 +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
Jocke 3b42f5dbf4 Fixed server so it now deletes. 2016-02-12 01:33:45 +01:00
William Moberg 40ae2b8cbb DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem. 2016-02-12 00:52:58 +01:00
William Moberg f1c2413cf9 Respawning and team picking seems to be working well. 2016-02-12 00:39:27 +01:00
William Moberg 11af6a3078 Merge branch 'master' into Respawning 
# Conflicts:
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/MovementTest.xml
#	src/Game/Systems/SoundSystem.cpp
 2016-02-12 00:29:51 +01:00
viktorljung 0370775820 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	resources/Schema/Entities/Player.xml
 2016-02-12 00:28:24 +01:00
viktorljung a36ed76a4e AmmunitionHUDSystem now really working 2016-02-12 00:26:59 +01:00
verysecrethero 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