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

665 Commits

Author SHA1 Message Date
Jocke e0c3a32e66 Merge branch 'master' into TCPConnections 
# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/Server.h
#	include/Game/Game.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Game/Game.cpp
 2016-02-11 16:26:42 +01:00
Jace 81943516a9 Protected inheritance, not even once. 2016-02-11 11:36:39 +01:00
Jocke eb244f87c4 Added disconnect functionality and removed some warnings. 2016-02-10 23:27:46 +01:00
Jocke ec54b1298d Reconnect is now possible. 2016-02-10 21:02:46 +01:00
Jace 6396925b68 Merge remote-tracking branch 'origin/Animations' into WeaponSystem 2016-02-10 20:47:33 +01:00
viktorljung 224e95f34a Fixed BoneAttachment component and optimized animation code a bit 2016-02-10 20:45:24 +01:00
Jace 0825b10c75 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	src/Game/Systems/SoundSystem.cpp
 2016-02-10 19:24:35 +01:00
William Moberg 67cf008122 Bug fixing. 2016-02-10 18:03:58 +01:00
Jocke 9645169797 Merge remote-tracking branch 'origin/master' into TCPConnections 
# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/Network.h
#	include/Engine/Network/Packet.h
#	include/Engine/Network/Server.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Packet.cpp
#	src/Engine/Network/Server.cpp
#	src/Tests/HealthSystemTest.cpp
 2016-02-10 17:05:07 +01:00
Jace 2c0f66d9c7 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	include/Engine/Collision/FillFrustumOctreeSystem.h
#	include/Engine/Core/Octree.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/DefaultInput.ini
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-10 17:02:00 +01:00
Jocke 4f2ad3ad00 Reliable message should now be working, further testing is to be done. 2016-02-10 16:16:56 +01:00
William Moberg 27cdccac75 Frustrum octree should only get AABBs derived from Model now. 2016-02-10 16:10:41 +01:00
William Moberg b2d35c80f7 Merge branch 'master' into FrustumCulling 
# Conflicts:
#	src/Engine/Collision/Collision.cpp
 2016-02-10 15:08:40 +01:00
William Moberg f3a76eb13e Explosion effects should get a proper sized AABB. 2016-02-10 15:00:13 +01:00
Jace d931660c56 WIP 2016-02-10 14:43:32 +01:00
viktorljung e9d36c48a6 Changed isSkined to IsSkinned and removed duplicated code in PickingPass 2016-02-10 14:36:25 +01:00
viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp
 2016-02-10 14:13:08 +01:00
viktorljung afebf879a0 Merge fixes 2016-02-10 13:44:47 +01:00
Jace 645ee9013a Merge pull request #85 from teamfisk/FrustumCulling 
Frustum culling
 2016-02-10 12:35:24 +01:00
stiffly f6a7b8ea0c Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 11:37:17 +01:00
viktorljung 49e6252ee1 Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-02-10 11:33:45 +01:00
Jocke 2ec30fd2b2 Cleaned up code and fixed crash when closing client before server when using udp. 2016-02-10 11:28:03 +01:00
stiffly 94ff12cf66 When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter. 2016-02-10 11:15:49 +01:00
William Moberg 0bbb627790 Merge branch 'master' into FrustumCulling 2016-02-10 11:04:31 +01:00
viktorljung 2c48c2680f Cleanup 2016-02-10 11:04:28 +01:00
William Moberg d65ce805a5 FrustumOctree has its own system, won't cull away explosion effects. 2016-02-10 10:53:25 +01:00
Jace 067780c93f Merge pull request #83 from teamfisk/DefenderShield 
Defender shield
 2016-02-10 10:33:36 +01:00
Jace 90192e016a Merge pull request #82 from teamfisk/BoxModelCollision 
Small fixes to collision/trigger-boxes, etc.
 2016-02-10 10:08:54 +01:00
viktorljung c09c2f4783 Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-09 22:50:19 +01:00
viktorljung 7212217460 Added animation blending and offset animation component 2016-02-09 22:15:43 +01:00
Jace d83190290f Server now broadcasts certain input commands to all other clients (for stuff like shooting) 2016-02-09 19:37:42 +01:00
William Moberg 7140b740b5 Models/Collideables/etc. won't need a AABB component anymore, if it has a Model component. In addition, they should take rotation into account, i.e it doesn't have to be axis-aligned. 2016-02-09 19:20:04 +01:00
Jocke d2ed293183 Network is now working as udp or tcp. Next step is making the hybrid. 2016-02-09 19:14:56 +01:00
William Moberg eec59a40c8 Nitpicks. 2016-02-09 17:19:39 +01:00
William Moberg 239a8e7a6a Frustum culling should be working. 2016-02-09 17:12:23 +01:00
Jace c69a80f5ba Added System::LocalPlayer that is always set to the entity which is the local player, available to all systems. 2016-02-09 16:06:39 +01:00
William Moberg b9d6d59c62 Merge branch 'BoxModelCollision' into FrustumCulling 
# Conflicts:
#	src/Game/Game.cpp
 2016-02-09 15:03:13 +01:00
William Moberg b30891aecd WIP, debugging code added, still not working. 2016-02-09 15:00:30 +01:00
Jace d3bc48f5f7 Major networking refactoring to allow for snapshot filtering outside of netcode 2016-02-09 13:22:21 +01:00
Jocke fccd8c64e7 WIP Clients are working properly, servers are not. 2016-02-09 11:43:16 +01:00
William Moberg b748deb1e1 WIP FrustumCulling, most code added but not working now. 2016-02-09 10:05:49 +01:00
Teejoon 060e674a6f Picking supports skinned meshes 2016-02-08 17:37:18 +01:00
stiffly 2c64ffc3d1 No longer using a variable to see if we're in editor mode. 2016-02-08 16:52:35 +01:00
stiffly aa5878d6df Used config for soundsystem properties. 2016-02-08 16:40:13 +01:00
William Moberg 93c6f3c0a3 AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper. 2016-02-08 14:34:37 +01:00
Jocke ba9419b342 Moved UDP logic from Hybrid server/client to UDP server/client. fixed bug in Server::CheckForTimeOuts. 2016-02-08 14:32:00 +01:00
stiffly 9da1419895 Merge remote-tracking branch 'origin/master' into Sound 2016-02-08 14:24:44 +01:00
William Moberg 11cf85cc73 Renamed CollidableOctreeSystem to FillOctreeSystem. 2016-02-08 14:17:19 +01:00
stiffly 3a5c0a2762 SoundSystem does not longer inherit from SoundManager. SoundManager is a individual class that listens to events. The SoundManager only listens to the local player. 2016-02-08 14:01:32 +01:00
stiffly 12c05d5a1c Added an Queue event for sound emitters. 2016-02-08 13:59:35 +01:00