BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
324 Commits 15 Branches 0 Tags
46fca005bf4f2711abf92b8403390b4be8f88c66
Commit Graph

63 Commits

Author SHA1 Message Date
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
viktorljung 9fe2324913 Lifebuoy updated, now dies after 4 hits 2015-10-08 21:51:43 +02:00
Stiffly 96ccef6ed8 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-08 21:44:50 +02:00
Stiffly 2545cef90f temporary particles for demo. trails for bricks, and on brick hit. 2015-10-08 21:41:01 +02:00
Stiffly 706e720ae8 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Physics/ContactListener.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 21:39:48 +02:00
viktorljung 52ab09d0b1 Added brick models and Lifebuoy balance changes 2015-10-08 20:08:42 +02:00
Stiffly 143bff2d9e Added two new particle sprites. 2015-10-08 18:19:15 +02:00
viktorljung b93013fcd8 Lifebuoy working 2015-10-08 17:22:19 +02:00
viktorljung 18ffddb2ac White bricks added 2015-10-08 14:03:38 +02:00
viktorljung f085e6a387 Water can now collide with the bricks, added new ship model 2015-10-08 11:27:17 +02:00
viktorljung 791c3ce69c Some fixes to the brick models 2015-10-06 15:30:11 +02:00
viktorljung 43e0a5b699 Rectangle shape now has the size of the rigidbody, not scale 2015-10-06 13:31:23 +02:00
viktorljung 005fd40167 Added IceBrick and started to remove the scale dependency for physics bodies 2015-10-05 16:25:00 +02:00
viktorljung 39f4215c2b Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Physics/PhysicsSystem.h
	src/game/Physics/PhysicsSystem.cpp
 2015-10-01 14:13:51 +02:00
viktorljung cbaca42a3c Changed SquidModel 2015-10-01 14:04:21 +02:00
Jace 5e0b0f920a Fixed your asset loading fuckups 2015-09-28 22:46:35 +02:00
viktorljung ad299ad2e5 Merge remote-tracking branch 'origin/master' into Physics 2015-09-25 05:34:00 +02:00
Jace 7b47385674 Working NumberFrame and score indicator 2015-09-25 05:30:59 +02:00
viktorljung 96511c63b1 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-09-25 05:16:32 +02:00
viktorljung cfb6d1e4b5 Falling bricks and collision filters 2015-09-25 04:28:46 +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
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