 ViktorLjung
|
609687d6b4
|
MULTIPLAYER
|
2014-05-20 01:43:59 +02:00 |
|
 Jace
|
3023391358
|
Merge remote-tracking branch 'origin/deffered_rendering' into gui
Conflicts:
assets
src/GameWorld.cpp
|
2014-05-19 03:15:40 +02:00 |
|
 Tleety
|
7455f4b865
|
NormalMaps Working and started work on specular maps.
|
2014-05-19 01:01:46 +02:00 |
|
|
ViktorLjung
|
cb6b0a58d8
|
Resource manager OBJ vs Model conflict fixed
|
2014-04-27 08:07:18 +02:00 |
|
|
Jace
|
0fbce570ff
|
Extended Model to support specular and normal maps
|
2014-04-24 02:36:31 +02:00 |
|
|
Jace
|
530b16e31b
|
Extended OBJ loader to parse specular and normal maps
|
2014-04-23 17:56:04 +02:00 |
|
|
Jace
|
e4e5068727
|
Resource manager refactoring
|
2014-04-13 03:42:12 +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 |
|