 William Moberg
|
3548cfa248
|
Merge pull request #27 from teamfisk/ShootEvent
Shoot event
|
2016-01-21 16:35:55 +01:00 |
|
 verysecrethero
|
973ccd34c9
|
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
|
2016-01-21 16:30:07 +01:00 |
|
|
verysecrethero
|
7deb32431e
|
Removed Color TestCode in WeaponSystem
|
2016-01-21 16:03:30 +01:00 |
|
 Tobias Dahl
|
c6e9aad0c7
|
Merge pull request #42 from teamfisk/SpawnMiniBranch
HealthSystem now deletes the entity after publishing the PlayerDeath …
|
2016-01-21 15:10:16 +01:00 |
|
|
verysecrethero
|
2381f01d12
|
HealthSystem now deletes the entity after publishing the PlayerDeath event
|
2016-01-21 14:25:01 +01:00 |
|
|
verysecrethero
|
bdebc9de62
|
WeaponSystem now handles "PrimaryFire" input events. It sends out ePlayerDamage event if it hits a player. Included some tests
|
2016-01-21 11:55:51 +01:00 |
|
|
verysecrethero
|
7b34e001ba
|
Merge remote-tracking branch 'origin/master' into ShootEvent
|
2016-01-21 10:26:42 +01:00 |
|
|
verysecrethero
|
c2e05de89f
|
Deleted some components, etc for ShootEvent that will likely be used in a WeaponSystem instead
|
2016-01-21 10:24:34 +01:00 |
|
 Jace
|
70cab9ef30
|
Merge pull request #40 from teamfisk/Networking
Networking
|
2016-01-21 10:03:44 +01:00 |
|
|
Jace
|
f1a54a89b3
|
Merge pull request #37 from teamfisk/OctTree
Oct tree
|
2016-01-21 09:57:46 +01:00 |
|
|
verysecrethero
|
b098bd2bd3
|
Merge remote-tracking branch 'origin/master' into ShootEvent
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/PlayerSystem.cpp
# src/Tests/HealthSystemTest.cpp
# src/Tests/OctTreeTestAnders.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestHardCodedTestWorld.h
|
2016-01-20 17:53:33 +01:00 |
|
|
William Moberg
|
60037c2849
|
Merge pull request #31 from teamfisk/CapturePointTake
Capture point take
|
2016-01-20 17:43:20 +01:00 |
|
 Jocke
|
cd67253173
|
Added logic to go from spectator to player.
|
2016-01-20 17:41:16 +01:00 |
|
|
verysecrethero
|
a596b8746b
|
CapturePointTimers are now reset for "inactive" CapturePoints after a capture.
|
2016-01-20 17:32:20 +01:00 |
|
|
verysecrethero
|
35876f6425
|
Removed membervariable m_NextPossibleCapturePointand added it as local instead
|
2016-01-20 16:37:10 +01:00 |
|
|
verysecrethero
|
f6ce98249e
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
|
2016-01-20 16:32:14 +01:00 |
|
|
Jocke
|
00588b07c5
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
|
2016-01-20 16:30:12 +01:00 |
|
 stiffly
|
3376f4a16e
|
Added server has timed out logic to client. (>'')>
|
2016-01-20 16:27:53 +01:00 |
|
|
Jocke
|
25d2aa3464
|
"Supporting" spectators. Using a vector for connected units as we do not interpret as players. ““”̿ ̿ ̿ ̿ ̿’̿’̵͇̿̿з=(•̪●)=ε/̵͇̿̿/̿ ̿ ̿ ̿ ̿’““
|
2016-01-20 16:27:23 +01:00 |
|
|
verysecrethero
|
29aefc5af2
|
Added some more visual CaptureTestState xml files
|
2016-01-20 16:06:35 +01:00 |
|
|
verysecrethero
|
39ae83efd4
|
Fixed all tests in CapturePointTest and cleaned up some comments
|
2016-01-20 15:40:56 +01:00 |
|
|
verysecrethero
|
8189e3c00c
|
Logic in CapturePointSystem is working again. Need to update all Tests!
|
2016-01-20 14:59:18 +01:00 |
|
|
Jocke
|
4d01cdf895
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# src/Engine/Network/Client.cpp
|
2016-01-20 14:33:17 +01:00 |
|
|
stiffly
|
7e7ca7edcf
|
Listening to "DisconnectFromServer"
|
2016-01-20 14:32:04 +01:00 |
|
|
Jocke
|
e9a576341e
|
Started on server disconnect logic.
|
2016-01-20 14:31:50 +01:00 |
|
|
Jocke
|
f52cddb445
|
Added packet loss logic for multiple clients.
Changed packet class to fit our needs.
|
2016-01-20 13:43:11 +01:00 |
|
|
stiffly
|
85523343b2
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-20 10:24:53 +01:00 |
|
|
William Moberg
|
410e349329
|
Added test map for capture points and some debug code.
|
2016-01-19 18:27:58 +01:00 |
|
|
verysecrethero
|
b45de542da
|
CapturePointSystem updated, all tests are green
|
2016-01-19 17:19:58 +01:00 |
|
|
William Moberg
|
d1b6fb1259
|
Tiny logic alteration so we don't get false warnings in debug.
|
2016-01-19 16:59:02 +01:00 |
|
|
Joachim Pettersson
|
dfa96f74e1
|
Merge pull request #39 from teamfisk/Forward+
Forward+
|
2016-01-19 16:53:07 +01:00 |
|
|
Tleety
|
5d6d0f82b9
|
Removed some debug code
|
2016-01-19 16:48:59 +01:00 |
|
|
Tleety
|
a124ab2400
|
Some asset shit.
Fixed testworld to use the right model.
|
2016-01-19 16:11:56 +01:00 |
|
|
Tleety
|
d2263b0c90
|
Assets added
|
2016-01-19 16:09:30 +01:00 |
|
|
Tleety
|
a8ffb24040
|
latest commit fix
|
2016-01-19 16:08:09 +01:00 |
|
|
Tleety
|
893ef38237
|
Removed world from renderer and moved depth-calculation code to modeljob
|
2016-01-19 15:41:17 +01:00 |
|
|
verysecrethero
|
f197993beb
|
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
|
2016-01-19 15:31:15 +01:00 |
|
|
William Moberg
|
017ad96bbe
|
Fixed some errors in Tests.
|
2016-01-19 15:20:29 +01:00 |
|
|
stiffly
|
ad9bb5fba4
|
Added an extra interpolation point.
|
2016-01-19 15:03:10 +01:00 |
|
|
William Moberg
|
713ebbe18c
|
Can add any objects that inherit from AABB into the Octree.
|
2016-01-19 14:50:46 +01:00 |
|
|
Tleety
|
982837052a
|
DirectionalLight now correctly getting directions
|
2016-01-19 14:44:17 +01:00 |
|
|
stiffly
|
e0c4394f20
|
Merge. Also fixed interpolation for scale and rotation.
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# src/Game/CMakeLists.txt
# src/Game/Game.cpp
|
2016-01-19 14:04:25 +01:00 |
|
|
Tleety
|
4cafb2fc4c
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-19 12:33:08 +01:00 |
|
|
Tleety
|
46e17b7e0d
|
Working directional light
|
2016-01-19 12:32:34 +01:00 |
|
|
stiffly
|
3142c701e3
|
WIP interpolating scale and orientation
|
2016-01-19 11:42:30 +01:00 |
|
|
William Moberg
|
621d935d7a
|
Octree returns correct boxes when testing along an axis by searching through the correct child subtrees.
|
2016-01-18 18:24:11 +01:00 |
|
|
William Moberg
|
b2358a1854
|
Added bool in Physics to toggle gravity for entities.
|
2016-01-18 18:16:24 +01:00 |
|
|
stiffly
|
a6425160fd
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Game/InterpolationSystem.h
# src/Game/InterpolationSystem.cpp
|
2016-01-18 18:13:19 +01:00 |
|
|
stiffly
|
88eb3ca2db
|
Scraping queues for interpolation
|
2016-01-18 18:07:59 +01:00 |
|
|
Jocke
|
3e90ed564c
|
Moved Struct in InterpolationSystem.h and fixed bug.
|
2016-01-18 18:07:39 +01:00 |
|