Commit Graph

192 Commits

Author SHA1 Message Date
viktorljung 03e2078cfb Pad modifies ball path and ball facing its direction 2015-09-23 15:12:18 +02:00
PlatinumSkink 1b0d87e862 Adjusted Power-Up Code 2015-09-23 14:23:41 +02:00
Stiffly 346ee13dd5 Stop sound event up and running. 2015-09-23 14:14:11 +02:00
Stiffly 4f341250d7 Updated playsound events. 2015-09-23 12:08:05 +02:00
tleety 8e2eb63c5e Added renderQueue for water and created buffers for the water to use. 2015-09-23 12:07:28 +02:00
PlatinumSkink f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. 2015-09-22 17:55:12 +02:00
Stiffly a010a8be77 Clean-up sources. 2015-09-22 17:44:40 +02:00
Stiffly 5b6556e9fb Fixed OpenAL Clean-up device. Added playBGM-event. 2015-09-22 16:56:53 +02:00
tleety 94401a10ee Water working, might not work for several bodies 2015-09-22 16:06:47 +02:00
PlatinumSkink 2797a0f6c3 Merge branch 'master' into LevelSystemAndSuch 2015-09-22 14:49:50 +02:00
Stiffly 3f4ede4b7d OpenAL fixed. CMake path set correctly. 2015-09-22 14:32:04 +02:00
tleety 1e70e151ee Continued work on water, can now get 1 particle? maybe? Gotta get rendering to work so i can test it. 2015-09-21 16:00:20 +02:00
Stiffly 7e9e19039c removing unnecessary print 2015-09-21 14:49:47 +02:00
PlatinumSkink dbb04c83af Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-21 13:27:54 +02:00
PlatinumSkink 460c7042bf MultiBalls appear depending on pad's position 2015-09-21 13:25:20 +02:00
PlatinumSkink 761631c4a6 m-button is MultiBall powerup. Still needs fine-tuning. 2015-09-17 18:09:22 +02:00
Stiffly 2a4c7c8b1a Resourcing working on sounds. Added class Sound resource. 2015-09-17 17:50:00 +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
tleety b69413d9c9 Base water set up 2015-09-17 17:35:17 +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 c0155b7900 collisions remade 2015-09-17 16:52:43 +02:00
Stiffly 587b712f49 Merge remote-tracking branch 'origin/master' into Sound 2015-09-17 15:41:36 +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
tleety 692e0ca9df Fixed a bug where models normal and specular maps is not loaded. 2015-09-17 14:37:00 +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
PlatinumSkink bc5a5e5e92 Adjusted model and position of displayed lives. 2015-09-16 16:49:52 +02:00
PlatinumSkink bdba34e8e1 Reset ball is also octopus. 2015-09-16 16:35:41 +02:00
PlatinumSkink 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 16:29:57 +02:00
tleety c311408346 Ball size fix 2015-09-16 16:23:59 +02:00
tleety a5ffce8db8 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 16:17:39 +02:00
tleety 12273f66af Ball size fix 2015-09-16 16:17: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
PlatinumSkink 8f513e3281 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 15:49:36 +02:00
Jace 12dc837f51 Tests for entity cloning 2015-09-16 15:26:40 +02:00
Jace 9396f9391f Tests for EventBroker 2015-09-16 15:26:30 +02:00
tleety 20fc1232d6 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 14:42:38 +02:00
Jace 4cfa0ef624 Fixed event broker unsubscribe bug where event relay would still think it belonged to a broker after unsubscribed 2015-09-16 12:54:34 +02:00
PlatinumSkink 5ee5400a28 StyleGuide Fix 2015-09-15 18:48:26 +02:00
tleety 5e39ac3629 Added a low poly brick model and changed their ingame scale 2015-09-15 18:20:26 +02:00
Stiffly 450a73f498 added a PlaySound Event. 2015-09-15 18:16:32 +02:00
tleety 4891a4d939 Bricks are now models. Warning: Laggy 2015-09-15 17:56:23 +02:00
tleety ef9f6a296b Renderer working and some test blocks in the world 2015-09-15 17:38:16 +02:00
PlatinumSkink 990f31d120 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-15 17:32:34 +02:00
PlatinumSkink 0f96baedfa Merge branch 'master' into LevelSystemAndSuch 2015-09-15 17:31:53 +02:00
PlatinumSkink c2d29b6110 Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed. 2015-09-15 17:31:22 +02:00
Jace e31f5e054e Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-15 17:11:35 +02:00