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

90 Commits (9f023b0c7d603ad200b907710e6635b4b43181cf)

Author SHA1 Message Date
David Raison 9f023b0c7d Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 01:12:46 +02:00
David Raison b7748361ca Fixed merge conflict 2014-08-31 01:12:39 +02:00
Steve Clement 7d47746e7d - autoMagic resize 2014-08-31 01:07:45 +02:00
David Raison 0705a5fac3 refactored pinned avocados 2014-08-31 01:07:12 +02:00
Steve Clement f77f15c0f3 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 01:03:43 +02:00
Steve Clement ac5f768157 - rename lawyer class to crystal class 2014-08-31 01:03:39 +02:00
Raphaël Vinot a688c555eb add splash screen 2014-08-31 00:54:33 +02:00
David Raison ceb3316755 Tiny changes 2014-08-31 00:47:36 +02:00
David Raison 025f2e7e66 fixed a missing self 2014-08-31 00:15:36 +02:00
David Raison 6857d5cca3 resolved merge conflict 2014-08-31 00:05:24 +02:00
David Raison 84d431b81e more refactoring 2014-08-31 00:02:36 +02:00
Steve Clement f5e14a4862 - Added crystall ball lawyer CCBYSANC 2014-08-31 00:00:50 +02:00
David Raison 2168d2376c started refactoring main class 2014-08-30 23:57:31 +02:00
Steve Clement 806aacd59a Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 23:46:30 +02:00
Steve Clement 9149c5201f - fade out when gameOvering 2014-08-30 23:46:28 +02:00
David Raison 9bcf82045a Moar randomness 2014-08-30 23:45:04 +02:00
David Raison 1ceb6b7d5c Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 23:34:55 +02:00
David Raison 5a49e3474f ah, dunno 2014-08-30 23:34:52 +02:00
Raphaël Vinot b7c34c429f pin the avocado 2014-08-30 23:34:15 +02:00
Steve Clement 97b59f5218 - added gameOver method and pic 2014-08-30 23:27:24 +02:00
Steve Clement f0d6fe8784 - Added level musix 2014-08-30 23:15:35 +02:00
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