Skip to content

Commit

Permalink
Release v1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
TheOfficialFloW committed Feb 25, 2021
1 parent 6a16266 commit 23d670f
Show file tree
Hide file tree
Showing 7 changed files with 203 additions and 75 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ The port works by loading the official Android ARMv7 executable in memory, resol

## Changelog

### v1.3

- Added ability to remap controls with `ux0:data/gtasa/controls.txt`. Thanks to PoisonPoisonPoison.
- Added default vita-enhanced controls schema by darthbellic.
- Added support for co-op rampage missions when using PS3 scripts. See `Tips and Tricks` for instructions.
- Added option to enable high detail player textures.
- Switched to OpenAL-SDL for better performance.

### v1.2

- Fixed memory leak in vitaGL leading to corrupted textures.
Expand Down Expand Up @@ -77,6 +85,7 @@ You can launch the Configurator app by clicking on the `Configuration` button lo
## Tips and Tricks

- In order to reduce occasional stutters in-game, delete both `ux0:data/gtasa/scache_small_low.txt` and `ux0:data/gtasa/scache_small.txt`, then create a copy of the `ux0:data/gtasa/scache.txt` file to have two version of it. (for example `scache(1).txt` so in the end you end up with both `scache.txt` and `scache(1).txt` inside the `ux0:data/gtasa/` folder), then rename `scache.txt` to `scache_small.txt` and `scache(1).txt` to `scache_small_low.txt` . This will however make the loading screen longer since it needs to compile more shaders ahead.
- If the folder `ux0:data/gtasa/cache` contains much more than 300 files, it's recommended to delete the folder and have it rebuilt.
- You can input PC cheats by pressing L+SELECT to open the on-screen keyboard. See [CHEATS.md](CHEATS.md) for available and unavailable cheats (you can input cheat codes in lowercase as well as uppercase).
- The L2/R2 buttons are mapped to the rear touchpad on the top and the L3/R3 buttons are mapped to the front touchpad on the bottom. With v1.2 and higher, you can map L2/R2 to the front touchpad on the top.
- You can open the map by holding START and then releasing.
Expand Down
11 changes: 9 additions & 2 deletions companion/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <stdio.h>

#define CONFIG_FILE_PATH "ux0:data/gtasa/config.txt"
#define NUM_OPTIONS 17
#define NUM_OPTIONS 18

int _newlib_heap_size_user = 192 * 1024 * 1024;

Expand Down Expand Up @@ -41,6 +41,7 @@ bool mobile_stuff = false;
int skygfx_colorfilter = SKYGFX_COLOR_FILTER_PS2;
int aa_mode = SCE_GXM_MULTISAMPLE_2X;
bool skygfx_ps2_sun = true;
bool high_detail_player = false;
bool detail_textures = false;
bool ped_spec = false;
bool tex_bias = false;
Expand Down Expand Up @@ -72,6 +73,7 @@ void loadConfig(void) {
else if (strcmp("skygfx_colorfilter", buffer) == 0) skygfx_colorfilter = value;
else if (strcmp("skygfx_ps2_sun", buffer) == 0) skygfx_ps2_sun = (bool)value;

else if (strcmp("enable_high_detail_player", buffer) == 0) high_detail_player = (bool)value;
else if (strcmp("disable_detail_textures", buffer) == 0) detail_textures = value ? false : true;
else if (strcmp("disable_ped_spec", buffer) == 0) ped_spec = value ? false : true;
else if (strcmp("disable_tex_bias", buffer) == 0) tex_bias = value ? false : true;
Expand Down Expand Up @@ -101,9 +103,9 @@ void saveConfig(void) {
fprintf(config, "%s %d\n", "skygfx_colorfilter", skygfx_colorfilter);
fprintf(config, "%s %d\n", "skygfx_ps2_sun", (int)skygfx_ps2_sun);

fprintf(config, "%s %d\n", "enable_high_detail_player", (int)high_detail_player);
fprintf(config, "%s %d\n", "disable_detail_textures", detail_textures ? false : true);
fprintf(config, "%s %d\n", "disable_ped_spec", ped_spec ? false : true);

fprintf(config, "%s %d\n", "disable_tex_bias", tex_bias ? false : true);
fprintf(config, "%s %d\n", "disable_mipmaps", mipmaps ? false : true);
fclose(config);
Expand All @@ -117,6 +119,7 @@ char *options_descs[NUM_OPTIONS] = {
"Select the desired post processing effect filter to apply to the 3D rendering.\nThe default value is: PS2.", // skygfx_colorfilter
"Enables shading effects that resamble the PS2 build.\nThe default value is: Enabled.", // skygfx_ps2_shading
"Enables corona sun effect that resambles the PS2 build.\nThe default value is: Enabled.", // skygfx_ps2_sun
"When enabled, high detail player textures are used.\nThe default value is: Disabled.", // high_detail_player
"When enabled, detail textures will be rendered.\nThe default value is: Disabled.", // disable_detail_textures
"When enabled, mipmaps will have more precise bias adjustments at the cost of more expensive GPU code execution.\nThe default value is: Disabled.", // disable_tex_bias
"When enabled, mipmaps will be used causing an higher memory usage and CPU usage but lower memory bandwidth over GPU.\nThe default value is: Enabled.", // disable_mipmaps
Expand All @@ -137,6 +140,7 @@ enum {
OPT_COLOR_FILTER,
OPT_PS2_SHADING,
OPT_PS2_SUN,
OPT_HI_DETAIL_PLAYER,
OPT_DETAIL_TEX,
OPT_TEX_BIAS,
OPT_MIPMAPS,
Expand Down Expand Up @@ -233,6 +237,9 @@ int main(int argc, char *argv[]) {
}
SetDescription(OPT_ANTIALIASING);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 0.0f));
ImGui::Text("High Detail Player Textures:"); ImGui::SameLine();
ImGui::Checkbox("##check15", &high_detail_player);
SetDescription(OPT_HI_DETAIL_PLAYER);
ImGui::Text("Detail Textures:"); ImGui::SameLine();
ImGui::Checkbox("##check4", &detail_textures);
SetDescription(OPT_DETAIL_TEX);
Expand Down
57 changes: 29 additions & 28 deletions gamefiles/controls.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
; Xbox 360 controls
; Vita-enhanced controls

MAPPING_ATTACK BUTTON_CIRCLE
MAPPING_SPRINT BUTTON_CROSS
MAPPING_JUMP BUTTON_SQUARE
MAPPING_CROUCH BUTTON_L3
MAPPING_CROUCH DPAD_DOWN
MAPPING_ENTER_CAR BUTTON_TRIANGLE
MAPPING_BRAKE BUTTON_SQUARE
MAPPING_HANDBRAKE BUTTON_R1
MAPPING_ACCELERATE BUTTON_CROSS
MAPPING_CAMERA_CLOSER BUTTON_SELECT
MAPPING_CAMERA_FARTHER BUTTON_SELECT
MAPPING_HORN BUTTON_L3
MAPPING_HORN DPAD_RIGHT
MAPPING_RADIO_PREV_STATION DPAD_UP
MAPPING_RADIO_NEXT_STATION DPAD_DOWN
MAPPING_VITAL_STATS DPAD_LEFT
MAPPING_NEXT_WEAPON BUTTON_R2
MAPPING_PREV_WEAPON BUTTON_L2
MAPPING_NEXT_WEAPON DPAD_LEFT
MAPPING_PREV_WEAPON DPAD_RIGHT
MAPPING_RADAR BUTTON_START
MAPPING_PED_LOOK_BACK BUTTON_R3
MAPPING_VEHICLE_LOOK_LEFT BUTTON_L2
MAPPING_VEHICLE_LOOK_RIGHT BUTTON_R2
MAPPING_MISSION_START_AND_CANCEL BUTTON_TRIANGLE
MAPPING_MISSION_START_AND_CANCEL_VIGILANTE BUTTON_R3
MAPPING_MISSION_START_AND_CANCEL BUTTON_L3
MAPPING_MISSION_START_AND_CANCEL_VIGILANTE BUTTON_L3
MAPPING_VEHICLE_STEER_X ANALOG_LEFT_X
MAPPING_VEHICLE_STEER_Y ANALOG_LEFT_Y
MAPPING_LOOK_X ANALOG_RIGHT_X
Expand All @@ -30,8 +30,8 @@ MAPPING_PED_MOVE_X ANALOG_LEFT_X
MAPPING_PED_MOVE_Y ANALOG_LEFT_Y
MAPPING_AUTO_HYDRAULICS BUTTON_CIRCLE
MAPPING_SWAP_WEAPONS_AND_PURCHASE BUTTON_L1
MAPPING_WEAPON_ZOOM_IN BUTTON_L2
MAPPING_WEAPON_ZOOM_OUT BUTTON_R2
MAPPING_WEAPON_ZOOM_IN BUTTON_SQUARE
MAPPING_WEAPON_ZOOM_OUT BUTTON_CROSS
MAPPING_ENTER_AND_EXIT_TARGETING BUTTON_R1
MAPPING_VEHICLE_BOMB DPAD_LEFT
MAPPING_TURRET_LEFT BUTTON_L2
Expand All @@ -43,13 +43,14 @@ MAPPING_GANG_RECRUIT DPAD_LEFT
MAPPING_GANG_IGNORE DPAD_RIGHT
MAPPING_GANG_FOLLOW DPAD_UP
MAPPING_GANG_HOLD_POSITION DPAD_DOWN
MAPPING_RHYTHM_UP ANALOG_LEFT_Y
MAPPING_RHYTHM_DOWN ANALOG_LEFT_Y
MAPPING_RHYTHM_LEFT ANALOG_LEFT_X
MAPPING_RHYTHM_RIGHT ANALOG_LEFT_X
MAPPING_RHYTHM_UP DPAD_UP
MAPPING_RHYTHM_DOWN DPAD_DOWN
MAPPING_RHYTHM_LEFT DPAD_LEFT
MAPPING_RHYTHM_RIGHT DPAD_RIGHT
MAPPING_DROP_CRANE BUTTON_CIRCLE
MAPPING_DROP_ITEM BUTTON_TRIANGLE
MAPPING_PHONE BUTTON_L1
MAPPING_NITRO BUTTON_L1
MAPPING_NITRO BUTTON_CIRCLE
MAPPING_CRANE_UP BUTTON_SQUARE
MAPPING_CRANE_DOWN BUTTON_CROSS
Expand Down Expand Up @@ -78,25 +79,25 @@ MAPPING_BLACK_JACK_HIT BUTTON_CROSS
MAPPING_BLACK_JACK_STAND BUTTON_CIRCLE
MAPPING_PLACE_BET BUTTON_CIRCLE
MAPPING_REMOVE_BET BUTTON_SQUARE
MAPPING_NEXT_TARGET BUTTON_R2
MAPPING_PREV_TARGET BUTTON_L2
MAPPING_NEXT_TARGET DPAD_RIGHT
MAPPING_PREV_TARGET DPAD_LEFT
MAPPING_WAYPOINT_BLIP BUTTON_CROSS
MAPPING_HELICOPTER_MAGNET_UP DPAD_LEFT
MAPPING_HELICOPTER_MAGNET_DOWN DPAD_RIGHT
MAPPING_HELICOPTER_MAGNET_UP DPAD_UP
MAPPING_HELICOPTER_MAGNET_DOWN DPAD_DOWN
MAPPING_LOCK_HYDRAULICS BUTTON_R3
MAPPING_FLIGHT_PRIMARY_ATTACK BUTTON_R1
MAPPING_FLIGHT_PRIMARY_ATTACK BUTTON_L1
MAPPING_FLIGHT_SECONDARY_ATTACK BUTTON_CIRCLE
MAPPING_BASKETBALL_SHOOT BUTTON_CIRCLE
MAPPING_BUNNY_HOP BUTTON_L1
MAPPING_MAP_ZOOM_IN BUTTON_L1
MAPPING_MAP_ZOOM_OUT BUTTON_R1
HID_MAPPING_ALT_ATTACK BUTTON_CROSS
HID_MAPPING_BLOCK BUTTON_SQUARE
HID_MAPPING_TAKE_COVER_LEFT BUTTON_L2
HID_MAPPING_TAKE_COVER_RIGHT BUTTON_R2
HID_MAPPING_TOGGLE_LANDING_GEAR BUTTON_L3
HID_MAPPING_KISS BUTTON_L1
MAPPING_DANCING_UP BUTTON_TRIANGLE
MAPPING_DANCING_DOWN BUTTON_CROSS
MAPPING_DANCING_LEFT BUTTON_SQUARE
MAPPING_DANCING_RIGHT BUTTON_CIRCLE
MAPPING_ALT_ATTACK BUTTON_TRIANGLE
MAPPING_BLOCK BUTTON_SQUARE
MAPPING_TAKE_COVER_LEFT BUTTON_L2
MAPPING_TAKE_COVER_RIGHT BUTTON_R2
MAPPING_TOGGLE_LANDING_GEAR DPAD_DOWN
MAPPING_KISS BUTTON_L1
MAPPING_DANCING_UP DPAD_UP
MAPPING_DANCING_DOWN DPAD_DOWN
MAPPING_DANCING_LEFT DPAD_LEFT
MAPPING_DANCING_RIGHT DPAD_RIGHT
102 changes: 102 additions & 0 deletions gamefiles/x360_controls.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
; Xbox 360 controls

MAPPING_ATTACK BUTTON_CIRCLE
MAPPING_SPRINT BUTTON_CROSS
MAPPING_JUMP BUTTON_SQUARE
MAPPING_CROUCH BUTTON_L3
MAPPING_ENTER_CAR BUTTON_TRIANGLE
MAPPING_BRAKE BUTTON_SQUARE
MAPPING_HANDBRAKE BUTTON_R1
MAPPING_ACCELERATE BUTTON_CROSS
MAPPING_CAMERA_CLOSER BUTTON_SELECT
MAPPING_CAMERA_FARTHER BUTTON_SELECT
MAPPING_HORN BUTTON_L3
MAPPING_RADIO_PREV_STATION DPAD_UP
MAPPING_RADIO_NEXT_STATION DPAD_DOWN
MAPPING_VITAL_STATS DPAD_LEFT
MAPPING_NEXT_WEAPON BUTTON_R2
MAPPING_PREV_WEAPON BUTTON_L2
MAPPING_RADAR BUTTON_START
MAPPING_PED_LOOK_BACK BUTTON_R3
MAPPING_VEHICLE_LOOK_LEFT BUTTON_L2
MAPPING_VEHICLE_LOOK_RIGHT BUTTON_R2
MAPPING_MISSION_START_AND_CANCEL BUTTON_TRIANGLE
MAPPING_MISSION_START_AND_CANCEL_VIGILANTE BUTTON_R3
MAPPING_VEHICLE_STEER_X ANALOG_LEFT_X
MAPPING_VEHICLE_STEER_Y ANALOG_LEFT_Y
MAPPING_LOOK_X ANALOG_RIGHT_X
MAPPING_LOOK_Y ANALOG_RIGHT_Y
MAPPING_PED_MOVE_X ANALOG_LEFT_X
MAPPING_PED_MOVE_Y ANALOG_LEFT_Y
MAPPING_AUTO_HYDRAULICS BUTTON_CIRCLE
MAPPING_SWAP_WEAPONS_AND_PURCHASE BUTTON_L1
MAPPING_WEAPON_ZOOM_IN BUTTON_L2
MAPPING_WEAPON_ZOOM_OUT BUTTON_R2
MAPPING_ENTER_AND_EXIT_TARGETING BUTTON_R1
MAPPING_VEHICLE_BOMB DPAD_LEFT
MAPPING_TURRET_LEFT BUTTON_L2
MAPPING_TURRET_RIGHT BUTTON_R2
MAPPING_MAGNET BUTTON_CIRCLE
MAPPING_SKIP_CUTSCENE BUTTON_START
MAPPING_SKIP_CUTSCENE BUTTON_CROSS
MAPPING_GANG_RECRUIT DPAD_LEFT
MAPPING_GANG_IGNORE DPAD_RIGHT
MAPPING_GANG_FOLLOW DPAD_UP
MAPPING_GANG_HOLD_POSITION DPAD_DOWN
MAPPING_RHYTHM_UP ANALOG_LEFT_Y
MAPPING_RHYTHM_DOWN ANALOG_LEFT_Y
MAPPING_RHYTHM_LEFT ANALOG_LEFT_X
MAPPING_RHYTHM_RIGHT ANALOG_LEFT_X
MAPPING_DROP_CRANE BUTTON_CIRCLE
MAPPING_DROP_ITEM BUTTON_TRIANGLE
MAPPING_PHONE BUTTON_L1
MAPPING_NITRO BUTTON_CIRCLE
MAPPING_CRANE_UP BUTTON_SQUARE
MAPPING_CRANE_DOWN BUTTON_CROSS
MAPPING_ACCEPT BUTTON_CROSS
MAPPING_CANCEL BUTTON_TRIANGLE
MAPPING_GRAB BUTTON_L1
MAPPING_STINGER BUTTON_CIRCLE
MAPPING_MENU_DOWN DPAD_DOWN
MAPPING_MENU_UP DPAD_UP
MAPPING_MENU_LEFT DPAD_LEFT
MAPPING_MENU_RIGHT DPAD_RIGHT
MAPPING_MENU_ACCEPT BUTTON_START
MAPPING_MENU_ACCEPT BUTTON_CROSS
MAPPING_MENU_BACK BUTTON_CIRCLE
MAPPING_MENU_MAP BUTTON_SELECT
MAPPING_ARCADE_BUTTON BUTTON_CROSS
MAPPING_ARCADE_POWER_OFF BUTTON_TRIANGLE
MAPPING_ARCADE_RESET BUTTON_SELECT
MAPPING_ARCADE_JOYSTICK ANALOG_LEFT_X
MAPPING_GYM_ACTION BUTTON_CROSS
MAPPING_GYM_EASIER_LEVEL DPAD_LEFT
MAPPING_GYM_HARDER_LEVEL DPAD_RIGHT
MAPPING_BLACK_JACK_SPLIT BUTTON_R1
MAPPING_BLACK_JACK_DOUBLE BUTTON_SQUARE
MAPPING_BLACK_JACK_HIT BUTTON_CROSS
MAPPING_BLACK_JACK_STAND BUTTON_CIRCLE
MAPPING_PLACE_BET BUTTON_CIRCLE
MAPPING_REMOVE_BET BUTTON_SQUARE
MAPPING_NEXT_TARGET BUTTON_R2
MAPPING_PREV_TARGET BUTTON_L2
MAPPING_WAYPOINT_BLIP BUTTON_CROSS
MAPPING_HELICOPTER_MAGNET_UP DPAD_LEFT
MAPPING_HELICOPTER_MAGNET_DOWN DPAD_RIGHT
MAPPING_LOCK_HYDRAULICS BUTTON_R3
MAPPING_FLIGHT_PRIMARY_ATTACK BUTTON_R1
MAPPING_FLIGHT_SECONDARY_ATTACK BUTTON_CIRCLE
MAPPING_BASKETBALL_SHOOT BUTTON_CIRCLE
MAPPING_BUNNY_HOP BUTTON_L1
MAPPING_MAP_ZOOM_IN BUTTON_L1
MAPPING_MAP_ZOOM_OUT BUTTON_R1
MAPPING_ALT_ATTACK BUTTON_CROSS
MAPPING_BLOCK BUTTON_SQUARE
MAPPING_TAKE_COVER_LEFT BUTTON_L2
MAPPING_TAKE_COVER_RIGHT BUTTON_R2
MAPPING_TOGGLE_LANDING_GEAR BUTTON_L3
MAPPING_KISS BUTTON_L1
MAPPING_DANCING_UP BUTTON_TRIANGLE
MAPPING_DANCING_DOWN BUTTON_CROSS
MAPPING_DANCING_LEFT BUTTON_SQUARE
MAPPING_DANCING_RIGHT BUTTON_CIRCLE
Loading

0 comments on commit 23d670f

Please sign in to comment.