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
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
f6a7b8ea0c
Merge remote-tracking branch 'origin/master' into Sound
2016-02-10 11:37:17 +01:00
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
2ec30fd2b2
Cleaned up code and fixed crash when closing client before server when using udp.
2016-02-10 11:28:03 +01:00
97be22c4a5
Skinned transparent model Picking fixed
2016-02-10 11:22:05 +01:00
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
0bbb627790
Merge branch 'master' into FrustumCulling
2016-02-10 11:04:31 +01:00
2c48c2680f
Cleanup
2016-02-10 11:04:28 +01:00
09bb42b3f4
Importer animation fix
2016-02-10 11:00:44 +01:00
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
daa96baab5
BoneAttachmentSystem fix for not having a skeleton
2016-02-09 23:03:49 +01:00
001e2441dd
Mergefixes
2016-02-09 22:54:51 +01:00
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
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
Jace
d5647ce89c
Working 1-snapshot interpolation
2016-02-09 19:36:22 +01:00
ecfacee587
Undo debug test code.
2016-02-09 19:33:28 +01:00
a93ccecfeb
Debug test code.
2016-02-09 19:23:12 +01:00
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
d2ed293183
Network is now working as udp or tcp. Next step is making the hybrid.
2016-02-09 19:14:56 +01:00
830e0f66c9
Tiny: Changed warning message.
2016-02-09 17:21:10 +01:00
239a8e7a6a
Frustum culling should be working.
2016-02-09 17:12:23 +01:00
b9d6d59c62
Merge branch 'BoxModelCollision' into FrustumCulling
...
# Conflicts:
# src/Game/Game.cpp
2016-02-09 15:03:13 +01:00
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
fccd8c64e7
WIP Clients are working properly, servers are not.
2016-02-09 11:43:16 +01:00
b748deb1e1
WIP FrustumCulling, most code added but not working now.
2016-02-09 10:05:49 +01:00
060e674a6f
Picking supports skinned meshes
2016-02-08 17:37:18 +01:00
2c64ffc3d1
No longer using a variable to see if we're in editor mode.
2016-02-08 16:52:35 +01:00
aa5878d6df
Used config for soundsystem properties.
2016-02-08 16:40:13 +01:00
6f163bf3a3
Fixed bug where it crashed on respawn. Also bug where i subscribed to an event twice.
2016-02-08 16:13:09 +01:00
9055d5f697
Bugfix
2016-02-08 15:22:28 +01:00
93c6f3c0a3
AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper.
2016-02-08 14:34:37 +01:00
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
9da1419895
Merge remote-tracking branch 'origin/master' into Sound
2016-02-08 14:24:44 +01:00
11cf85cc73
Renamed CollidableOctreeSystem to FillOctreeSystem.
2016-02-08 14:17:19 +01:00
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
Jace
2b4e00e4b0
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
2016-02-08 13:33:55 +01:00
6610bb974d
Only apply air friction if the ground is never hit during the frame.
2016-02-08 13:32:45 +01:00
d2cfa592f0
Supports skinnd and unskinned meshes
...
ExplosionEffects now supports SplatMapping
2016-02-08 13:01:10 +01:00
971beb29d8
Merge remote-tracking branch 'origin/master' into DefenderShield
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-08 12:30:41 +01:00
2ee21e05d4
Fixed so that Shielded objects can be picked. Shield objects can not however, so they will not be able to be picked in editor either.
2016-02-08 12:29:41 +01:00
94b59af973
Defender shield should now be working
2016-02-08 11:47:35 +01:00
43719f8304
Added texture tiling to shaders (exkluding ExplosinEffects)
2016-02-07 15:27:26 +01:00
92ab22e779
Splatmapping now working.
...
Rendering pipleline now support 3 different types of Material:
Basic: a material with a single color on every property (diffuse, specular, ect).
SingleTextures: a material with a single texture in all or any property. Have a single color on the rest.
SplatMapping: has a SplatMap and 0 to 5 different textures to every property. Properties with o texture uses a single color insted.
All materials with a texture has a UVRepeat, telling how many time to till in U and in V.
modelJobs now uses ShadeID, ModelID and TextureID for the Hash insted of only Texture
MayaExported exports 3 differnt types of material, the same as the piplen now supports.
2016-02-07 13:39:13 +01:00
933a32aa8d
Animations kind of working
2016-02-06 18:09:51 +01:00
88d7b79cd3
TCP and UDP Client are working for 1 connected player, more players are not tested yet
2016-02-05 18:30:31 +01:00
viktorljung
Jace
stiffly
Jocke
William Moberg
Teejoon
Tleety