 Stiffly
|
457ee84903
|
Merge remote-tracking branch 'origin/havok' into particles
Conflicts:
src/Components/Vehicle.h
|
2014-05-12 15:43:41 +02:00 |
|
 Jace
|
f02954a62c
|
Box and Sphere components renamed to BoxShape and SphereShape
|
2014-04-25 01:05:53 +02:00 |
|
 ViktorLjung
|
04fff4a27b
|
Changed toolset to vs11, for future Havok implementation.
|
2014-04-12 01:59:55 +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
|
1d0747076f
|
Physics!!!!!1111oneoneonetwo
|
2014-04-06 03:39:50 +02:00 |
|
|
Stiffly
|
b4c8d8ca19
|
Added physics components. 2014:04:05 02:57.
|
2014-04-05 21:20:50 +02:00 |
|