 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
|
8c8edd0e8e
|
WIP InputController for easier command handling in systems
|
2014-05-06 14:33:02 +02:00 |
|
|
Jace
|
57d29d0db7
|
Started implementation of events for InputSystem and SoundSystem
|
2014-04-28 19:55:31 +02:00 |
|
|
Jace
|
0b7c383e8a
|
Merge branch 'havok'
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/PhysicsSystem.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-04-24 23:11:16 +02:00 |
|
 ViktorLjung
|
4481c95681
|
VehicleSetup componentbased.
|
2014-04-22 17:14:29 +02:00 |
|
|
Stiffly
|
55221cca12
|
Implemented Spawn and Remove function for particles. Also added a Particle component.
|
2014-04-22 16:52:14 +02:00 |
|
|
Stiffly
|
2efb5405eb
|
Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance
Conflicts:
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-04-22 11:08:10 +02:00 |
|
|
ViktorLjung
|
069d079594
|
Car physics not working, yet!
|
2014-04-16 01:33:05 +02:00 |
|
|
Jace
|
62abb3f964
|
Merge branch 'havok'
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/RenderSystem.cpp
src/Systems/RenderSystem.h
vs11/Returngeance/Returngeance.vcxproj
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-04-16 00:38:30 +02:00 |
|
|
ViktorLjung
|
84484b3703
|
Box and Sphere Rigidbodies working
|
2014-04-13 02:20:50 +02:00 |
|
|
Jace
|
d13c19d654
|
Removed unused components
|
2014-04-12 18:36:06 +02:00 |
|
|
ViktorLjung
|
04fff4a27b
|
Changed toolset to vs11, for future Havok implementation.
|
2014-04-12 01:59:55 +02:00 |
|
|
ViktorLjung
|
d7e65ff118
|
Vehicle kind of working.
|
2014-04-12 00:36:37 +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 |
|
|
Jace
|
d7fa9eb70f
|
Sound!
|
2014-04-10 07:39:44 +02:00 |
|
|
ViktorLjung
|
4a6f0cad32
|
Constraints working, I think... :D
|
2014-04-07 00:09:09 +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 |
|
|
ViktorLjung
|
1d0747076f
|
Physics!!!!!1111oneoneonetwo
|
2014-04-06 03:39:50 +02:00 |
|
|
Jace
|
ad2862bf84
|
A gray tank! :D
|
2014-04-05 21:20:49 +02:00 |
|
|
Jace
|
a7985b1686
|
Adapted Escape the Dawn engine.
|
2014-04-05 21:20:48 +02:00 |
|