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

1044 Commits

Author SHA1 Message Date
Jace b7a7f7fd5e ???? 2016-03-04 15:02:01 +01:00
Jace e58b5ffd6f Merge remote-tracking branch 'origin/Movement' into Weapons 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-03-04 09:43:34 +01:00
viktorljung 7ba0e4ea9d Run, Strafe and jump animations now playing 2016-03-04 08:35:02 +01:00
Jocke d78a7e20e2 Merge branch 'master' into Weapons 2016-03-04 08:29:33 +01:00
Jocke eec40b6519 We can now read larger packets than 65536 bytes in TCPClient::readBuffer() 2016-03-04 05:10:18 +01:00
Joachim Pettersson e6472b9745 Merge pull request #170 from teamfisk/ScoreBoard 
I Hope To God That This Works.
 2016-03-04 04:03:46 +01:00
Jace 609f6619a6 Merge remote-tracking branch 'origin/Animations' into Weapons 2016-03-04 03:04:36 +01:00
viktorljung 1bd71931b8 Fixed crash when trying to blend to a nonexistent node 2016-03-04 02:53:23 +01:00
Jace 608e339172 Merge remote-tracking branch 'origin/Animations' into Weapons 2016-03-04 02:48:41 +01:00
viktorljung 1ff91a5c5d fixup! Blend duration can now be 0.0 
Commited input test stuff
 2016-03-04 02:30:05 +01:00
viktorljung 49802fed91 Blend duration can now be 0.0 2016-03-04 02:24:13 +01:00
viktorljung 1616fb20d1 Skinned meshes now in T-Pose when not it's blendtree is null 2016-03-04 02:03:50 +01:00
Tleety fe7c1dd808 Merge remote-tracking branch 'origin/DeathEventUsesPlayerID' into ScoreBoard 
# Conflicts:
#	include/Engine/Network/Server.h
 2016-03-03 23:56:57 +01:00
Jace 4dd46e2e21 Merge branch 'master' into Weapons 2016-03-03 23:46:46 +01:00
stiffly 2167b6f7b1 Fix for previous commit.. 2016-03-03 23:43:50 +01:00
viktorljung bebdacabb4 Clean up 2016-03-03 23:41:08 +01:00
viktorljung 66c8a17b17 Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-03 23:21:14 +01:00
viktorljung e3fbd2082c BlendQueues fully working 2016-03-03 23:20:13 +01:00
Tleety 0a21fe15dd Merge remote-tracking branch 'origin/master' into ScoreBoard 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
 2016-03-03 22:56:39 +01:00
stiffly 714665f0a3 Updated the PlayerID getter in Server.cpp. 2016-03-03 22:55:12 +01:00
stiffly 8466a282b7 The server will now parse a death event and pass it forward with a KillDeath event to the score system. 2016-03-03 22:48:42 +01:00
viktorljung 68332102ea Can now blend non unique nodes 2016-03-03 21:20:55 +01:00
Tleety 00c585de3c Score should now track to all clients 2016-03-03 20:45:16 +01:00
Jace cbb2ec2fd6 Unique ids for entity nodes in the editor to prevent weird behaviour when multiple entities have the same name 2016-03-03 20:43:28 +01:00
Jace eba296196c Merge remote-tracking branch 'origin/master' into Weapons 
# Conflicts:
#	src/Game/Game.cpp
 2016-03-03 20:05:10 +01:00
Jace e55a399bad Merge pull request #165 from teamfisk/PickClassCamera 
Pick class camera
 2016-03-03 18:41:04 +01:00
Jocke 7943fc7ad6 Hot fix: Infinite loop when a player disconnected from the server. 2016-03-03 18:14:33 +01:00
viktorljung a3494b92c8 Blending queues now working 2016-03-03 17:48:25 +01:00
William Moberg 98366ec038 PickClass used for class-picking, SwapToClassPick to swap camera. 2016-03-03 16:59:17 +01:00
William Moberg 398bc725b6 When pick class buttons are clicked they send an InputCommand, not an ButtonClicked event. 2016-03-03 16:32:24 +01:00
Tleety 8b86c73ecc Merge remote-tracking branch 'origin/FixNetworkBugs' into ScoreBoard 2016-03-03 15:49:15 +01:00
Tleety c125f8c5f5 Merge branch 'master' into ScoreBoard 2016-03-03 15:18:46 +01:00
stiffly a7bff92899 The readBuffer now checks if the whole packet has arrived before attempting to parse it. 2016-03-03 15:16:42 +01:00
Tobias Dahl 73b8bff1f3 Revert "Shadows" 2016-03-03 14:24:43 +01:00
Tleety ed1d203c72 Merge branch 'master' into ScoreBoard 2016-03-03 14:07:44 +01:00
Tobias Dahl 1deb506fb2 Merge pull request #145 from teamfisk/Shadows 
Shadows
 2016-03-03 14:06:48 +01:00
viktorljung 8957b0b464 Merge remote-tracking branch 'origin/master' into Animations 2016-03-03 14:05:43 +01:00
Jocke ae3cab6cd1 Merge remote-tracking branch 'origin/master' into FixNetworkBugs 2016-03-03 13:31:43 +01:00
Jocke a9b19d9af1 Packet write now only warns when a a packet is huge 2016-03-03 13:29:45 +01:00
Tleety 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Game.cpp
 2016-03-03 13:22:28 +01:00
Jocke cb7beae28c Only do physics and collision calculations on the clients side, and only for their own entity. 2016-03-03 11:39:00 +01:00
Tleety ff6e2167d4 Some new events and changes to ScoreSystem 2016-03-03 11:25:06 +01:00
FakeShemp 7ea26d10ee Rewritten. Works as a charm now. 2016-03-03 03:28:21 +01:00
FakeShemp 28e9ba1208 Merge branch 'master' into Shadows 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp
 2016-03-03 03:00:05 +01:00
viktorljung 362378536e Switching rooms 2016-03-03 01:39:12 +01:00
Jace 0e8b97dbba Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value! 2016-03-03 01:35:32 +01:00
Jace 13546aa3fc DefenderWeapon and SidearmWeapon 2016-03-03 01:13:39 +01:00
Jace 6f8023b285 HACK: Added Activate button for spawners in editor. Right now it includes the event from Game, but SpawnerSystem should probably be moved to Engine. 2016-03-02 22:48:01 +01:00
Jace b431a875f7 New weapon behaviours 2016-03-02 22:48:01 +01:00
Jace 7624c6ee0a Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world. 2016-03-02 20:12:59 +01:00