syn2cat
/
avocados
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
69 Commits
1 Branch
0 Tags
170 MiB
Commit Graph

69 Commits (ce515a898d67808408bde0c6a3624764086934cd)

Author SHA1 Message Date
David Raison ce515a898d Solved another merge conflict 2014-08-30 23:13:16 +02:00
David Raison 0d4ce50718 fixed merge conflict 2014-08-30 23:10:41 +02:00
Steve Clement ae2144c293 - no plays sound on-click 2014-08-30 23:05:20 +02:00
David Raison e5a0c81056 ugly code to switch levels 2014-08-30 23:03:51 +02:00
Steve Clement 5bcaf35aca - moved sound initialization and pygame init to __init__ of TheGame 2014-08-30 23:03:14 +02:00
Steve Clement 945e55c100 - refactored sound to be in the TheGame class 2014-08-30 22:59:38 +02:00
David Raison fd8cbc74d0 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 22:48:56 +02:00
David Raison 4ecc9bf928 next level 2014-08-30 22:48:49 +02:00
Steve Clement bda1dc4835 - graceful exit 2014-08-30 22:42:20 +02:00
Steve Clement b02e5db10c - no changes are good changes? 2014-08-30 22:41:26 +02:00
Steve Clement 143ebf4e6a - graceful exit 2014-08-30 22:33:57 +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 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 a2e21a6be1 - bg image 2014-08-30 22:04:34 +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 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 657e3a963a Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 20:50:34 +02:00
David Raison bfa10307db Fixed merge conflict 2014-08-30 20:50:24 +02:00
Steve Clement b08c641456 - Avocado Mashed :( 200x139 2014-08-30 20:50:19 +02:00
David Raison 42652e0a34 Added colored pane 2014-08-30 20:47:21 +02:00
Steve Clement 97c012c2b9 - less blueish 2014-08-30 19:03:57 +02:00
Steve Clement 533edaf30a Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 19:02:57 +02:00
Steve Clement 33a32911c9 - Splashscreen 1080x720 2014-08-30 19:02:50 +02:00
Raphaël Vinot 3e84222003 cleanup avocado 2014-08-30 19:01:48 +02:00
David Raison b41c4a3180 Added comments to lawyer class 2014-08-30 18:53:38 +02:00
Raphaël Vinot ddebb1a452 Use proper image 2014-08-30 18:50:21 +02:00
David Raison 865ce4fbd3 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 18:49:48 +02:00
David Raison 74469356ae Fixed merge conflict 2014-08-30 18:49:41 +02:00
Steve Clement b3843ad3b5 - The second protagonist has landed in: 200x196 but blueish glow :( 2014-08-30 18:48:54 +02:00
David Raison 97ae892f2d Added lawyer class 2014-08-30 18:46:55 +02:00
Steve Clement 58f72cb2b3 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 18:44:22 +02:00
Steve Clement e7cf9296a8 - The protagonist has landed in: 200x152 2014-08-30 18:44:16 +02:00
Raphaël Vinot 4aaf0beb26 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 18:43:27 +02:00
Raphaël Vinot 7c657961f8 make the avocados move 2014-08-30 18:43:19 +02:00
Steve Clement 4df571912b - first pin :) 100x39 2014-08-30 18:28:24 +02:00