 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 |
|
 William Moberg
|
e2417be8c7
|
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
|
2015-12-15 15:36:28 +01:00 |
|
|
William Moberg
|
170610bcb1
|
Added a TriggerSystem, seems to work as intended.
|
2015-12-15 14:49:52 +01:00 |
|
|
stiffly
|
3f77da4a07
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
|
2015-12-14 17:07:12 +01:00 |
|
|
stiffly
|
bac0a1de26
|
Removed annoying cube
|
2015-12-14 16:55:23 +01:00 |
|
 Jace
|
7464facab9
|
Next generation raptor copter
|
2015-12-12 03:38:17 +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 |
|
|
sippeangelo
|
58d827f7d0
|
Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld
|
2015-12-09 14:25:41 +01:00 |
|
|
sippeangelo
|
c9b140bd6b
|
Semi-working entity loading from XML files!
|
2015-12-09 12:29:32 +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 |
|