laochailan
|
a8251b1966
|
Merge branch 'master' into stage6
Conflicts:
shader/laser_snippets
src/CMakeLists.txt
src/global.h
src/projectile.c
src/stage.c
src/stage.h
src/stages/stage3.c
src/stages/stage3_events.c
src/stages/stage4_events.c
|
2012-08-03 16:55:10 +02:00 |
|
laochailan
|
2710764bd9
|
maxwell shader + rebalanced
|
2012-07-31 22:12:09 +02:00 |
|
Andrew "Akari" Alexeyew
|
ef5c9d695a
|
removed a dublicate definition of angle()
|
2012-07-28 11:35:37 +03:00 |
|
Andrew "Akari" Alexeyew
|
e78b5d715e
|
Merge remote-tracking branch 'upstream/master' into stage3
|
2012-07-28 11:29:58 +03:00 |
|
laochailan
|
0d00fdee95
|
fixed lasers, added SmartResize(tm)
|
2012-07-28 10:16:59 +02:00 |
|
Andrew "Akari" Alexeyew
|
7ce03ae9d2
|
Added shader-calculated positions for the sine laser rules; Fixed a stage3 segfault
|
2012-07-27 23:27:46 +03:00 |
|
laochailan
|
97727e6992
|
added shader based laser drawing
|
2012-07-26 16:49:41 +02:00 |
|
laochailan
|
39e1277b33
|
added snippet shader loader
|
2012-07-26 13:31:32 +02:00 |
|