 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 |
|
|
Joachim Pettersson
|
bbbab7b287
|
Merge pull request #96 from teamfisk/WeaponSystem
Network improvements and base weapon work
|
2016-02-11 14:26:17 +01:00 |
|
|
Jocke
|
fa2e556ab2
|
fixed some error handling in TCPClient.
|
2016-02-11 14:07:51 +01:00 |
|
 Jace
|
95289f47d6
|
Merge branch 'master' into WeaponSystem
|
2016-02-11 12:58:09 +01:00 |
|
|
Jace
|
ccf4cae74b
|
Merge remote-tracking branch 'origin/Animations'
|
2016-02-11 12:54:42 +01:00 |
|
|
Jace
|
81943516a9
|
Protected inheritance, not even once.
|
2016-02-11 11:36:39 +01:00 |
|
|
Jace
|
e350074cb5
|
Spawner now spawns with orientation
|
2016-02-11 11:36:15 +01:00 |
|
|
Jace
|
0394eacb6b
|
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
|
2016-02-11 00:18:36 +01:00 |
|
|
Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
 viktorljung
|
9c08c351b8
|
fixed reverse Animation looping
|
2016-02-10 23:33:23 +01:00 |
|
|
Jocke
|
eb244f87c4
|
Added disconnect functionality and removed some warnings.
|
2016-02-10 23:27:46 +01:00 |
|
|
viktorljung
|
dded296cde
|
Animation looping fix
|
2016-02-10 23:19:44 +01:00 |
|
 Viktor Ljung
|
c3cc5ae70b
|
Merge pull request #92 from teamfisk/Importer
Importer
|
2016-02-10 22:51:46 +01:00 |
|
 Teejoon
|
f05d0a1b0c
|
assets
|
2016-02-10 22:18:27 +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 |
|
|
Jocke
|
95fa1f4bbd
|
Connect Fix for TCP Client
|
2016-02-10 20:10:20 +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 |
|
|
Jace
|
ed06eacf6f
|
Merge pull request #91 from teamfisk/Sound
Sound fix
|
2016-02-10 19:16:45 +01:00 |
|
|
Jace
|
3c3149b13e
|
Merge pull request #90 from teamfisk/FrustumCulling
Correct bounding box for explosion effects
|
2016-02-10 19:16:36 +01:00 |
|
 William Moberg
|
67cf008122
|
Bug fixing.
|
2016-02-10 18:03:58 +01:00 |
|
|
Jocke
|
7cbdc33f84
|
Updated submodules
|
2016-02-10 17:39:23 +01:00 |
|
 stiffly
|
8520192805
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-02-10 17:17:58 +01:00 |
|
|
stiffly
|
1ba9d97ab7
|
Fixed crash when trying to jump, when no player is spawned.
|
2016-02-10 17:17:41 +01:00 |
|
|
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 |
|
|
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 |
|
 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 |
|
|
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
|
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 |
|
|
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 |
|