80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity
762 commits 81 branches 14 tags 833 MiB
Commit graph

677 commits

Author SHA1 Message Date
laochailan
fd9c35086d free before if 2012-08-05 00:44:08 +02:00
laochailan
c6c43f346c malloc size fix 2012-08-05 00:09:37 +02:00
Andrew "Akari" Alexeyew
5f7eae47a5 fixed a merge error 2012-08-05 00:24:27 +03:00
laochailan
e01d54ba15 character dependant dialogs 2012-08-04 17:37:04 +02:00
Andrew "Akari" Alexeyew
7ada0477d9 a break to prevent potential breakages. 2012-08-04 08:18:28 +03:00
Andrew "Akari" Alexeyew
610332bc2f got rid of the N. numeration in stageselect 2012-08-04 07:41:47 +03:00
Andrew "Akari" Alexeyew
a94479cecf replayover menu 2012-08-04 07:37:59 +03:00
Andrew "Akari" Alexeyew
4abcedba6d made it use SDL key repeat 2012-08-04 06:36:00 +03:00
Andrew "Akari" Alexeyew
7bf77dda5e Merge remote-tracking branch 'upstream/master' 2012-08-04 06:30:42 +03:00
Andrew "Akari" Alexeyew
b3219a3030 some ui tweaks and fixes 2012-08-04 05:57:26 +03:00
laochailan
f8bbfd0c7b stupid gcc warning 2012-08-03 20:05:32 +02:00
laochailan
10df99c337 Merge branch 'master' of github.com:laochailan/taisei 2012-08-03 19:59:09 +02:00
laochailan
eb975ea694 new menu bg 2012-08-03 19:58:21 +02:00
laochailan
c216fc80b8 Merge pull request #22 from nexAkari/randfixes 
Randfixes
 2012-08-03 10:31:25 -07:00
Andrew "Akari" Alexeyew
adb7ddb89a added a sanity check 2012-08-04 04:30:40 +03:00
Andrew "Akari" Alexeyew
60a0b3e2a1 (hopefully) cleaned everything else 2012-08-04 04:25:43 +03:00
Andrew "Akari" Alexeyew
fff1998e83 cleaned stage6 2012-08-04 04:15:36 +03:00
Andrew "Akari" Alexeyew
5e0f7f0b04 cleaned stage 5 2012-08-04 04:06:22 +03:00
Andrew "Akari" Alexeyew
f65a61d169 cleaned stage4 2012-08-04 04:00:17 +03:00
Andrew "Akari" Alexeyew
5313e309bc cleaned stage3 2012-08-04 03:56:51 +03:00
Andrew "Akari" Alexeyew
a7c6ad15d3 array system for tsrand; cleaned the first stage 2012-08-04 03:49:12 +03:00
laochailan
7fa1e2dfe8 fixed Enter behaviour in menus 2012-08-03 18:25:15 +02:00
laochailan
72d789ab5a Merge branch 'master' into stage6 2012-08-03 17:07:07 +02:00
laochailan
62621ae345 removed some ancient comments 2012-08-03 17:06:25 +02:00
laochailan
fe7cd62545 min/max #undef for mingw compatibility 2012-08-03 16:57:29 +02:00
laochailan
e12ca477f1 added files 2012-08-03 16:57:11 +02:00
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
40d9e9c0a4 stage rename 2012-08-03 16:30:32 +02:00
Andrew "Akari" Alexeyew
4c26024eab ifdef'd stgframes 2012-08-04 00:29:27 +03:00
Andrew "Akari" Alexeyew
4ade93c64f background tweaks 2012-08-04 00:23:18 +03:00
Andrew "Akari" Alexeyew
eaf1da8cab more sane bomb drops 2012-08-03 23:40:09 +03:00
Andrew "Akari" Alexeyew
6be163e0bb more random changes 2012-08-03 20:40:54 +03:00
laochailan
3d5f97f623 rebalancing ... 2012-08-03 15:28:03 +02:00
laochailan
8bd9a5b291 making it possible on lunatic 2012-08-03 15:03:50 +02:00
laochailan
b2bd9c448e dialogs and last spell rebalanced 2012-08-03 14:59:41 +02:00
laochailan
45248df68a real full stage test 2012-08-03 14:02:18 +02:00
laochailan
b3dc3035f7 full stage test 2012-08-03 14:01:30 +02:00
laochailan
acb1b84db8 new last spell 2012-08-03 12:14:42 +02:00
laochailan
37d7048631 Merge branch 'master' into stage6 2012-08-03 09:40:04 +02:00
laochailan
aa2675f177 Merge branch 'master' into stage6 2012-08-03 09:37:55 +02:00
laochailan
b26008edc2 uncomment stuff 2012-08-03 09:37:38 +02:00
laochailan
49fbf4f92a Tower of Truth ~ Theory of Everything 2012-08-03 09:36:35 +02:00
Andrew "Akari" Alexeyew
5e83ec3ab2 Merge remote-tracking branch 'upstream/master' into stage3 2012-08-03 08:49:46 +03:00
Andrew "Akari" Alexeyew
b38717e6cd enabled the whole stage, reduced time for the last spell, some other things I forgot about 2012-08-03 02:50:06 +03:00
Andrew "Akari" Alexeyew
bf8fbe62fc less hp and time for normal attacks 2012-08-03 02:07:09 +03:00
Andrew "Akari" Alexeyew
f060093f53 made some random changes to the normal attacks 2012-08-03 01:57:26 +03:00
Andrew "Akari" Alexeyew
a760ce0258 made night ignite actually beatable on hard and lunatic 2012-08-03 01:10:01 +03:00
Andrew "Akari" Alexeyew
8833cd45e6 removed the debug printfs 2012-08-03 08:37:12 +03:00
Andrew "Akari" Alexeyew
74fd1030ad fixes 2012-08-03 08:27:26 +03:00
Andrew "Akari" Alexeyew
57ac42f422 removed printing of config values after loading 2012-08-03 08:17:14 +03:00
Andrew "Akari" Alexeyew
9295205419 New config parser. bison and flex, please gtfo, thanks. 2012-08-03 08:06:19 +03:00
Andrew "Akari" Alexeyew
5cbac0a8d5 fixed the replay bugs 2012-08-03 04:06:34 +03:00
Andrew "Akari" Alexeyew
eff7bb6435 Merge remote-tracking branch 'upstream/master' into stage3 2012-08-03 00:40:20 +03:00
Andrew "Akari" Alexeyew
531177cd1e uncommented all the attacks 2012-08-03 00:13:49 +03:00
laochailan
2fc31c4b46 fixed invalid write 2012-08-02 18:44:22 +02:00
laochailan
018b056960 baryon explosion first bit 2012-08-02 18:38:08 +02:00
Alexeyew "Akari" Andrew
986e6b5fe6 more balance 2012-08-02 16:04:05 +00:00
laochailan
6142e728d2 tried to balance eigenstate 2012-08-02 17:45:54 +02:00
Andrew "Akari" Alexeyew
c7a8a4b791 unfinished balance 2012-08-02 23:36:56 +03:00
Andrew "Akari" Alexeyew
571706b2f1 Merge branch 'master' into stage3 2012-08-02 22:58:40 +03:00
Andrew "Akari" Alexeyew
4fff180e3c global_processevent for replay_input (allows taking screenshots and toggling fullscreen in replay mode) 2012-08-02 22:56:59 +03:00
Andrew "Akari" Alexeyew
1fc34cfd37 Merge remote-tracking branch 'upstream/master' into stage3 2012-08-02 22:55:59 +03:00
laochailan
699ea887c3 new eigenstate 2012-08-02 17:03:12 +02:00
laochailan
9cade89368 Merge branch 'master' into stage6 2012-08-02 15:48:35 +02:00
laochailan
6d6315d6c4 Merge branch 'master' of github.com:laochailan/taisei 2012-08-02 15:35:38 +02:00
laochailan
e09428858e laser fallback for non instancing hardware 2012-08-02 15:34:27 +02:00
laochailan
c6d85aeda1 removed unnecessary laser rule 2012-08-02 13:59:36 +02:00
laochailan
0ebd27431b Merge branch 'master' into stage6 2012-08-02 13:16:38 +02:00
laochailan
3b0c84a264 removed debug message 2012-08-02 13:15:47 +02:00
laochailan
5cb4a9df8a LHC Sign ~ Higgs Boson Uncovered 2012-08-02 13:06:38 +02:00
laochailan
c98a4bf288 baryon normal attack and ricci sign 2012-08-01 22:38:38 +02:00
laochailan
9ee9a294e7 eigenstate test 2012-08-01 17:32:11 +02:00
Andrew "Akari" Alexeyew
f07b95281b full set of wriggle's mid attacks 2012-08-01 00:11:01 +03:00
laochailan
b700692ea4 adjusted visibility and warm up. more rebalancing 2012-07-31 22:29:18 +02:00
laochailan
2710764bd9 maxwell shader + rebalanced 2012-07-31 22:12:09 +02:00
laochailan
92c45ab52e maxwell sign ~ wave theory 2012-07-31 21:47:06 +02:00
Andrew "Akari" Alexeyew
a8aedec521 a stupid normal attack for wriggle 2012-07-31 21:07:40 +03:00
Andrew "Akari" Alexeyew
e3f2916325 Spellcardeus Nameus 2012-07-31 18:39:51 +03:00
laochailan
e826d8ea08 Newton sign more difficult 2012-07-31 17:34:55 +02:00
Andrew "Akari" Alexeyew
fbe10e9b50 3rd wriggle spell test 2012-07-31 17:19:46 +03:00
laochailan
426ca79d50 Merge branch 'master' into stage6 2012-07-31 14:35:36 +02:00
laochailan
f9fc667823 elly first spell unbalanced 2012-07-31 14:34:20 +02:00
Andrew "Akari" Alexeyew
ac8bef89a7 some stage balance 2012-07-31 12:32:56 +03:00
Andrew "Akari" Alexeyew
a36502f648 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-30 23:14:24 +03:00
Andrew "Akari" Alexeyew
b632a6124a fixed the strendswith function 2012-07-30 23:10:32 +03:00
Andrew "Akari" Alexeyew
31e65f035f more balance 2012-07-30 22:52:29 +03:00
Andrew "Akari" Alexeyew
e66f65bad3 balance 2012-07-30 22:26:59 +03:00
Andrew "Akari" Alexeyew
9df5852edb some balance (difficulty-dependent) + rename 2012-07-30 21:53:19 +03:00
Andrew "Akari" Alexeyew
d3ead5aa1a test3 2012-07-30 21:33:35 +03:00
Andrew "Akari" Alexeyew
649290a915 test2 2012-07-30 20:18:08 +03:00
Andrew "Akari" Alexeyew
b2b5effa68 crazy lazorz test 2012-07-30 20:10:30 +03:00
Andrew "Akari" Alexeyew
180f36a54c reduced annoyance, attempt #2 2012-07-30 19:30:20 +03:00
Andrew "Akari" Alexeyew
fe4baa3b14 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-30 19:23:43 +03:00
Andrew "Akari" Alexeyew
01e029b5ea made the bg a bit less annoying 2012-07-30 19:20:44 +03:00
Andrew "Akari" Alexeyew
788dcf08c9 Wriggle spell bg test 2012-07-30 19:09:36 +03:00
laochailan
ef4e38bad7 Elly's appearance 2012-07-30 17:57:38 +02:00
Andrew "Akari" Alexeyew
ddb6879892 Merge remote-tracking branch 'upstream/master' into stage3 
Conflicts:
	src/global.h
 2012-07-30 17:38:40 +03:00
Andrew "Akari" Alexeyew
c5487c3187 Added a skip-dialog key, like in Touhou (default: left ctrl) 2012-07-30 17:26:04 +03:00
Andrew "Akari" Alexeyew
a67f526c7c removed a stupid comment 2012-07-30 00:44:50 +03:00
Andrew "Akari" Alexeyew
f82be03be6 changed the date format 2012-07-30 00:29:16 +03:00
Andrew "Akari" Alexeyew
a064302f30 rearranged stuff 2012-07-30 00:15:13 +03:00
Andrew "Akari" Alexeyew
11d46fee96 typo 2012-07-30 00:01:57 +03:00
Andrew "Akari" Alexeyew
b736a0582c replayview: strings that don't fit into their cells get shortened 2012-07-29 23:57:19 +03:00
Andrew "Akari" Alexeyew
e75f28e592 Made screenshots work with any resolution 2012-07-29 23:43:36 +03:00
Andrew "Akari" Alexeyew
a322371b5f Introduced playername option, fancied up the replayview menu, etc 2012-07-29 23:39:52 +03:00
laochailan
43d642e59d stage 6 first part 2012-07-29 20:24:44 +02:00
Andrew "Akari" Alexeyew
d1f4aa03e3 s/lastframeplayed/playpos/ 2012-07-29 16:54:49 +03:00
Andrew "Akari" Alexeyew
d793bb61a4 optimized the replay event loop 2012-07-29 16:35:40 +03:00
Andrew "Akari" Alexeyew
7b42664663 Removed a debug printf 2012-07-29 16:28:49 +03:00
Andrew "Akari" Alexeyew
7b337a87ae Fixed several replay and input problems 2012-07-29 16:27:15 +03:00
Andrew "Akari" Alexeyew
cf6f58eae1 Fixed bitchy background autodisabler 2012-07-29 14:11:44 +03:00
laochailan
c2d2185ef7 Merge branch 'master' into stage6 2012-07-29 12:52:31 +02:00
Andrew "Akari" Alexeyew
f50e24693a Merge remote-tracking branch 'upstream/master' into stage3 
Conflicts:
	src/laser.c
 2012-07-29 13:31:04 +03:00
laochailan
f1c0afa585 added manual opengl function loader 2012-07-29 10:59:52 +02:00
laochailan
7b355fbb77 Merge branch 'master' of github.com:laochailan/taisei 
Conflicts:
	src/global.h
 2012-07-29 10:58:46 +02:00
laochailan
45dc909b4b made min global, changes for mingw builds 2012-07-29 09:32:56 +02:00
Andrew "Akari" Alexeyew
c7886ac0ae Merge remote-tracking branch 'upstream/master' into stage3 
Conflicts:
	src/enemy.c
	src/global.c
 2012-07-29 09:19:58 +03:00
laochailan
19b467443b added stage title transition 2012-07-28 23:41:53 +02:00
Andrew "Akari" Alexeyew
04ee1dab7b no printing of available resolutions at startup 2012-07-29 00:19:54 +03:00
Andrew "Akari" Alexeyew
a0cf2753bd typo 2012-07-28 23:55:35 +03:00
Andrew "Akari" Alexeyew
3d59ba51e4 user-adjustable resolution, fuck yeah 2012-07-28 23:53:53 +03:00
laochailan
c5eba2156d enemy.unbombable, bombs hurt bosses 2012-07-28 19:45:51 +02:00
laochailan
5dac665402 no, masterspark, you can't kill the boss 2012-07-28 19:22:25 +02:00
laochailan
07222c5f21 Stage 6 bg 2012-07-28 17:31:40 +02:00
laochailan
d15251e89a Merge branch 'master' into stage6 2012-07-28 12:29:34 +02:00
laochailan
e8c67c9cb3 adjusted non-shader laser drawing 2012-07-28 12:25:16 +02:00
laochailan
fe2d370007 retimed kurumi intro/outro 2012-07-28 11:39:08 +02:00
laochailan
deac80aadd stage 5 dialogs 2012-07-28 11:29:22 +02:00
Andrew "Akari" Alexeyew
526717fda4 increased width of red lasers 2012-07-28 11:41:01 +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
laochailan
5cfb3cbb1a stage 6 background initial 2012-07-28 09:10:29 +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
Andrew "Akari" Alexeyew
769c240e03 Merge remote-tracking branch 'upstream/master' into stage3 
Conflicts:
	src/global.c
	src/global.h
 2012-07-27 21:59:24 +03:00
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
Andrew "Akari" Alexeyew
0eb4b93d92 stupyd error 2012-07-27 21:06:01 +03:00
Andrew "Akari" Alexeyew
6060548e65 inline frand 2012-07-27 20:14:11 +03:00
Andrew "Akari" Alexeyew
5a7f17a240 Added a custom random generator 2012-07-27 20:11:45 +03:00
Andrew "Akari" Alexeyew
100474804d small cleanup 2012-07-27 16:44:27 +03:00
laochailan
577f0ef204 added stage title display 2012-07-27 12:18:21 +02:00
laochailan
dcc17dc6c4 fixed instakill static lasers 2012-07-27 11:07:45 +02:00
laochailan
c68b229456 made pre midboss part more difficult 2012-07-27 10:58:49 +02:00
laochailan
858c2729c5 balanced iku, refined spell bg 2012-07-26 20:52:34 +02:00
laochailan
fabde6bf52 integrated new lasers into stage 5 2012-07-26 18:22:00 +02: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
7e396cde4a removed debug code 2012-07-26 16:50:06 +02:00
laochailan
97727e6992 added shader based laser drawing 2012-07-26 16:49:41 +02:00
laochailan
211734a1fc Merge branch 'master' into new-laser 2012-07-26 13:31:55 +02:00
laochailan
39e1277b33 added snippet shader loader 2012-07-26 13:31:32 +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
93c58b7ff2 Merge remote-tracking branch 'upstream/stage5' into stage3 2012-07-25 23:49:11 +03:00
laochailan
0a75f22c9a using line segments for curve collision 2012-07-25 20:06:20 +02:00
laochailan
2536e3e3f1 removed debug logging 2012-07-25 18:11:05 +02:00
laochailan
515363519c rewrote laserline collision 2012-07-25 17:25:12 +02:00
laochailan
fea5ed255a correct fullscreen switching ingame 2012-07-25 15:56:03 +02:00
laochailan
2b2ef64f06 correct fullscreen switching ingame 2012-07-25 15:37:31 +02:00
laochailan
4b895004a4 iku boss battle (needs balancing) 2012-07-25 15:32:37 +02:00
Andrew "Akari" Alexeyew
d1f9da1b58 some visual improvements; adopted the spell name; made acceleration rate of the red beams difficulty-dependent 2012-07-24 21:44:58 +03:00
Andrew "Akari" Alexeyew
8da0f17131 balance 2012-07-24 18:56:29 +03:00
Andrew "Akari" Alexeyew
71aaf68105 spell test 2012-07-24 17:45:58 +03: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
Andrew "Akari" Alexeyew
337229e0d7 Merge branch 'stage5' into stage3 2012-07-24 14:48:36 +03:00
Andrew "Akari" Alexeyew
d5b7a772de Merge remote-tracking branch 'upstream/master' into stage3 2012-07-24 12:43:50 +03:00
Andrew "Akari" Alexeyew
e4acb9adb2 Rebalanced Acid Rain card a bit; enabled it only for the hard difficulties 2012-07-24 12:42:58 +03:00
laochailan
1d26c03d57 Stage 5 second half 2012-07-24 10:35:16 +02:00
laochailan
d7f22d302e Stage 5 first half 2012-07-23 21:34:08 +02: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
5c4221952a execute line laser rule every frame 2012-07-22 22:06:47 +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
Andrew "Akari" Alexeyew
76cf9ae348 somewhat finished the second half (pre-boss) 2012-07-22 19:20:45 +03:00
Andrew "Akari" Alexeyew
f3f597a55b Fixed projectile rules 2012-07-22 14:21:49 +03:00
Andrew "Akari" Alexeyew
6135901f0d made the stage a bit less fucking annoying 2012-07-22 13:41:10 +03:00
laochailan
8750e83e8b Merge branch 'master' into stage5 2012-07-22 09:32:22 +02:00
Andrew "Akari" Alexeyew
0355048ecf enabled midboss attacks back 2012-07-21 23:45:20 +03:00
Andrew "Akari" Alexeyew
cbb5187e95 bost-midboss part: pre-pre-pre-alpha 2012-07-21 23:43:47 +03:00
laochailan
f81246e35c balanced kurumi 2012-07-21 21:41:53 +02:00
Andrew "Akari" Alexeyew
4eea8a63b7 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-21 22:14:33 +03:00
laochailan
0cf60b52f0 new bullet type added 2012-07-21 21:13:24 +02:00
laochailan
a77f321417 changed stage_loop execution order 
graphics -> logic -> SwapBuffers for best performance
 2012-07-21 20:25:11 +02:00
Andrew "Akari" Alexeyew
4966a17a0b rebalanced scuttle's normal attack 2012-07-21 21:22:36 +03:00
laochailan
8a999aff87 Merge branch 'master' into stage5 2012-07-21 19:38:10 +02:00
Andrew "Akari" Alexeyew
d520f668ef Merge remote-tracking branch 'upstream/master' into stage3 
Conflicts:
	shader/boss_zoom.sha
 2012-07-21 19:43:49 +03:00
laochailan
f1defcd304 fixed weird boss event behaviour 2012-07-21 18:30:12 +02:00
laochailan
782d8ca35e stage 5 bg 2012-07-21 17:11:54 +02:00
laochailan
62dc7168eb Merge branch 'master' into stage5 2012-07-20 21:36:39 +02:00
Andrew "Akari" Alexeyew
101ae15c45 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-20 22:27:26 +03:00
Andrew "Akari" Alexeyew
acdb2f697c Second half of the bg 2012-07-20 22:25:37 +03:00
laochailan
ef03e87306 Resolution independence 2012-07-20 21:24:12 +02:00
laochailan
a0e0ba28f8 initial stage 5 bg 2012-07-20 20:43:48 +02:00
Andrew "Akari" Alexeyew
b19ab19290 Merge remote-tracking branch 'upstream/master' into stage3 2012-07-20 20:09:53 +03:00
Andrew "Akari" Alexeyew
303ef473f7 added a "normal" attack for scuttle 2012-07-20 19:37:16 +03:00
laochailan
4ab1ac1d85 Merge pull request #11 from nexAkari/master 
global_processevent fix
 2012-07-20 09:16:34 -07:00
Andrew "Akari" Alexeyew
a9d84575de removed redundant global_process event added by git 2012-07-20 19:13:53 +03:00
Andrew "Akari" Alexeyew
aebc248a02 Merge branch 'master' into stage3 2012-07-20 19:13:33 +03:00
Andrew "Akari" Alexeyew
1471914b42 global_processevent fix 2012-07-20 19:13:15 +03:00
laochailan
8c46e4acf2 increased power item value 2012-07-20 16:31:16 +02:00
laochailan
d2b1da1bca plr_* -> player_* 2012-07-20 16:11:24 +02:00
Andrew "Akari" Alexeyew
692f163680 Merge branch 'master' into stage3 2012-07-20 17:10:08 +03:00
laochailan
01adbc2960 Added Stage Subtitles 2012-07-20 15:58:52 +02:00
laochailan
f8b9194fed Stage 5 skeleton 2012-07-20 15:53:41 +02:00
laochailan
102bd4d97a Removed GLEW dependency 2012-07-20 13:18:25 +02:00
laochailan
69543f392e switched kurumis breaker attacks 2012-07-20 12:26:59 +02:00
laochailan
a54c41c9e2 Stage 4 Dialogs added 2012-07-20 12:26:16 +02:00
laochailan
5aab1add7c code cleaning 2012-07-20 11:49:38 +02:00
laochailan
752815ea3d removed old, unnecessary check 2012-07-20 11:48:05 +02:00
laochailan
519998395a faster DeadProj disposal 2012-07-20 11:45:29 +02:00
laochailan
4083ef6723 removed time jumps 2012-07-20 11:44:11 +02:00
laochailan
6d88a3ddb1 Kurumi bossfight 2012-07-20 11:43:15 +02:00
Andrew "Akari" Alexeyew
55ebc35247 Merge remote-tracking branch 'upstream/master' into stage3 
Conflicts:
	src/enemy.c
 2012-07-19 20:59:08 +03:00
Andrew "Akari" Alexeyew
5faeacd1f5 made the first spell less bitchy 2012-07-19 20:55:05 +03:00
laochailan
c26fab8ad9 Merge branch 'master' into stage4boss 2012-07-19 19:54:32 +02:00
laochailan
f021a1a9cd stupid me. 2012-07-19 19:53:33 +02:00
laochailan
131fbd7b26 EVENT_DEATH for boss and killall function 2012-07-19 19:48:17 +02:00
laochailan
ba86117f21 some tweaks 2012-07-19 19:45:21 +02:00
Andrew "Akari" Alexeyew
d29f1cc294 fixed swirls 2012-07-19 20:32:44 +03:00
Andrew "Akari" Alexeyew
b7a0ddb347 added reddish layers to the spell bg 2012-07-19 20:27:54 +03:00
Andrew "Akari" Alexeyew
d86e6b10a0 better fadein 2012-07-19 20:13:02 +03:00
Andrew "Akari" Alexeyew
7f1846f184 apply the stage shaderrules while the boss attack is still preparing, allows the spell bg to fade in 2012-07-19 20:03:23 +03:00
Andrew "Akari" Alexeyew
8c62b56326 oops 2012-07-19 19:44:44 +03:00
Andrew "Akari" Alexeyew
3fd4d15309 removed the time jump, activated the first spell 2012-07-19 19:25:21 +03:00
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
1209e6ea0d Merge branch 'master' into stage4boss 2012-07-19 10:50:20 +02:00
laochailan
4cafb89125 relaxed collisions 2012-07-19 10:48:31 +02:00
laochailan
933d27585c kurumis first attack provisoric 2012-07-19 10:37:35 +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