 Jace
|
bf5106e5b6
|
Merge remote-tracking branch 'origin/deffered_rendering'
|
2014-06-04 17:14:34 +02:00 |
|
|
Jace
|
5f1feffe0d
|
Main menu finished
|
2014-06-04 16:59:30 +02:00 |
|
 Tleety
|
6cae09c5d8
|
Walls are now destroyable
|
2014-06-04 14:48:40 +02:00 |
|
|
Tleety
|
d5dcb0b72c
|
Fixed normals nor averaging when at a corner.
|
2014-06-04 05:56:38 +02:00 |
|
|
Tleety
|
cf2040f038
|
Inget funkar, broken commit, dont use.
|
2014-06-04 04:20:15 +02:00 |
|
|
Tleety
|
f1a9afc097
|
Fixed a createWall function.
|
2014-06-02 20:01:28 +02:00 |
|
|
Tleety
|
9ccf8ecc42
|
Fixed being able to draw sprites and normal/specular maps for terrain
|
2014-05-30 19:53:00 +02:00 |
|
|
Jace
|
74239300bd
|
Merge commit 'e3aab96a750d6e5d6f8ff42ffdb5a23a47ab929d' into render_queue
Conflicts:
assets
src/GameWorld.cpp
src/Renderer.cpp
src/Renderer.h
src/Systems/RenderSystem.cpp
|
2014-05-26 04:21:08 +02:00 |
|
|
Jace
|
22442708cc
|
One hell of a GUI interface (minus graphical)
"how does this even work lol"
|
2014-05-26 03:33:11 +02:00 |
|
|
Tleety
|
dbad1ee7f5
|
Work done on light and shadows.
|
2014-05-21 16:51:05 +02:00 |
|
|
Tleety
|
e414087816
|
Some work done on lights and normals and other buggs/fixes
|
2014-05-20 03:33:42 +02:00 |
|
 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 |
|