Commit Graph

33 Commits

Author SHA1 Message Date
tleety 52e2ce567a Power up sprites now show when you hit powerup bricks 2015-10-12 16:48:04 +02:00
tleety 3fef91b8a9 Added RealeaseTheKraken sprite 2015-10-12 15:29:34 +02:00
tleety 88df747741 Added Sticky sprite 2015-10-12 15:12:53 +02:00
tleety 577dad7dad Added lifedonut sprite 2015-10-12 15:04:30 +02:00
tleety 8cc0b70776 Added Ink blaster sprite 2015-10-12 14:48:33 +02:00
tleety 2e8cfe0a92 Friends sprite 2015-10-12 14:47:36 +02:00
Jace 7f344263da Merge branch 'master' into gui
Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp
2015-10-08 23:47:25 +02:00
Jace 7ee0bbc32b Added first stage story 2015-10-08 23:41:59 +02:00
viktorljung 9997f3d964 Merge remote-tracking branch 'origin/master' into Physics 2015-10-08 23:19:23 +02:00
viktorljung 95c1f57dd7 GameOver and WinScreen Added 2015-10-08 23:18:54 +02:00
Stiffly 2545cef90f temporary particles for demo. trails for bricks, and on brick hit. 2015-10-08 21:41:01 +02:00
Stiffly 143bff2d9e Added two new particle sprites. 2015-10-08 18:19:15 +02:00
Jace 54fb8bf70a Error texture was WONKY 2015-10-08 16:43:51 +02:00
Jace 7b47385674 Working NumberFrame and score indicator 2015-09-25 05:30:59 +02:00
Jace 8b3d9eb842 WIP HUD 2015-09-25 03:04:37 +02:00
Jace d2bc91be48 Merge remote-tracking branch 'origin/master' into gui
Conflicts:
	include/Core/Engine.h
	include/Core/RenderQueue.h
	include/Core/Renderer.h
	src/game/Core/Renderer.cpp
2015-09-25 02:27:00 +02:00
Jace 5f1963b8bc Complete main menu without event bindings. 2015-09-25 01:29:14 +02:00
tleety fa198cf953 Water now rendered in forward rendering 2015-09-24 23:21:46 +02:00
tleety d473e3711c Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water. 2015-09-23 18:01:15 +02:00
tleety b32934dba6 Merge remote-tracking branch 'origin/physics' into water
# Conflicts:
#	include/Core/Engine.h
#	include/Physics/PhysicsSystem.h
#	src/game/Game/PadSystem.cpp
#	src/game/Physics/PhysicsSystem.cpp
2015-09-17 17:37:58 +02:00
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