 Jace
|
3fb975a8d9
|
Editor widget entities
|
2016-01-19 11:44:03 +01:00 |
|
|
Jace
|
6ec2258758
|
Added UniformScale component which keeps an entity's scale at a uniform value relative to the screen.
|
2016-01-17 06:22:35 +01:00 |
|
|
Jace
|
f281d220de
|
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
|
2016-01-17 01:00:48 +01:00 |
|
|
Jace
|
9ec32464bc
|
Added enum support to entity file format, see "Team" component for an example. Use ComponentInfo::Enum to convert enum string keys to its corresponding integer representation at runtime.
|
2016-01-16 23:12:24 +01:00 |
|
|
Jace
|
b2213dbe9a
|
Merge remote-tracking branch 'origin/master' into PlayerMovement
# Conflicts:
# include/Engine/Collision/Collision.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Game/Game.cpp
|
2016-01-15 20:28:43 +01:00 |
|
|
Jace
|
db1b972cd1
|
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
|
2016-01-15 18:32:47 +01:00 |
|
 stiffly
|
5c45dbdd10
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-01-15 16:25:32 +01:00 |
|
 Tleety
|
ecf524eb4e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-15 11:01:58 +01:00 |
|
|
stiffly
|
e248b37ea8
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# src/Game/Game.cpp
|
2016-01-15 09:52:52 +01:00 |
|
|
Jace
|
3a4f378ac5
|
Merge remote-tracking branch 'origin/master' into PlayerMovement
# Conflicts:
# src/Game/Game.cpp
|
2016-01-14 17:07:39 +01:00 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|
|
Jace
|
d6ef527f25
|
Basic collisions using Octree. Seems buggy over octree boundaries.
|
2016-01-13 15:34:43 +01:00 |
|
 viktorljung
|
0f17f9a888
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-12 16:13:20 +01:00 |
|
|
stiffly
|
729ebe6c8b
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# README.md
# resources/Schema/Components.xsd
# resources/Schema/Types/Entity.xsd
|
2016-01-12 14:50:10 +01:00 |
|
|
Tleety
|
0cf8d26557
|
Revert "Revert "Forward+""
This reverts commit b908a9f9c6.
|
2016-01-11 17:56:58 +01:00 |
|
|
Jace
|
b908a9f9c6
|
Revert "Forward+"
|
2016-01-11 13:48:55 +01:00 |
|
|
Tleety
|
2bd60be741
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-01-08 14:14:43 +01:00 |
|
|
stiffly
|
d8c4c6e5ff
|
Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet.
|
2016-01-07 15:22:46 +01:00 |
|
 verysecrethero
|
638c236ceb
|
HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass
|
2016-01-07 14:53:31 +01:00 |
|
|
Tleety
|
e7bb8954bf
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/Renderer.cpp
|
2016-01-06 11:35:55 +01:00 |
|
|
viktorljung
|
ef4cbfece8
|
Added PointLight Component in XML files
|
2015-12-18 13:20:55 +01:00 |
|
|
viktorljung
|
05b78265be
|
Fixed some transparency bugs and started on component based camera
|
2015-12-14 19:10:00 +01:00 |
|
 William Moberg
|
59095c2ce5
|
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
|
2015-12-14 17:08:00 +01:00 |
|
|
stiffly
|
c2435fda2d
|
Added Component to Components.xsd and Entity.xsd
|
2015-12-11 14:27:54 +01:00 |
|
 sippeangelo
|
0367826f16
|
Added RaptorCopter example system
|
2015-12-10 10:17:18 +01:00 |
|
|
sippeangelo
|
1e1ce4e127
|
Added Model component to schema
|
2015-12-08 18:21:24 +01:00 |
|
|
sippeangelo
|
1a8784b4be
|
Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas
|
2015-11-20 16:06:30 +01:00 |
|