Commit Graph

34 Commits (b02e5db10c714141e62ac9caa5c80c1e9af7940a)

Author SHA1 Message Date
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 4557eca75a Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 22:15:56 +02:00
Steve Clement 36983ea6f9 - pin mouse follow place holder 2014-08-30 22:15:52 +02:00
Raphaël Vinot 0a7e6853df Merge branch 'master' of github.com:lvl2/avocados
Conflicts:
	game.py
2014-08-30 22:14:42 +02:00
Raphaël Vinot dd49ec5b5c Allow to quit again, keep the score after the game is over. 2014-08-30 22:13:53 +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 a111367e53 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 22:02:21 +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
Steve Clement 0557712ed4 - Added background 2014-08-30 21:50:50 +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 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 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
David Raison 74469356ae Fixed merge conflict 2014-08-30 18:49:41 +02:00
David Raison 97ae892f2d Added lawyer class 2014-08-30 18:46:55 +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
Steve Clement 4fddd144d4 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 17:11:35 +02:00
Steve Clement 8266e3f1d8 - perms 2014-08-30 17:11:31 +02:00
David Raison fe44b1d628 Increase score simply on clicking for now 2014-08-30 17:05:01 +02:00
David Raison a8addce0f4 use a class for the hud 2014-08-30 16:53:03 +02:00
David Raison 2ab3d85c71 Display game over when time is up 2014-08-30 16:28:56 +02:00
David Raison 7f3e0b210b Added fps, time left 2014-08-30 16:06:02 +02:00
David Raison 80e0b7be4e Display current score in the upper left corner 2014-08-30 15:52:27 +02:00
David Raison c241f279bd Added empty init file to support folder 2014-08-30 15:38:47 +02:00
David Raison a213b51705 Added bare-bones game.py 2014-08-30 15:28:07 +02:00