actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plenty of good stuff.

Browse Source
This commit is contained in:
Jason Felds
2011-08-17 21:04:33 -04:00
parent 00254e814a b6c2882362
commit 4b7911cbee
7 changed files with 71 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_Installer/Languages/es.ini
+20 -19
View File
@@ -1,18 +1,20 @@
[Installer Sections]
TEXT_IO_CHECK_FOR_UPDATES=Compruebe para actualizaciones
TEXT_IO_CHECK_FOR_UPDATES=Comprobar actualizaciones
TEXT_IO_RUN=${PRODUCT_DISPLAY}
TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2)
TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (no SSE2)
TEXT_IO_OPEN_PROGRAM_FOLDER=Abrir la carpeta de programa de ${PRODUCT_ID}
TEXT_IO_MANUAL=${PRODUCT_ID} Documentacion
TEXT_IO_TOOLS=${PRODUCT_ID} Herramientas
TEXT_IO_WEB_SITE=${PRODUCT_ID} Sitio
TEXT_IO_UNINSTALL=Desinstalando ${PRODUCT_DISPLAY}
TEXT_IO_VIEW_STATISTICS=Ver estadisticas
TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Remover solamente)
TEXT_IO_SMZIP_PACKAGE=SMZIP paquete
TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files.
TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install.
TEXT_IO_LAUNCH_THE_GAME=Lanzar el Juego
TEXT_IO_OPEN_SETTINGS_FOLDER=Abrir la carpeta de preferencias de ${PRODUCT_ID}
TEXT_IO_MANUAL=Manual de ${PRODUCT_ID}
TEXT_IO_TOOLS=Herramientas de ${PRODUCT_ID}
TEXT_IO_WEB_SITE=Sitio web de ${PRODUCT_ID}
TEXT_IO_UNINSTALL=Desinstalar ${PRODUCT_DISPLAY}
TEXT_IO_VIEW_STATISTICS=Ver estadísticas
TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (sólo eliminar)
TEXT_IO_SMZIP_PACKAGE=Paquete SMZIP
TEXT_IO_FATAL_ERROR_COPYING_PCK=Error fatal copiando archivos pck.
TEXT_IO_FATAL_ERROR_INSTALL=Error fatal durante la instalación.
TEXT_IO_LAUNCH_THE_GAME=Ejecutar StepMania
TEXT_IO_TEXTURE_FONT_GENERATOR=Generador de fuentes en textura
[Installer Functions]
TEXT_IO_TITLE=${PRODUCT_DISPLAY}
@@ -25,12 +27,11 @@ TEXT_IO_REINSTALL=Reinstalar
TEXT_IO_COULD_NOT_EXECUTE=No se pudo ejecutar $INSTDIR\Program\${PRODUCT_FAMILY}.exe
[PreInstall]
TEXT_IO_UNINSTALL_PREVIOUS=La version anterior de ${PRODUCT_ID} debe ser desinstalada antes de continuar. ¿Desea continuar?
TEXT_IO_DIRECTX_VISIT_MICROSOFT=La ultima version de DirectX (8.1 o mayor) es fuertemente recomendada. ¿Desea visitar el sitio web de Mircosoft ahora?
TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Fallo desinstalacion. ¿Instalar de todas maneras?
TEXT_IO_INSTALL_DIRECTX=La ultima version de DirectX (8.1 o mayor) es fuertemente recomendada. ¿Desea instalarlo ahora?
TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} no parece hace sido instalado.\n¿Desea continuar?
TEXT_IO_UNINSTALL_PREVIOUS=La version anterior de ${PRODUCT_ID} debe ser desinstalada antes de continuar.\n¿Desea continuar?
TEXT_IO_DIRECTX_VISIT_MICROSOFT=Se recomienda la última versión de DirectX (8.1 o superior).\n¿Desea visitar el sitio web de Mircosoft ahora?
TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Falló la desinstalación. ¿Instalar de todas maneras?
TEXT_IO_INSTALL_DIRECTX=Se requiere la última versión de DirectX (8.1 o superior).\n¿Desea instalar DirectX 8.1 ahora?
TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} no parece estar instalado.\n¿Desea continuar?
[Uninstall]
TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall.
TEXT_IO_FATAL_ERROR_UNINSTALL=Error fatal durante la desinstalación.
Themes/default/BGAnimations/ScreenPrompt underlay.redir
+1
View File
@@ -0,0 +1 @@
ScreenMiniMenu underlay
src/StageStats.cpp
+2 -3
View File
@@ -189,9 +189,8 @@ void StageStats::FinalizeScores( bool bSummary )
// generate a HighScore for each player
// whether or not to save scores when the stage was failed
// depends on if this is a course or not ... it's handled
// below in the switch
// whether or not to save scores when the stage was failed depends on if this
// is a course or not... it's handled below in the switch.
FOREACH_HumanPlayer( p )
{
RString sPlayerGuid = PROFILEMAN->IsPersistentProfile(p) ? PROFILEMAN->GetProfile(p)->m_sGuid : RString("");
src/ThemeManager.cpp
+2
View File
@@ -1258,6 +1258,8 @@ public:
static int GetPathB( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathB(SArg(1),SArg(2)) ); return 1; }
static int GetPathS( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathS(SArg(1),SArg(2)) ); return 1; }
static int GetPathO( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathO(SArg(1),SArg(2)) ); return 1; }
static int RunLuaScripts( T* p, lua_State *L ) { p->RunLuaScripts(SArg(1)); return 1; }
static int GetSelectableThemeNames( T* p, lua_State *L )
{
src/ThemeManager.h
+3 -1
View File
@@ -98,6 +98,9 @@ public:
static RString GetBlankGraphicPath();
//needs to be public for the binding to work
void RunLuaScripts( const RString &sMask );
// For self-registering metrics
static void Subscribe( IThemeMetric *p );
static void Unsubscribe( IThemeMetric *p );
@@ -106,7 +109,6 @@ public:
void PushSelf( lua_State *L );
protected:
void RunLuaScripts( const RString &sMask );
void LoadThemeMetrics( const RString &sThemeName, const RString &sLanguage_ );
RString GetMetricRaw( const IniFile &ini, const RString &sMetricsGroup, const RString &sValueName );
bool GetMetricRawRecursive( const IniFile &ini, const RString &sMetricsGroup, const RString &sValueName, RString &sRet );
src/arch/InputHandler/InputHandler_X11.cpp
+43 -6
View File
@@ -121,6 +121,13 @@ static DeviceButton XSymToDeviceButton( int key )
case XK_Super_L: return KEY_LSUPER;
case XK_Super_R: return KEY_RSUPER;
case XK_Menu: return KEY_MENU;
// mouse
case XK_Pointer_Button1: return MOUSE_LEFT;
case XK_Pointer_Button2: return MOUSE_MIDDLE;
case XK_Pointer_Button3: return MOUSE_RIGHT;
case XK_Pointer_Button4: return MOUSE_WHEELUP;
case XK_Pointer_Button5: return MOUSE_WHEELDOWN;
}
return DeviceButton_Invalid;
@@ -133,7 +140,13 @@ InputHandler_X11::InputHandler_X11()
XWindowAttributes winAttrib;
XGetWindowAttributes( Dpy, Win, &winAttrib );
XSelectInput( Dpy, Win, winAttrib.your_event_mask | KeyPressMask | KeyReleaseMask );
// todo: add ButtonMotionMask, Button(1-5)MotionMask,
// (EnterWindowMask/LeaveWindowMask?) -aj
XSelectInput( Dpy, Win,
winAttrib.your_event_mask | KeyPressMask | KeyReleaseMask
| ButtonPressMask | ButtonReleaseMask
| PointerMotionMask
);
}
InputHandler_X11::~InputHandler_X11()
@@ -143,7 +156,7 @@ InputHandler_X11::~InputHandler_X11()
XWindowAttributes winAttrib;
XGetWindowAttributes( Dpy, Win, &winAttrib );
XSelectInput( Dpy, Win, winAttrib.your_event_mask & ~(KeyPressMask|KeyReleaseMask) );
XSelectInput( Dpy, Win, winAttrib.your_event_mask & ~(KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask) );
}
void InputHandler_X11::Update()
@@ -158,12 +171,23 @@ void InputHandler_X11::Update()
DeviceButton lastDB = DeviceButton_Invalid;
lastEvent.type = 0;
while( XCheckWindowEvent(Dpy, Win, KeyPressMask | KeyReleaseMask, &event) )
// todo: add other masks? (like the ones for drag'n drop) -aj
while( XCheckWindowEvent(Dpy, Win,
KeyPressMask | KeyReleaseMask
| ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
&event) )
{
const bool bPress = event.type == KeyPress;
const bool bKeyPress = event.type == KeyPress;
//const bool bMousePress = event.type == ButtonPress;
if( event.type == MotionNotify )
{
INPUTFILTER->UpdateCursorLocation(event.xbutton.x,event.xbutton.y);
}
if( lastEvent.type != 0 )
{
if( bPress && event.xkey.time == lastEvent.xkey.time &&
if( bKeyPress && event.xkey.time == lastEvent.xkey.time &&
event.xkey.keycode == lastEvent.xkey.keycode )
{
// This is a repeat event so ignore it.
@@ -174,18 +198,28 @@ void InputHandler_X11::Update()
ButtonPressed( DeviceInput(DEVICE_KEYBOARD, lastDB, 0) );
lastEvent.type = 0;
}
// Why only the zero index?
lastDB = XSymToDeviceButton( XLookupKeysym(&event.xkey, 0) );
if( lastDB == DeviceButton_Invalid )
continue;
if( bPress )
if( bKeyPress )
ButtonPressed( DeviceInput(DEVICE_KEYBOARD, lastDB, 1) );
/*
else if( bMousePress )
*/
else
lastEvent = event;
}
// Handle any last releases.
if( lastEvent.type != 0 )
{
ButtonPressed( DeviceInput(DEVICE_KEYBOARD, lastDB, 0) );
}
InputHandler::UpdateTimer();
}
@@ -193,7 +227,10 @@ void InputHandler_X11::Update()
void InputHandler_X11::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevicesOut )
{
if( Dpy && Win )
{
vDevicesOut.push_back( InputDeviceInfo(DEVICE_KEYBOARD,"Keyboard") );
//vDevicesOut.push_back( InputDeviceInfo(DEVICE_MOUSE,"Mouse") );
}
}
/*
src/arch/LoadingWindow/LoadingWindow_Win32.cpp
-1
View File
@@ -16,7 +16,6 @@
#include "ProductInfo.h"
#include "LocalizedString.h"
#include "RageSurfaceUtils_Zoom.h"
static HBITMAP g_hBitmap = NULL;