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

127 Commits (743d0994dfed44d5f991eced28767baa3ebf3a29)

Author SHA1 Message Date
David Raison 743d0994df All is well ;) 2014-08-31 12:08:00 +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
Steve Clement fd2f247d78 - Added different colored Avo's 2014-08-31 11:18:32 +02:00
Raphaël Vinot 3c5172f08c Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 10:45:10 +02:00
Raphaël Vinot 1538609e81 Fix scoring 2014-08-31 10:45:06 +02:00
Steve Clement a16d25b766 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 10:44:51 +02:00
Steve Clement 7eb0e813d4 - Added Alpha channel to lawyer pic, added q/esc to exit 2014-08-31 10:44:46 +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 f45632acee Fix last commit 2014-08-31 10:25:37 +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
David Raison 1a32547801 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 10:06:27 +02:00
David Raison a6b3359856 Introduced self-drawing text 2014-08-31 10:06:22 +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
Steve Clement e7a151492e - added PNG24 pin and edited out rough edges 2014-08-31 09:14:57 +02:00
David Raison 9a6954ac8a Added some comments 2014-08-31 03:44:49 +02:00
David Raison 9c24f74930 Increased initial pin flight speed 2014-08-31 03:41:08 +02:00
David Raison b42b89db10 Added pin being thrown at a position. Needs refinement 2014-08-31 03:39:02 +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
Steve Clement df20b93cc3 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 02:04:14 +02:00
Steve Clement 7eec8ce9ac - reCropped lawyer and adjusted offsets 2014-08-31 02:04:04 +02:00
Raphaël Vinot 8deb08d9b1 Cleanup the avocado generation 2014-08-31 01:52:54 +02:00
David Raison f98940e307 Fixed merge conflict 2014-08-31 01:39:09 +02:00
David Raison f11f6f3c2e Fixed next level msg 2014-08-31 01:38:26 +02:00
Steve Clement f3f94ae861 - reAdded gameOver on exit 2014-08-31 01:32:07 +02:00
David Raison af9c1de586 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 01:24:14 +02:00
David Raison dcf74de266 Ah.. stuff 2014-08-31 01:24:10 +02:00
Steve Clement 0fada72803 - regression fix… 2014-08-31 01:18:34 +02:00
David Raison 0bbda0fd42 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 01:15:27 +02:00
David Raison 6b94184a96 reduced hud size 2014-08-31 01:15:24 +02:00
Steve Clement 63596d02d4 Merge branch 'master' of github.com:lvl2/avocados 2014-08-31 01:15:11 +02:00
Steve Clement 5056573c75 - static 800x600 for now 2014-08-31 01:15:03 +02:00
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