Commit graph

33 commits

Author SHA1 Message Date
Andrew "Akari" Alexeyew
a322371b5f Introduced playername option, fancied up the replayview menu, etc 2012-07-29 23:39:52 +03:00
laochailan
7b355fbb77 Merge branch 'master' of github.com:laochailan/taisei
Conflicts:
	src/global.h
2012-07-29 10:58:46 +02:00
laochailan
39e1277b33 added snippet shader loader 2012-07-26 13:31:32 +02:00
laochailan
102bd4d97a Removed GLEW dependency 2012-07-20 13:18:25 +02:00
laochailan
b4feea1cb6 replacement for strtok_r 2012-07-18 13:42:04 +02:00
laochailan
9dfc3b75b2 Used glGetActiveUniform, which seems to be more compatible 2012-07-18 11:40:46 +02:00
laochailan
9d26e50d2b Added Stage 4 BG 2012-07-16 18:13:58 +02:00
laochailan
13e5f310a7 OBJ model loader implemented. 2012-07-15 08:15:47 +02:00
laochailan
cd2b2dc2e0 Removed some gl memleaks 2012-04-05 20:31:16 +02:00
laochailan
d96b368b4e Made shaders cache uniform locations 2012-04-05 16:27:18 +02:00
laochailan
9cd2187225 GL profiling, removing redundant gl calls 2012-04-05 14:24:55 +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
4eec15bb35 Removed some silent segfaults and memleaks
valgrind, valgrind FOE!
2011-11-04 20:03:16 +01:00
laochailan
2ab202573d Renovated Marisa/Star Sign 2011-11-01 21:20:40 +01:00
laochailan
b0dbe755f9 Improved youmu homing
also:
+ master spark sound
* only one of a sound per frame
* references are more efficient
2011-07-07 14:34:30 +02:00
Akari
cde91d9cbd Merge branch 'master' into akari/options_menu 2011-07-04 14:22:18 +03:00
laochailan
bb7c527acb increased warning level; decreased warnings
proved necessary after the last session "taisei intelligence vs. stupid implicit declaration failure #9001"
2011-07-04 13:14:33 +02:00
Akari
780fdd4135 Moved resources initialization memset to global_init 2011-07-04 13:40:09 +03:00
Akari
ed71daa87f Merge branch 'master' into akari/options_menu 2011-07-04 13:38:54 +03:00
laochailan
b641019e03 fixed uninitialized resources 2011-07-04 11:39:32 +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
laochailan
a2a6fb9343 marisa laser revamped
also added fullscreen config option
2011-06-29 17:01:03 +02:00
laochailan
36e4dc331b compatibility for old hardware
added two config options:

disable_shader: will turn off the use of shaders and fbos in the game. there is no full replacement for them, however.
disable_audio: guess what.

both options *should* be activated automatically as soon as something goes wrong.
2011-06-27 13:36:35 +02:00
laochailan
82c464fe44 GLEW "error handling", cleaning paths
enough porting issues for now, i think.
2011-06-27 08:20:42 +02:00
laochailan
f5550d4f49 there was a potential segfault 2011-06-26 21:15:01 +02:00
laochailan
61c4d39b7e some independence 2011-06-26 20:23:28 +02:00
laochailan
e470236379 use glew and err.h replacement
some changes for compatibility and windows.
2011-06-26 16:10:13 +02:00
laochailan
5a2ac5b7ba "API changes", swirl
you see dat swirl? you see two z^3*i^|z|?
2011-06-26 13:45:27 +02:00
laochailan
bd44c8b570 Marisa and difficulty menu 2011-06-24 12:35:03 +02:00
laochailan
3861a69d62 menus - the beginning
implemented:
[x] ingame menu
[x] main menu
[x] menus
[x] fancy fades
[x] structural earthquake
[ ] the rest of the main menu (difficulty/char select)
2011-06-13 18:48:36 +02:00