Skip to content
This repository has been archived by the owner. It is now read-only.

/ re3 Archived

Controller menu #1026

Merged
merged 10 commits into from Feb 11, 2021
+1,022 −90
Merged

Controller menu #1026

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
12330e3
Controller menu
Sergeanur Feb 10, 2021
b6af739
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
Sergeanur Feb 10, 2021
bf86875
Add textures
Sergeanur Feb 10, 2021
d6068c4
Add undef
Sergeanur Feb 10, 2021
5f3e68e
Save vibration setting
Sergeanur Feb 10, 2021
5072c8b
Merge branch 'miami' into VC/ControllerMenu
Sergeanur Feb 10, 2021
3c7a7bc
Fixes
Sergeanur Feb 10, 2021
7c48556
Translated string fix
Sergeanur Feb 11, 2021
9f3f0ee
Fix borders
Sergeanur Feb 11, 2021
4f27a28
More fixes
Sergeanur Feb 11, 2021
File filter
Filter file types
Clear filters
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
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
  • Loading branch information
@Sergeanur
Sergeanur committed Feb 10, 2021
commit b6af7393e8494570de4bfa837ba2090c522b28bb

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.