Commit graph

19 commits

Author SHA1 Message Date
Andrew "Akari" Alexeyew
389cf17827 Merge remote-tracking branch 'upstream/stage5' into stage3
Conflicts:
	src/laser.c
	src/laser.h
2012-07-27 21:55:34 +03:00
laochailan
92a31df838 Merge branch 'new-laser' into stage5 2012-07-26 18:18:17 +02:00
laochailan
76b039d767 cleaned create_laserline 2012-07-26 18:17:56 +02:00
laochailan
b85cbc457f Merge branch 'master' into stage5 2012-07-26 18:15:49 +02:00
laochailan
017dfbd812 fixed behavior of static lasers 2012-07-26 18:14:33 +02:00
laochailan
01dba81673 Merge branch 'master' into stage5
Conflicts:
	src/laser.c
	src/laser.h
	src/stages/stage4_events.c
2012-07-26 17:06:38 +02:00
laochailan
f2c630a163 fixed directional laser creation 2012-07-26 10:53:46 +02:00
laochailan
0d469632fa Merged line lasers and curve lasers 2012-07-26 10:14:59 +02:00
Andrew "Akari" Alexeyew
f9af71799d another test 2012-07-24 15:47:52 +03:00
Andrew "Akari" Alexeyew
c7bfb874c1 TEST: sine pattern for mah lazorz 2012-07-24 15:38:35 +03:00
laochailan
c29cd0e45b Merge branch 'master' into stage5
Conflicts:
	src/laser.c
2012-07-23 08:51:52 +02:00
laochailan
b633387d56 s/laser.pos0/laser.dir + stupid error 2012-07-22 22:13:39 +02:00
laochailan
f7b2c9c6c0 changed create_laser* interface 2012-07-22 21:58:00 +02:00
laochailan
fd07358a1e stage5 first two third of the first half 2012-07-22 20:09:51 +02:00
laochailan
5005cf6959 Fixed lasers 2012-07-14 10:29:21 +02:00
laochailan
d9fdc2aa0e Dialogs! conversational~
fun fact: taisei might build with -Wall -Werror now.
2011-05-08 13:48:25 +02:00
laochailan
3f2885e185 fix: memleaks
there were some memleaks I left out of laziness. fixed.
2011-04-26 22:39:50 +02:00
laochailan
72286b4529 projectile coloring by shader 2011-04-26 16:55:18 +02:00
laochailan
d280d8c8ad laz0rs
added straight and curved types of lasers. I'm searching for a better way to render them though. also, renewal of Youmu's shot, inspired by th13.
2011-04-24 15:39:17 +02:00