Jace
9d2ce5af8a
Player is now spawned as the correct class that they picked.
2016-03-13 23:05:52 +01:00
William Moberg
534d6639e5
Class enum instead of hardcoded ints.
...
Removed superfluous .Valid() checks.
Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:35:32 +01:00
William Moberg
06614aa907
SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked.
...
Preparations for class aware PlayerSpawnSystem.
2016-03-04 05:41:29 +01:00
William Moberg
658eace093
Added component CapturePointGameMode that contains respawntime.
2016-02-29 18:20:14 +01:00
William Moberg
97b915f130
Merge branch 'master' into Respawning
...
# Conflicts:
# src/Game/Game.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/SoundSystem.cpp
2016-02-11 16:15:47 +01:00
William Moberg
8eea0c8395
WIP respawning.
2016-02-11 16:08:19 +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
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
Jace
99cbdd3c1e
Player death effect fixes
2016-02-08 11:39:29 +01:00
Jace
b83d773627
Infinite respawning for now
2016-01-23 15:06:41 +01:00
Jace
4d5cbb6057
fixup! Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
2016-01-23 12:14:29 +01:00
Jace
74d9bae896
Added conditional spawning based on whether the running instance is a server or not
2016-01-22 17:34:57 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
Jace
1e3fc1ae2d
Created EPlayerSpawned that gets published when a player spawns
2016-01-22 10:16:35 +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
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