mirror of
https://github.com/halpz/re3.git
synced 2025-07-30 08:20:27 +00:00
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
* origin/miami: fix clouds Use our synonyms for attack anims again Detect joystick menu for XInput reorganize shaders; use modulate flag; update librw fix generic.txd crash Use original animation names from VCS # Conflicts: # src/core/MenuScreensCustom.cpp
This commit is contained in:
@ -215,7 +215,7 @@ enum eMenuScreen
|
||||
#ifdef GRAPHICS_MENU_OPTIONS
|
||||
MENUPAGE_GRAPHICS_SETTINGS,
|
||||
#endif
|
||||
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
|
||||
#ifdef DETECT_JOYSTICK_MENU
|
||||
MENUPAGE_DETECT_JOYSTICK,
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user