 Teejoon
|
fa781d5c88
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-10 17:16:14 +01:00 |
|
|
Teejoon
|
97780395cf
|
... Now mipmaps and Splatmaps i comming :)
|
2016-02-10 17:15:54 +01:00 |
|
|
Teejoon
|
b0bdca5cdd
|
SplatMap räknas rätt ny och mitmaps i Texture.cpp
|
2016-02-10 17:15:08 +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 |
|
 verysecrethero
|
02cd822cf1
|
Tiny test refactoring
|
2016-02-10 17:04:05 +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 |
|
|
verysecrethero
|
f7756ff60f
|
Tiny refactoring of PickupSpawnTest. Updated and fixed HealthSystemTest.
|
2016-02-10 16:51:00 +01:00 |
|
|
verysecrethero
|
2d5f71e442
|
Added 3 PickupSpawnSystem tests.
|
2016-02-10 16:25:47 +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 |
|
 antc13
|
646806b50e
|
New Map with meshes WIP
|
2016-02-10 15:40:59 +01:00 |
|
|
William Moberg
|
b2d35c80f7
|
Merge branch 'master' into FrustumCulling
# Conflicts:
# src/Engine/Collision/Collision.cpp
|
2016-02-10 15:08:40 +01:00 |
|
 Tleety
|
04c23be136
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-02-10 15:01:51 +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 |
|
|
Jace
|
019e85a425
|
Merge pull request #89 from teamfisk/Animations
Animations
|
2016-02-10 14:40:23 +01:00 |
|
 viktorljung
|
61275274f7
|
Commited this
|
2016-02-10 14:39:45 +01:00 |
|
|
viktorljung
|
e9d36c48a6
|
Changed isSkined to IsSkinned and removed duplicated code in PickingPass
|
2016-02-10 14:36:25 +01:00 |
|
|
viktorljung
|
1e238b2407
|
Changed asset branch
|
2016-02-10 14:28:25 +01:00 |
|
|
verysecrethero
|
2f53ed140f
|
Merge remote-tracking branch 'origin/master' into AssaultBoost
# Conflicts:
# resources/Schema/Components.xsd
|
2016-02-10 14:16:55 +01:00 |
|
|
verysecrethero
|
1ebe174b94
|
Merge pull request #88 from teamfisk/Sound
Sound
|
2016-02-10 14:14:47 +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 |
|
 stiffly
|
c2128790af
|
Now using appropriate variable to see if a player is on ground. Does not check if playervel.y == 0 which will be false if a player is on a obstacle.
|
2016-02-10 14:07:11 +01:00 |
|
|
viktorljung
|
afebf879a0
|
Merge fixes
|
2016-02-10 13:44:47 +01:00 |
|
|
William Moberg
|
86f4ff0b3c
|
Added an annotation for Trigger and Collideable components.
|
2016-02-10 12:38:36 +01:00 |
|
|
Jace
|
645ee9013a
|
Merge pull request #85 from teamfisk/FrustumCulling
Frustum culling
|
2016-02-10 12:35:24 +01:00 |
|
|
Jace
|
4a5ab048bd
|
Merge pull request #86 from teamfisk/Sound
Sound
|
2016-02-10 12:33:01 +01:00 |
|
|
verysecrethero
|
b6b96c5f11
|
Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0)
|
2016-02-10 11:51:58 +01:00 |
|
|
stiffly
|
f6a7b8ea0c
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-02-10 11:37:17 +01:00 |
|
|
stiffly
|
3d2f9fa79d
|
Drum sounds does not start every single time a TriggerTouch happens. Specific and temporary logic for play test.
|
2016-02-10 11:36:54 +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 |
|
|
viktorljung
|
97be22c4a5
|
Skinned transparent model Picking fixed
|
2016-02-10 11:22:05 +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 |
|
|
viktorljung
|
09bb42b3f4
|
Importer animation fix
|
2016-02-10 11:00:44 +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 |
|
|
Jace
|
5cea3bed3a
|
Work in progress weapon system
|
2016-02-09 23:27:04 +01:00 |
|
|
viktorljung
|
daa96baab5
|
BoneAttachmentSystem fix for not having a skeleton
|
2016-02-09 23:03:49 +01:00 |
|
|
viktorljung
|
001e2441dd
|
Mergefixes
|
2016-02-09 22:54:51 +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
|
3c22dcc165
|
changed assetbranch
|
2016-02-09 22:34:09 +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 |
|
|
Jace
|
d5647ce89c
|
Working 1-snapshot interpolation
|
2016-02-09 19:36:22 +01:00 |
|
|
William Moberg
|
ecfacee587
|
Undo debug test code.
|
2016-02-09 19:33:28 +01:00 |
|
|
William Moberg
|
a93ccecfeb
|
Debug test code.
|
2016-02-09 19:23:12 +01:00 |
|