 ViktorLjung
|
74d3269e35
|
Merge remote-tracking branch 'origin/particles' into havok
Conflicts:
src/Components/Vehicle.h
|
2014-05-13 01:57:28 +02:00 |
|
|
ViktorLjung
|
38482431a1
|
Tank tower and barrel steering working
|
2014-05-12 22:33:53 +02:00 |
|
 Stiffly
|
e0b5b72454
|
Merge remote-tracking branch 'origin/master' into particles
Conflicts:
src/Components/Physics.h
src/GameWorld.cpp
src/World.cpp
src/World.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-12 13:55:48 +02:00 |
|
 Jace
|
0e2a373053
|
Merge remote-tracking branch 'origin/master' into gui
Conflicts:
src/GameWorld.cpp
src/Systems/FreeSteeringSystem.cpp
src/Systems/PhysicsSystem.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-06 18:05:31 +02:00 |
|
|
Jace
|
57d29d0db7
|
Started implementation of events for InputSystem and SoundSystem
|
2014-04-28 19:55:31 +02:00 |
|
|
Stiffly
|
ea4b7b005e
|
Now use the CloneEntity() function to spawn new particles.
|
2014-04-28 17:56:05 +02:00 |
|
|
Stiffly
|
0b8a3230c3
|
Fixed GetComponent bug which would create invalid components if the entity didn't have the requested component
|
2014-04-28 16:18:08 +02:00 |
|
|
Jace
|
6ba50c2d1e
|
Fixed GetComponent bug which would create invalid components if the entity didn't have the requested component
|
2014-04-28 16:16:03 +02:00 |
|
|
Jace
|
04cafc53e2
|
Implemented entity cloning
|
2014-04-27 07:48:16 +02:00 |
|
|
Jace
|
84d6911744
|
Barebones entity component commit events
|
2014-04-22 15:42:40 +02:00 |
|
|
Jace
|
e4e5068727
|
Resource manager refactoring
|
2014-04-13 03:42:12 +02:00 |
|
|
Jace
|
14feb3659b
|
Initial work for pre-caching resources in render system
|
2014-04-13 01:25:21 +02:00 |
|
|
Jace
|
3470a80f40
|
Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
|
2014-04-12 01:48:15 +02:00 |
|
|
Jace
|
f2259f712d
|
Indentation style changed to Horstmann
|
2014-04-11 21:53:05 +02:00 |
|
|
Jace
|
4c081d0e1c
|
Indentation style changed to Allman
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
|
2014-04-11 20:59:42 +02:00 |
|
|
ViktorLjung
|
a880e7f3e6
|
CompoundShape works, i.e parent child physics :)
Center of mass is still bugged.
|
2014-04-06 19:00:58 +02:00 |
|
|
Jace
|
a7985b1686
|
Adapted Escape the Dawn engine.
|
2014-04-05 21:20:48 +02:00 |
|