Commit graph

73 commits

Author SHA1 Message Date
makise-homura
881521d8c7 ZLIB marked as required since it is specified as required dependency of libpng 2017-01-30 23:15:44 +03:00
makise-homura
14ef066d14 Added TAISEI_IDDQD cmake variable (have effect only with TAISEI_DEBUG) that makes player lives infinite (useful for stage debug) 2017-01-30 22:26:45 +03:00
makise-homura
815ae7b23b Added background music subsystem. 2017-01-24 16:40:57 +03:00
makise-homura
5ab2d4268b Added forgotten modified files 2017-01-17 22:00:52 +03:00
Andrew "Akari" Alexeyew
6d573390cc Merge branch 'options-refactoring' into gamepad 2012-08-16 22:21:44 +03:00
Andrew "Akari" Alexeyew
c8542adc99 Some options menu refactoring 2012-08-16 19:15:46 +03:00
Andrew "Akari" Alexeyew
30befb3960 basic gamepad/joystick support 2012-08-15 03:41:21 +03:00
Andrew "Akari" Alexeyew
4a8ef08639 Merge branch 'newmenu' into events
Conflicts:
	src/credits.c
2012-08-14 19:05:28 +03:00
laochailan
1416a40451 added transition interface 2012-08-13 19:20:40 +02:00
Andrew "Akari" Alexeyew
cf72d8dee3 event abstraction layer 2012-08-13 18:50:28 +03:00
Martin Herkt
1c24ab15cc Add an icon for Windows binaries 2012-08-11 01:25:04 +02:00
laochailan
4242e64ccb added PNG_INCLUDE_DIR 2012-08-08 12:28:41 +02:00
laochailan
d913d367eb made cmake add the opengl include dir 2012-08-08 11:55:02 +02:00
Andrew "Akari" Alexeyew
1829ec3436 Merge remote-tracking branch 'upstream/master' into replays 2012-08-07 06:47:42 +03:00
Andrew "Akari" Alexeyew
7776443935 multistage replays 2012-08-07 06:28:41 +03:00
Martin Herkt
23cb6cbaba src/CMakeLists.txt: Update LIBs for win32 2012-08-06 20:41:30 +02:00
Andrew "Akari" Alexeyew
e2b8163447 Basic credits 2012-08-05 04:36:55 +03:00
Andrew "Akari" Alexeyew
a94479cecf replayover menu 2012-08-04 07:37:59 +03: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
37d7048631 Merge branch 'master' into stage6 2012-08-03 09:40:04 +02:00
Andrew "Akari" Alexeyew
9295205419 New config parser. bison and flex, please gtfo, thanks. 2012-08-03 08:06:19 +03:00
laochailan
c2d2185ef7 Merge branch 'master' into stage6 2012-07-29 12:52:31 +02:00
laochailan
7b355fbb77 Merge branch 'master' of github.com:laochailan/taisei
Conflicts:
	src/global.h
2012-07-29 10:58:46 +02:00
Andrew "Akari" Alexeyew
3d59ba51e4 user-adjustable resolution, fuck yeah 2012-07-28 23:53:53 +03:00
laochailan
d15251e89a Merge branch 'master' into stage6 2012-07-28 12:29:34 +02:00
laochailan
5cfb3cbb1a stage 6 background initial 2012-07-28 09:10:29 +02:00
Andrew "Akari" Alexeyew
5a7f17a240 Added a custom random generator 2012-07-27 20:11:45 +03: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
Andrew "Akari" Alexeyew
4195ea94c4 basic replayview menu 2012-07-16 20:26:41 +03:00
Andrew "Akari" Alexeyew
5308856f1f proper replay saving and some minor stuff 2012-07-16 18:47:06 +03:00
Andrew "Akari" Alexeyew
4adf4f995b Merge remote-tracking branch 'upstream/master' into replays 2012-07-15 10:48:47 +03:00
laochailan
13e5f310a7 OBJ model loader implemented. 2012-07-15 08:15:47 +02:00
Andrew "Akari" Alexeyew
8e0f390386 Remade player input and movement, more or less replay-ready now. Also made the direction vector normalized. 2012-07-14 17:37:52 +03:00
Andrew "Akari" Alexeyew
ef7c536786 Merge remote-tracking branch 'upstream/master' into stageselect
Conflicts:
	src/main.c
	src/menu/mainmenu.c
2012-07-14 11:44:24 +03:00
Andrew "Akari" Alexeyew
db8dfd3580 Added stageselect menu for the debug mode 2012-07-14 11:40:21 +03:00
laochailan
857fae79cb Added skeleton for stages 3 and 4 2012-07-14 09:37:27 +02:00
laochailan
9241b3eb35 Stage 2 Added
monster commit incoming.
2012-07-13 18:44:56 +02:00
laochailan
02233cb175 Added stage skip mode 2012-04-06 17:50:17 +02:00
laochailan
6555180fb9 Big fairies + additive blending 2012-04-04 17:19:53 +02:00
laochailan
89a019f1fb Stage 3D background system/Stage 2 background
shaders!
2012-01-06 21:52:55 +01:00
laochailan
75d7e8489e Using a VBO for all the quads. 2011-12-25 08:18:03 +01:00
laochailan
120010ba72 Enabled shooting while bombing. 2011-10-13 09:47:34 +02:00
Akari
7ac295276b Merge branch 'master' into akari/options_menu
Conflicts:
	src/global.c
	src/global.h
	src/main.c
	src/resource/texture.c
2011-07-04 10:37:34 +03:00
laochailan
0b2aaf0799 Split up Global and Resources
reduced number of variables.
2011-07-04 09:14:08 +02:00
Akari
599d5a8d82 Added a basic options menu. Doesn't save to the config yet. 2011-07-03 16:11:18 +03:00
Akari
29b12b6253 Allowed the player to continue the game upon losing all lifes (asked with a menu). Continues are kept track of, may be used later to implement the traditional no-good-end-with-continues. 2011-07-02 12:39:36 +03:00
laochailan
a2a6fb9343 marisa laser revamped
also added fullscreen config option
2011-06-29 17:01:03 +02:00
laochailan
561a7faf4b fancyness and content
i am content with the current development of content.
2011-06-28 19:23:02 +02:00