Merge branch 'back_to_basics2' into InputStuffs

# Conflicts:
#	source/core/gamestruct.h
#	source/games/duke/src/duke3d.h
#	source/sw/src/input.cpp
#	source/sw/src/player.cpp
This commit is contained in:
Mitchell Richters 2020-09-07 07:51:37 +10:00
commit fa9fa88fce
74 changed files with 1288 additions and 1847 deletions

View file

@ -234,6 +234,11 @@ void SetupGameButtons()
"Dpad_Aiming",
"Toggle_Crouch",
"Quick_Kick",
"AM_PanLeft",
"AM_PanRight",
"AM_PanUp",
"AM_PanDown",
};
buttonMap.SetButtons(actions, NUM_ACTIONS);
}