diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-02-10 09:01:53 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-10 09:01:53 +0200 |
commit | b6af7393e8494570de4bfa837ba2090c522b28bb (patch) | |
tree | aba068f1307a1a4e8c3d72adf69c0869f5c29f0e /gamefiles/models/frontend_x360.txd | |
parent | 12330e38cb3c2a023bc1327cb89afd19efed0a43 (diff) | |
parent | 26bbbe003761490d16a75e4f4e06199e8bc47b70 (diff) |
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
Diffstat (limited to 'gamefiles/models/frontend_x360.txd')
0 files changed, 0 insertions, 0 deletions