Commit Graph

549 Commits

Author SHA1 Message Date
tleety 46f6289720 Fixed so the game does not crash if it cant find data in the config file 2015-10-15 12:35:58 +02:00
Stiffly bb23d5a8c4 Added hover and click sounds. Cleanup in SoundSystem. 2015-10-15 12:33:49 +02:00
tleety 52fe2e697e Added a config file and implemented code for it 2015-10-15 12:15:53 +02:00
PlatinumSkink 4abce7b17f CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences. 2015-10-15 11:11:06 +02:00
PlatinumSkink 44f2cf72ac Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-15 10:24:13 +02:00
PlatinumSkink 0650e7c061 Basis of RaiseWater implemented in a way that doesn't work with our amount of lag. 2015-10-15 10:20:05 +02:00
Stiffly 816ff6a8e1 Merge remote-tracking branch 'origin/master' into Sound 2015-10-15 10:16:38 +02:00
PlatinumSkink 724d4e7e69 If stuck to pad, do not come into contact with other things. 2015-10-14 18:53:45 +02:00
PlatinumSkink 55cc1f5b69 ScreenShakeSystem made. And some other things. 2015-10-14 18:52:04 +02:00
Stiffly 46f3a9f72e Refactored CParticle->Radius to CParticle->Scale. Reviewed by Tobias Dahl aka Tleety. 2015-10-14 18:29:43 +02:00
tleety 5da96f40f3 Fixed so 42+ combo particle is shown when you have 42+ combo 2015-10-14 18:19:45 +02:00
tleety 6c41911233 Combos now show up as a particle when it is reset 2015-10-14 18:07:15 +02:00
Stiffly cbb6e7a04f Trail to individual brick debris.
Counter the particle spawn bug.
The bug occurs when the position is read as (0, 0) from the emitter. Similar particle removal bug appears when particles are deleted. Counterered  by deleting particle entities a little time before b2particles.
2015-10-14 17:40:24 +02:00
tleety 471fbacfd6 Changed how the score background is rendered and added some combo numbers 2015-10-14 17:16:16 +02:00
tleety ccda769116 Added a texture for the score background 2015-10-14 15:46:13 +02:00
Stiffly e9ca58de64 Merge branch 'master' into water
Conflicts:
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
2015-10-14 15:43:34 +02:00
PlatinumSkink 8e32574692 Removed unnecessary Cout to avoid annoying others. 2015-10-13 18:37:46 +02:00
PlatinumSkink b94eeac2cd Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 18:34:46 +02:00
PlatinumSkink ffea58d41f ScreenShake works as intended at the press of E and upon calling the event. 2015-10-13 18:34:21 +02:00
viktorljung e6cffcb217 Merge remote-tracking branch 'origin/master' into Physics 2015-10-13 18:03:15 +02:00
PlatinumSkink 8762fe3513 Fixed minor sticky bug. 2015-10-13 18:01:10 +02:00
PlatinumSkink 1b4c38c292 Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 17:52:30 +02:00
viktorljung 8b218a0103 Next level now working 2015-10-13 17:51:37 +02:00
viktorljung a5cb1ed77a Spin fixed 2015-10-13 17:47:53 +02:00
PlatinumSkink f773458654 Merge branch 'LevelSystemAndSuch' 2015-10-13 17:45:34 +02:00
tleety 1e4e278ef6 Added score background stuff 2015-10-13 17:45:15 +02:00
Stiffly 5955a888d2 Merge remote-tracking branch 'origin/master' into water
Conflicts:
	src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:44:05 +02:00
Stiffly 5040ff4649 added a radius distribution to randomize the scale. 2015-10-13 17:39:40 +02:00
viktorljung 40054cb40f Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
	src/game/Game/LevelSystem.cpp
2015-10-13 17:32:07 +02:00
PlatinumSkink 36d0601dfd Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad. 2015-10-13 17:28:31 +02:00
viktorljung f86dc9a530 Needs some spinfixing 2015-10-13 17:20:32 +02:00
Stiffly 1065d3abc3 Merge remote-tracking branch 'origin/master' into water
Conflicts:
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:02:31 +02:00
tleety 4857e387ad Added some new fonts 2015-10-13 17:02:20 +02:00
viktorljung b8e1f6fcde Added brick break, needs more work with the removal code and particles 2015-10-13 16:18:46 +02:00
Stiffly 94cac38cc6 "Lightening" particle bugg fixed. Scale and alpha interpolation implemented through ScalarInterpolation-funtion 2015-10-13 15:22:11 +02:00
tleety c20b9a35b3 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-13 15:09:33 +02:00
tleety c431193764 Some debug code 2015-10-13 15:09:00 +02:00
PlatinumSkink 40343744c1 Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green. 2015-10-13 14:02:18 +02:00
PlatinumSkink 1a070d8ce8 Merge branch 'master' into LevelSystemAndSuch 2015-10-13 13:37:08 +02:00
PlatinumSkink 32bbf282c9 Aimer for Sticky Works, though stuff. 2015-10-12 18:18:37 +02:00
tleety cd64531307 Merged with master and fixed some small variable things 2015-10-12 17:18:44 +02:00
tleety c2b1211be8 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-12 16:53:08 +02:00
tleety 52e2ce567a Power up sprites now show when you hit powerup bricks 2015-10-12 16:48:04 +02:00
PlatinumSkink 02d724fedd Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-12 16:47:24 +02:00
PlatinumSkink 5630771272 Fixed Sticky after Ink bug, fixed directions on Squid after sticky, laser direction is in background. Brick Components implemented, though they do nothing. 2015-10-12 16:45:59 +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