 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
|
5e1355f3fe
|
Optimizations
(cherry picked from commit 7e32946173)
|
2014-04-28 16:24:17 +02:00 |
|
 ViktorLjung
|
c1cb4da684
|
Fixed quaternion relative rotations!
|
2014-04-24 00:03:22 +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 |
|
|
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 |
|