BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
179 Commits 15 Branches 0 Tags
186e06bc228927b31ca10119a855dba962ca18cd
Commit Graph

42 Commits

Author SHA1 Message Date
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
tleety effc9ff781 Merge and some small fixes 2015-09-25 01:49:08 +02:00
Jace 5f1963b8bc Complete main menu without event bindings. 2015-09-25 01:29:14 +02:00
tleety c624c5bcf3 Merge master 2015-09-25 00:03:28 +02:00
tleety fa198cf953 Water now rendered in forward rendering 2015-09-24 23:21:46 +02:00
viktorljung bc6b037923 Added submarine pad 2015-09-24 20:54:57 +02:00
viktorljung 72413dc0a9 Added submarine model and texture files 2015-09-24 20:31:47 +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
viktorljung 56549cdf0a Merge remote-tracking branch 'origin/master' into Physics 2015-09-23 15:21:28 +02:00
viktorljung 08d653b0b0 Merge remote-tracking branch 'origin/master' into Physics 2015-09-23 15:14:16 +02:00
Stiffly 346ee13dd5 Stop sound event up and running. 2015-09-23 14:14:11 +02:00
Stiffly 5b6556e9fb Fixed OpenAL Clean-up device. Added playBGM-event. 2015-09-22 16:56:53 +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
Stiffly 4dd8ac8445 Added Component to bricks to emitt sound. Improved code for playing a sound 2015-09-17 15:41:08 +02:00
viktorljung 442554812d Collisions kind of working 2015-09-17 14:11:09 +01:00
Stiffly 6671136a08 Made a Sound folder. Rename class Sound to SoundSystem. 
Also awesome Cmakeness.
 2015-09-17 14:42:33 +02:00
Stiffly 250e70ff50 removing some heavy sound files for you guys 2015-09-17 13:27:31 +02:00
Stiffly 953be0cda9 Merge remote-tracking branch 'origin/master' into Sound 
Conflicts:
	include/Core/Engine.h
 2015-09-17 13:18:56 +02:00
Stiffly 13de4bd1cb Added sound files. Listens to collision events -> play sound. 2015-09-16 16:54:02 +02: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 5e39ac3629 Added a low poly brick model and changed their ingame scale 2015-09-15 18:20:26 +02:00
tleety f19f7bf56a Added a few models and removed ortho camera perspectiv. 2015-09-15 17:05:47 +02:00
Stiffly aec694359c Merge remote-tracking branch 'origin/master' into Sound 2015-09-15 16:09:42 +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
Stiffly 760574f454 Merge remote-tracking branch 'origin/master' into Sound 
Conflicts:
	include/Core/Engine.h
	src/game/CMakeLists.txt
 2015-09-14 14:54:41 +02:00
Stiffly ed5881ec54 Linking OpenAL. 2015-09-14 14:45:44 +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 9867327f7f Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 
Conflicts:
	include/Core/Engine.h
 2015-09-10 22:44:44 +02:00
PlatinumSkink 3e04ff2e34 Gusp. 2015-09-10 22:40:18 +02:00
tleety 8065f6d389 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-10 22:39:23 +02:00
Jace c3f3df3d9f Fixed unit quad with texture coordinates 2015-09-10 22:38:44 +02:00
tleety 9a381e84af Merge remote-tracking branch 'origin/master' into GLrenderer 
# Conflicts:
#	include/Core/Engine.h
 2015-09-10 22:16:15 +02:00
Jace de0b960353 Added unit quad to core assets 2015-09-10 22:09:42 +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