 stiffly
|
74c95089ea
|
Merge remote-tracking branch 'origin/PlayerMovement' into Networking
|
2016-01-22 16:19:35 +01:00 |
|
 Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
stiffly
|
08fcdb382b
|
Used config for a lot of things
|
2016-01-22 13:18:53 +01:00 |
|
|
Jace
|
1e3fc1ae2d
|
Created EPlayerSpawned that gets published when a player spawns
|
2016-01-22 10:16:35 +01:00 |
|
 verysecrethero
|
deb6ff1b16
|
Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)
|
2016-01-21 17:36:47 +01:00 |
|
 William Moberg
|
4d60f387ed
|
Merge pull request #44 from teamfisk/EditorUsefulness
Editor refactoring
|
2016-01-21 17:03:52 +01:00 |
|
|
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 |
|
|
Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +01:00 |
|
|
verysecrethero
|
7deb32431e
|
Removed Color TestCode in WeaponSystem
|
2016-01-21 16:03:30 +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 |
|
|
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
|
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
|
8189e3c00c
|
Logic in CapturePointSystem is working again. Need to update all Tests!
|
2016-01-20 14:59:18 +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 |
|
|
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 |
|
|
stiffly
|
ad9bb5fba4
|
Added an extra interpolation point.
|
2016-01-19 15:03:10 +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 |
|
|
Jace
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
|
William Moberg
|
b2358a1854
|
Added bool in Physics to toggle gravity for entities.
|
2016-01-18 18:16:24 +01:00 |
|
|
verysecrethero
|
4c1a49a8a4
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# 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/CMakeLists.txt
# src/Game/PlayerSystem.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestGameMain.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
|
2016-01-18 16:48:49 +01:00 |
|
|
William Moberg
|
942064c450
|
Removed class PlayerSystem and associated files.
|
2016-01-18 13:07:04 +01:00 |
|
|
Jace
|
f281d220de
|
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
|
2016-01-17 01:00:48 +01:00 |
|
|
Jace
|
db1b972cd1
|
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
|
2016-01-15 18:32:47 +01:00 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|