|
From: Yoda-JM <yo...@us...> - 2011-02-28 14:38:27
|
Author: Vincent Le Ligeour <yo...@us...> Date: Fri Feb 25 16:25:35 2011 +0100 Reduced differences between master and opengl2 branches --- game/glmath.hh | 155 +++++++++++++++++++++ game/glutil.hh | 143 ++++++++++++++++++-- game/guitargraph.cc | 94 +++++++------ game/instrumentgraph.hh | 9 +- game/main.cc | 9 +- game/notegraph.cc | 80 ++++------- game/screen.hh | 2 +- game/screen_intro.cc | 10 ++- game/screen_players.cc | 1 + game/screen_sing.cc | 12 +- game/screen_songs.cc | 102 ++++++++------ game/screen_songs.hh | 3 +- game/screenmanager.cc | 4 +- game/songs.cc | 2 +- game/surface.cc | 2 +- game/surface.hh | 20 ++- game/video_driver.cc | 64 ++++++++- game/video_driver.hh | 13 ++ themes/CMakeLists.txt | 1 - themes/default/songs_bg.svg | 20 ++- themes/default/songs_bg_default.svg | 47 +++++-- themes/default/songs_bg_ground.svg | 260 +++++++++++++++++++++++++++++++++++ 22 files changed, 856 insertions(+), 197 deletions(-) |