 William Moberg
|
f632b45c9b
|
Merge branch 'MemoryOptimization' into Importer
# Conflicts:
# include/Engine/Rendering/Model.h
# src/Engine/Collision/Collision.cpp
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Collision/TriggerSystem.cpp
# src/Game/Systems/SpawnerSystem.cpp
|
2016-03-14 02:06:53 +01:00 |
|
|
William Moberg
|
562afac9d1
|
Merge branch 'master' into Importer
# Conflicts:
# src/Engine/Collision/Collision.cpp
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/SpawnerSystem.cpp
|
2016-03-14 00:42:07 +01:00 |
|
 Jace
|
9d2ce5af8a
|
Player is now spawned as the correct class that they picked.
|
2016-03-13 23:05:52 +01:00 |
|
|
Jace
|
0516794db6
|
Separating RawModel from Model
|
2016-03-13 14:47:11 +01:00 |
|
|
Jace
|
a1fda82d3a
|
Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself
|
2016-03-13 00:57:00 +01:00 |
|
|
Jace
|
b7d93058b1
|
Added base work for dity bits in components
|
2016-03-08 21:11:59 +01:00 |
|
|
Jace
|
5923d2d7a7
|
Made SpawnerSystem utilize the new EntityFile for spawning instead
|
2016-03-02 19:52:34 +01:00 |
|
|
Jace
|
26d6546d79
|
Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation
|
2016-03-02 18:53:40 +01:00 |
|
 Teejoon
|
46eaedb186
|
Merge remote-tracking branch 'origin/master' into Importer
Conflicts:
resources/Schema/Entities/Player.xml
src/Engine/Collision/CollisionSystem.cpp
src/Engine/Rendering/DrawFinalPass.cpp
|
2016-03-02 13:19:40 +01:00 |
|
|
Jace
|
9e6c67596d
|
Basic editor copy and paste. Doesn't actually copy the entity until you paste it.
|
2016-02-25 17:51:28 +01:00 |
|
|
Teejoon
|
669a7d13cf
|
We can now export and import collision meshes :D
|
2016-02-25 15:39:42 +01:00 |
|
|
William Moberg
|
23bb1a6405
|
Cannot respawn inside other players, unless all are blocked.
|
2016-02-17 14:54:59 +01:00 |
|
|
Jace
|
d1213f9f59
|
Working damage dealing, a super cool reload effect and hit markers!
|
2016-02-11 22:50:44 +01:00 |
|
|
Jace
|
e350074cb5
|
Spawner now spawns with orientation
|
2016-02-11 11:36:15 +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
|
a3d4eb65d5
|
Fixes #66 warnings
|
2016-02-01 17:53:01 +01:00 |
|
|
Jace
|
7b348379ac
|
Quaternions are never the solution.
|
2016-01-25 00:22:55 +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 |
|