 Steve Clement
|
e7966ba408
|
Merge branch 'master' of github.com:lvl2/avocados
Conflicts:
avocado.py
|
2014-08-31 12:12:57 +02:00 |
|
Steve Clement
|
37f6daab71
|
- Added more beautiful colored Avocados
- update os.path join stuff
|
2014-08-31 12:04:45 +02:00 |
Raphaël Vinot
|
e98f94575b
|
Fix issue wit color
|
2014-08-31 11:52:40 +02:00 |
|
David Raison
|
b9e10650be
|
Merge branch 'master' of github.com:lvl2/avocados
|
2014-08-31 11:48:25 +02:00 |
|
David Raison
|
b702494c65
|
Do collision detection on the glassball
|
2014-08-31 11:48:20 +02:00 |
|
Raphaël Vinot
|
1538609e81
|
Fix scoring
|
2014-08-31 10:45:06 +02:00 |
|
David Raison
|
c6e35bf61e
|
Merge branch 'master' of github.com:lvl2/avocados
|
2014-08-31 10:29:08 +02:00 |
|
David Raison
|
13786f52cb
|
tiny improvements
|
2014-08-31 10:29:04 +02:00 |
|
Raphaël Vinot
|
61ffeb267a
|
Merge branch 'master' of github.com:lvl2/avocados
|
2014-08-31 10:20:20 +02:00 |
|
David Raison
|
633be6c6c0
|
Added missing fileg
|
2014-08-31 10:20:12 +02:00 |
|
Raphaël Vinot
|
1e4bfd1ed5
|
Merge branch 'master' of github.com:lvl2/avocados
Conflicts:
avocado.py
game.py
|
2014-08-31 10:19:25 +02:00 |
|
Raphaël Vinot
|
cdc81ffbc2
|
make sure the pin hit the center of the avocado.
|
2014-08-31 10:15:28 +02:00 |
|
Steve Clement
|
045737f7a4
|
- MOdified some sounds and added a fail sound
- Modified the splash screen (higher Quali differen font)
- ABleton Project also updated
|
2014-08-31 10:04:20 +02:00 |
|
David Raison
|
feea1079e9
|
Slightly better balance
|
2014-08-31 02:36:21 +02:00 |
|
David Raison
|
a2591a1ef6
|
Brought back Rafi0ts pinned avocados
|
2014-08-31 02:24:02 +02:00 |
|
Raphaël Vinot
|
8deb08d9b1
|
Cleanup the avocado generation
|
2014-08-31 01:52:54 +02:00 |
|
David Raison
|
f11f6f3c2e
|
Fixed next level msg
|
2014-08-31 01:38:26 +02:00 |
|
David Raison
|
0705a5fac3
|
refactored pinned avocados
|
2014-08-31 01:07:12 +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 |
|
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 |