Commit Graph

143 Commits (master)

Author SHA1 Message Date
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
Raphaël Vinot 26147e1182 add move function 2014-08-30 18:20:49 +02:00
David Raison fd952fdf43 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 18:00:12 +02:00
David Raison aa76ab2299 Created avocado module 2014-08-30 17:59:20 +02:00
Steve Clement c1bc5fabba Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 17:44:26 +02:00
Steve Clement 4e382beef5 - dirty sounds done. Can be tweak as we go crazy along the way 2014-08-30 17:43:58 +02:00
David Raison 3ac4286668 Moved color surface away 2014-08-30 17:24:11 +02:00
David Raison 56c7d3f241 Merge branch 'master' of github.com:lvl2/avocados 2014-08-30 17:20:29 +02:00
David Raison a1461c4430 Added hourglass icon 2014-08-30 17:20: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
David Raison 6aaf5755f6 Added support files 2014-08-30 15:19:15 +02:00
David Raison cfb0b074bb Initial commit 2014-08-30 15:16:10 +02:00