Commit graph

247 commits

Author SHA1 Message Date
Andrew "Akari" Alexeyew
a1647eb786 card2 v2 2012-07-19 19:03:55 +03:00
Andrew "Akari" Alexeyew
e62f44405d second card test 2012-07-19 18:17:45 +03:00
Andrew "Akari" Alexeyew
ba7773792b made the midboss run away and throw some items 2012-07-19 13:50:04 +03:00
Andrew "Akari" Alexeyew
4590e7347e increased health of slave fairies 2012-07-19 13:21:00 +03:00
Andrew "Akari" Alexeyew
639e688e00 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-19 13:14:19 +03:00
Andrew "Akari" Alexeyew
f5cfc3ca45 Added a tunnel recolor shader 2012-07-19 13:13:49 +03:00
laochailan
4cafb89125 relaxed collisions 2012-07-19 10:48:31 +02:00
laochailan
3eb29e575e new wriggle sprite 2012-07-19 09:59:07 +02:00
laochailan
a41a44097a New projectile "soul" 2012-07-18 23:12:31 +02:00
Andrew "Akari" Alexeyew
6c86f89ccd decreased density of final fleas, changed look of some projectiles 2012-07-18 22:59:50 +03:00
Andrew "Akari" Alexeyew
7d36b6525f tweaked the last pre-midboss pattern 2012-07-18 21:36:59 +03:00
Andrew "Akari" Alexeyew
de71b00967 tweaked the spellcard 2012-07-18 21:33:03 +03:00
Andrew "Akari" Alexeyew
825b5281e9 got rid of useless pushmatrix/popmatrix calls 2012-07-18 20:31:19 +03:00
Andrew "Akari" Alexeyew
6019828548 better timing 2012-07-18 20:27:14 +03:00
Andrew "Akari" Alexeyew
0dd3ae4848 first spellcard test 2012-07-18 20:19:14 +03:00
laochailan
d185b7e66d Fixed continue movement bug. for real. 2012-07-18 18:21:59 +02:00
laochailan
8ee27cf6d1 some stage 4 balancing 2012-07-18 17:54:41 +02:00
Andrew "Akari" Alexeyew
d96307e798 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-18 18:21:46 +03:00
laochailan
fe7fe130f7 Stage 4 second half 2012-07-18 17:16:35 +02:00
Andrew "Akari" Alexeyew
08a6c1a3ec made slave fairies run away instead of suiciding 2012-07-18 16:51:22 +03:00
Andrew "Akari" Alexeyew
74db44e5d2 s/wriggle/scuttle/ + removed the midboss dialog 2012-07-18 16:09:43 +03:00
Andrew "Akari" Alexeyew
7ba9ac3426 adjustable color for the boss_zoom shader 2012-07-18 16:02:26 +03:00
Andrew "Akari" Alexeyew
7214c0364f midboss test 2012-07-18 15:50:37 +03:00
Andrew "Akari" Alexeyew
22e74e4c3b easymodo tweak 2012-07-18 15:06:48 +03:00
Andrew "Akari" Alexeyew
0e8e4d338e tweaks 2012-07-18 15:03:40 +03:00
Andrew "Akari" Alexeyew
505670eb4b not enough green 2012-07-18 14:55:34 +03:00
laochailan
1e7e551913 Merge branch 'master' of github.com:laochailan/taisei 2012-07-18 13:43:33 +02:00
laochailan
b4feea1cb6 replacement for strtok_r 2012-07-18 13:42:04 +02:00
Andrew "Akari" Alexeyew
4de5edaa53 no life spawn 2012-07-18 14:27:58 +03:00
Andrew "Akari" Alexeyew
3852f27037 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-18 14:22:54 +03:00
Andrew "Akari" Alexeyew
3077e86b7f Merge remote-tracking branch 'upstream/master' into stage3 2012-07-18 14:22:00 +03:00
Andrew "Akari" Alexeyew
df49a3e320 no evil chars in replays 2012-07-18 14:20:26 +03:00
Andrew "Akari" Alexeyew
47d25ec4b2 better visibility for beginning projs 2012-07-18 14:10:29 +03:00
Andrew "Akari" Alexeyew
13344a4df2 some tweaks 2012-07-18 14:01:51 +03:00
Andrew "Akari" Alexeyew
f590fb4bd8 part of pre-midboss stage (wip) 2012-07-18 13:33:37 +03:00
laochailan
82a82a747f Removed debug timer shift 2012-07-18 11:41:26 +02:00
laochailan
9dfc3b75b2 Used glGetActiveUniform, which seems to be more compatible 2012-07-18 11:40:46 +02:00
laochailan
f9e513c93a Fixed continue controls bug 2012-07-18 11:24:37 +02:00
laochailan
0aa0a5200d Made Kurumi Slaves looks special. 2012-07-18 11:21:53 +02:00
laochailan
c85172230b Stage 4 midboss 2012-07-18 10:49:37 +02:00
Andrew "Akari" Alexeyew
b5f0d50761 some tweaks 2012-07-17 19:10:31 +03:00
Andrew "Akari" Alexeyew
4899f1b2be fixed white gaps 2012-07-17 18:55:26 +03:00
Andrew "Akari" Alexeyew
8cdf833787 s/tunel/tunnel/, fuck me 2012-07-17 18:42:21 +03:00
Andrew "Akari" Alexeyew
8d4fd87e96 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-17 18:35:30 +03:00
Andrew "Akari" Alexeyew
2abcf4d9ca stupid printf 2012-07-17 18:35:06 +03:00
Andrew "Akari" Alexeyew
69c1c4fd42 stage 3 pre-midboss background 2012-07-17 18:34:18 +03:00
laochailan
3b0b31094d Fixed invalid write in replay menu 2012-07-17 14:38:02 +02:00
laochailan
60538c33ce Merge branch 'master' of github.com:laochailan/taisei 2012-07-17 14:33:53 +02:00
laochailan
f379860e4c Added Stage 4 first half 2012-07-17 14:33:18 +02:00
laochailan
adfa2fa9c6 Merge pull request #9 from nexAkari/master
fixes
2012-07-17 02:22:59 -07:00