Merge branch 'master' into 'achievements_support'

# Conflicts:
#   dll/steam_remote_storage.h
This commit is contained in:
Nemirtingas 2019-10-05 19:48:41 +00:00
commit 8d22fb72ae
23 changed files with 2177 additions and 114 deletions

View file

@ -0,0 +1,17 @@
Move=LJOY=joystick_move
Camera=RJOY=joystick_move
Dash=RTRIGGER=trigger
LockOn=LTRIGGER=trigger
pause_menu=START
LightAttack=X
HeavyAttack=Y
Jump=A
check=B
ActivateSkillAndMagic=RBUMPER
IdeaRelease=LBUMPER
AllMap=BACK
ResetCamera=RSTICK
ChangeCharacterUp=DUP
ChangeCharacterDown=DDOWN
ChangeCharacterRight=DRIGHT
ChangeCharacterLeft=DLEFT

View file

@ -0,0 +1,16 @@
MenuDash=RTRIGGER=trigger
MenuLockOn=LTRIGGER=trigger
MenuUp=DUP,DLJOYUP
MenuDown=DDOWN,DLJOYDOWN
MenuRight=DRIGHT,DLJOYRIGHT
MenuLeft=DLEFT,DLJOYLEFT
SELECT=A
Cancel=B
MenuX=X
MenuY=Y
MenuRTrigger=RBUMPER
MenuLTrigger=LBUMPER
Sort=BACK
PauseMenu=START
ScrollUp=DRJOYUP
ScrollDown=DRJOYDOWN

View file

@ -0,0 +1 @@
Rename this to: disable_networking.txt to disable all networking functionality.