 Tleety
|
2bd60be741
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-01-08 14:14:43 +01:00 |
|
|
Tleety
|
25a99a04c5
|
Added Visable bool and a better description to Pointlight component.
|
2016-01-08 14:11:35 +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 |
|
|
Tleety
|
eb69e03e82
|
Merge branch 'Forward+' of github.com:teamfisk/TacticalZ into Forward+
|
2015-12-18 15:28:25 +01:00 |
|
 stiffly
|
330f08b926
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
|
2015-12-18 14:18:53 +01:00 |
|
 viktorljung
|
ef4cbfece8
|
Added PointLight Component in XML files
|
2015-12-18 13:20:55 +01:00 |
|
 William Moberg
|
46ae2d39af
|
Merge branch 'master' into OctTree
# Conflicts:
# src/Game/Game.cpp
|
2015-12-17 16:44:01 +01:00 |
|
|
stiffly
|
50822d09fc
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# src/Game/Game.cpp
|
2015-12-17 14:10:02 +01:00 |
|
 Jace
|
dbbbb7b4e7
|
Working rotations and translations relative to global and local space for children
|
2015-12-16 17:20:56 +01:00 |
|
|
William Moberg
|
04a01104b5
|
Merge branch 'master' into OctTree
# Conflicts:
# src/Engine/CMakeLists.txt
# src/Game/Game.cpp
|
2015-12-15 17:11:11 +01:00 |
|
|
stiffly
|
0a8a9e5099
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# src/Engine/Rendering/RenderState.cpp
# src/Game/Game.cpp
|
2015-12-15 11:50:01 +01:00 |
|
|
stiffly
|
b698a0d36f
|
WIP
Adding models now crashes. Threading
Added a create player event that currently is not used.
|
2015-12-15 11:21:46 +01:00 |
|
|
William Moberg
|
59095c2ce5
|
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
|
2015-12-14 17:08:00 +01:00 |
|
|
Jace
|
ea239b19bd
|
Fixed component type resolution order to prioritize custom types before native ones, since namespace information doesn't exist at that stage.
|
2015-12-14 16:12:20 +01:00 |
|
|
stiffly
|
c2435fda2d
|
Added Component to Components.xsd and Entity.xsd
|
2015-12-11 14:27:54 +01:00 |
|
|
stiffly
|
80f028edf2
|
Added a very basic PlayerSystem, and a PlayerComponent.
|
2015-12-11 13:45:19 +01:00 |
|
 sippeangelo
|
0367826f16
|
Added RaptorCopter example system
|
2015-12-10 10:17:18 +01:00 |
|
|
sippeangelo
|
90a79c702f
|
Added crude absolute positioning when rendering
|
2015-12-09 15:26:49 +01:00 |
|
|
Jace
|
0dbe0fe48e
|
Component definitions and default values loading from schema
|
2015-12-08 21:38:52 +01:00 |
|
|
sippeangelo
|
1e1ce4e127
|
Added Model component to schema
|
2015-12-08 18:21:24 +01:00 |
|
|
sippeangelo
|
8419d2e7b9
|
Updated schema with custom type names to better match their C++ counterparts
|
2015-11-26 16:09:11 +01:00 |
|
|
sippeangelo
|
ac05975fd5
|
Updated schema
|
2015-11-25 18:04:11 +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 |
|