From b8ade48ebcc4d200a79814cc43db3a00661d303d Mon Sep 17 00:00:00 2001 From: Cong <congusbongus@gmail.com> Date: Mon, 25 May 2020 20:02:05 +1000 Subject: [PATCH] Bump version number Add linux PS3/PS4 controller buttons --- .travis.yml | 2 +- CMakeLists.txt | 4 ++-- appveyor.yml | 4 ++-- build/linux/io.github.cxong.cdogs-sdl.appdata.xml | 1 + src/cdogs/SDL_JoystickButtonNames/db.h | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fed7a535..679642dab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: - linux - osx env: - - VERSION=0.7.3 + - VERSION=0.8.0 addons: apt: diff --git a/CMakeLists.txt b/CMakeLists.txt index eb6714473..15cf5f7d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) project(cdogs-sdl C) SET(VERSION_MAJOR "0") -SET(VERSION_MINOR "7") -SET(VERSION_PATCH "3") +SET(VERSION_MINOR "8") +SET(VERSION_PATCH "0") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") # Optionally configure CI files since they are excluded in source archives diff --git a/appveyor.yml b/appveyor.yml index 4a1b271f4..9fc410d47 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.7.3.{build} +version: 0.8.0.{build} branches: except: @@ -17,7 +17,7 @@ environment: SDL2_IMAGE_VERSION: 2.0.5 SDL2_MIXER_VERSION: 2.0.4 SDLDIR: C:\projects\cdogs-sdl - VERSION: 0.7.3 + VERSION: 0.8.0 install: - cd C:\Tools\vcpkg diff --git a/build/linux/io.github.cxong.cdogs-sdl.appdata.xml b/build/linux/io.github.cxong.cdogs-sdl.appdata.xml index a6318388d..4005a1d0b 100644 --- a/build/linux/io.github.cxong.cdogs-sdl.appdata.xml +++ b/build/linux/io.github.cxong.cdogs-sdl.appdata.xml @@ -29,6 +29,7 @@ <screenshot>https://i.imgur.com/30KUS8O.png</screenshot> </screenshots> <releases> + <release version="0.8.0" date="2020-05-25"/> <release version="0.7.3" date="2020-01-01"/> <release version="0.7.2" date="2019-12-19"/> <release version="0.7.1" date="2019-11-23"/> diff --git a/src/cdogs/SDL_JoystickButtonNames/db.h b/src/cdogs/SDL_JoystickButtonNames/db.h index f3f65ddb0..ae3fa28a8 100644 --- a/src/cdogs/SDL_JoystickButtonNames/db.h +++ b/src/cdogs/SDL_JoystickButtonNames/db.h @@ -15,4 +15,7 @@ const char *db = "# Columns are: GUID, Joystick Name, button:name:r:g:b (repeate \n\ # Linux\n\ 030000006d04000016c2000010010000,Logitech Logitech Dual Action,a:2:244:244:244,b:3:244:244:244,back:9:64:64:64,dpdown::64:64:64,dpleft::64:64:64,dpright::64:64:64,dpup::64:64:64,leftshoulder:5:64:64:64,leftstick::64:64:64,lefttrigger:7:64:64:64,leftx::64:64:64,lefty::64:64:64,rightshoulder:6:64:64:64,rightstick::64:64:64,righttrigger:8:64:64:64,rightx::64:64:64,righty::64:64:64,start:10:64:64:64,x:1:244:244:244,y:4:244:244:244,platform:Linux,\n\ +030000004c050000cc09000011810000,Sony Interactive Entertainment Wireless Controller,a:X:140:182:228,b:O:248:114:125,back:SHARE:60:60:60,guide:PS:222:233:240,dpdown::60:60:60,dpleft::60:60:60,dpright::60:60:60,dpup::60:60:60,leftshoulder::60:60:60,leftstick::60:60:60,lefttrigger::60:60:60,leftx::60:60:60,lefty::60:60:60,rightshoulder::60:60:60,rightstick::60:60:60,righttrigger::60:60:60,rightx::60:60:60,righty::60:60:60,start:OPTIONS:60:60:60,x:square:211:166:211,y:triangle:0:213:219,platform:Linux,\n\ +030000004c0500006802000011810000,Sony PLAYSTATION(R)3 Controller,a:X:140:182:228,b:O:248:114:125,back:SHARE:60:60:60,guide:PS:222:233:240,dpdown::60:60:60,dpleft::60:60:60,dpright::60:60:60,dpup::60:60:60,leftshoulder::60:60:60,leftstick::60:60:60,lefttrigger::60:60:60,leftx::60:60:60,lefty::60:60:60,rightshoulder::60:60:60,rightstick::60:60:60,righttrigger::60:60:60,rightx::60:60:60,righty::60:60:60,start:OPTIONS:60:60:60,x:square:211:166:211,y:triangle:0:213:219,platform:Linux,\n\ +030000004c0500006802000010810000,SHANWAN PS3 GamePad,a:X:140:182:228,b:O:248:114:125,back:SHARE:60:60:60,guide:PS:222:233:240,dpdown::60:60:60,dpleft::60:60:60,dpright::60:60:60,dpup::60:60:60,leftshoulder::60:60:60,leftstick::60:60:60,lefttrigger::60:60:60,leftx::60:60:60,lefty::60:60:60,rightshoulder::60:60:60,rightstick::60:60:60,righttrigger::60:60:60,rightx::60:60:60,righty::60:60:60,start:OPTIONS:60:60:60,x:square:211:166:211,y:triangle:0:213:219,platform:Linux,\n\ ";