 Jace
|
44e376e815
|
Pls go away
|
2014-05-16 02:13:28 +02:00 |
|
|
Jace
|
9723d80742
|
And then Microsoft happened...
|
2014-05-15 21:50:49 +02:00 |
|
|
Jace
|
6684aa06b7
|
Merge branch 'master' into gui
Conflicts:
src/GUI/Frame.h
src/InputManager.cpp
|
2014-05-15 21:16:43 +02:00 |
|
|
Jace
|
bafa8d0a5d
|
Merge remote-tracking branch 'origin/deffered_rendering'
Conflicts:
assets
src/Components/PointLight.h
src/GameWorld.cpp
src/Renderer.cpp
src/Renderer.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-13 04:07:24 +02:00 |
|
|
Jace
|
d259811795
|
Xbox360 controller support
|
2014-05-13 02:24:42 +02:00 |
|
 ViktorLjung
|
c8a77d5c3d
|
Merge remote-tracking branch 'origin/master' into havok
Conflicts:
assets
src/GameWorld.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-12 14:03:02 +02:00 |
|
|
Jace
|
330a212830
|
Rectangle comparison fixed
|
2014-05-05 07:15:47 +02:00 |
|
|
ViktorLjung
|
cb6b0a58d8
|
Resource manager OBJ vs Model conflict fixed
|
2014-04-27 08:07:18 +02:00 |
|
 Tleety
|
6d75336496
|
Started on deferred rendering framework.
|
2014-04-24 00:11:16 +02:00 |
|
|
Jace
|
ee34b15cf1
|
Rectangle class.
|
2014-04-23 01:36:03 +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
|
a7985b1686
|
Adapted Escape the Dawn engine.
|
2014-04-05 21:20:48 +02:00 |
|
|
Jace
|
014ae5f7a8
|
UpperCamelCase GodDamnIt!
|
2014-04-05 21:10:59 +02:00 |
|
|
Jace
|
700f060aaf
|
Initial bootstrap
|
2014-04-02 18:12:08 +02:00 |
|