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 |
|
laochailan
|
85fe8094ad
|
Merge pull request #21 from nexAkari/stage3
ifdef'd stgframes
|
2012-08-03 06:29:39 -07:00 |
|
Andrew "Akari" Alexeyew
|
4c26024eab
|
ifdef'd stgframes
|
2012-08-04 00:29:27 +03:00 |
|
Andrew "Akari" Alexeyew
|
b8f0f9b885
|
Merge remote-tracking branch 'upstream/master' into stage3
|
2012-08-04 00:23:45 +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
|
7d155c39ca
|
Merge pull request #20 from nexAkari/stage3
Stage3
|
2012-08-03 06:24:57 -07: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
|
7eb54be313
|
Merge branch 'master' of github.com:laochailan/taisei
Conflicts:
src/config.l
|
2012-08-03 09:39:39 +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 |
|
laochailan
|
1b4ca76d8d
|
Merge pull request #19 from nexAkari/config
Config
|
2012-08-02 14:47:23 -07: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 |
|
Alexeyew "Akari" Andrew
|
09901cb9d2
|
Merge branch 'stage3' of github.com:nexAkari/taisei into stage3
|
2012-08-02 15:39:09 +00: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 |
|