 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
|
6ccb196b3b
|
Jeep physics
|
2014-04-24 01:20:13 +02:00 |
|
 Tleety
|
b1edefcf26
|
La till lite ljus och annan skit. Började på defucked rendering och det gick ju jävligt bra fucktiskt.
|
2014-04-17 00:05:19 +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
|
e2d8235169
|
Broken shadow map.
|
2014-04-05 21:20:50 +02:00 |
|
|
Jace
|
a7985b1686
|
Adapted Escape the Dawn engine.
|
2014-04-05 21:20:48 +02:00 |
|