 viktorljung
|
8ca01ae9c7
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
src/game/Game/PadSystem.cpp
src/game/Physics/PhysicsSystem.cpp
|
2015-09-17 17:11:37 +02:00 |
|
|
viktorljung
|
442554812d
|
Collisions kind of working
|
2015-09-17 14:11:09 +01:00 |
|
 tleety
|
825f6dc991
|
Models now get a standard normal and specular map if they dont have one
|
2015-09-16 16:09:20 +02:00 |
|
|
tleety
|
b9eda67a2a
|
Added depth buffer to fix transparency, still a bug that transparency goes wrong at when you press a button.
|
2015-09-14 16:53:14 +02:00 |
|
|
tleety
|
7b984c7cc3
|
Merge into master
|
2015-09-11 15:17:49 +02:00 |
|
|
tleety
|
748f61883b
|
Added some textures and fixed camera perspective
|
2015-09-11 15:07:48 +02:00 |
|
|
tleety
|
9382acdb52
|
Added a few brick textures
|
2015-09-11 11:16:43 +02:00 |
|
 PlatinumSkink
|
c829315598
|
Ball hitting bricks destroys bricks! We can PLAY! (kind of)
|
2015-09-11 10:50:49 +02:00 |
|
|
PlatinumSkink
|
3e04ff2e34
|
Gusp.
|
2015-09-10 22:40:18 +02:00 |
|
|
PlatinumSkink
|
1d94338214
|
Added CBall
|
2015-09-10 21:46:03 +02:00 |
|
|
tleety
|
f2209466ef
|
Added some textures for rendering testing
|
2015-09-10 21:08:56 +02:00 |
|
|
PlatinumSkink
|
16c5d2a40f
|
Made a Stage! Imported PlaceHolder Graphics!
|
2015-09-10 21:06:21 +02:00 |
|
 Jace
|
98e363eda6
|
Initial structure
|
2015-09-04 10:02:06 +02:00 |
|