24 Commits (97b59f52186351b85eb0a1d8110250fa03062f32)

Author	SHA1	Message	Date
David Raison	0d4ce50718	fixed merge conflict	2014-08-30 23:10:41 +02:00
David Raison	e5a0c81056	ugly code to switch levels	2014-08-30 23:03:51 +02:00
Steve Clement	945e55c100	- refactored sound to be in the TheGame class	2014-08-30 22:59:38 +02:00
David Raison	4ecc9bf928	next level	2014-08-30 22:48:49 +02:00
David Raison	3ff7fac4dc	fixed color setting, changing color when correct one was clicked	2014-08-30 22:33:10 +02:00
David Raison	e060f746b2	Objectified the game	2014-08-30 22:16:41 +02:00
Steve Clement	e5a7107903	Merge branch 'master' of github.com:lvl2/avocados ... Conflicts: avocado.py	2014-08-30 22:03:55 +02:00
David Raison	1b07b502bb	Added pygame to requiremens.txt	2014-08-30 22:02:17 +02:00
Steve Clement	c81bcc0974	- try catch for soundless people :D	2014-08-30 22:02:08 +02:00
David Raison	1c21c151e8	Substract points if hitting the wrong avocado	2014-08-30 21:50:26 +02:00
Steve Clement	c1f1c85d45	- Added initial sound class	2014-08-30 21:41:53 +02:00
David Raison	7260765327	Fixed a missing change	2014-08-30 21:24:58 +02:00
David Raison	12f3e083c6	resolved merge conflict	2014-08-30 21:23:42 +02:00
David Raison	d954d98f2b	Introduced more randomness	2014-08-30 21:20:42 +02:00
Raphaël Vinot	e2075f33a5	Make the avocados clickable	2014-08-30 21:11:10 +02:00
David Raison	85a79e07af	increased avocado size	2014-08-30 20:55:40 +02:00
David Raison	fdae2d2c07	have colored avocados	2014-08-30 20:53:47 +02:00
David Raison	bfa10307db	Fixed merge conflict	2014-08-30 20:50:24 +02:00
David Raison	42652e0a34	Added colored pane	2014-08-30 20:47:21 +02:00
Raphaël Vinot	3e84222003	cleanup avocado	2014-08-30 19:01:48 +02:00
Raphaël Vinot	ddebb1a452	Use proper image	2014-08-30 18:50:21 +02:00
Raphaël Vinot	7c657961f8	make the avocados move	2014-08-30 18:43:19 +02:00
Raphaël Vinot	26147e1182	add move function	2014-08-30 18:20:49 +02:00
David Raison	aa76ab2299	Created avocado module	2014-08-30 17:59:20 +02:00