Skip to content

Commit

Permalink
Bump version number
Browse files Browse the repository at this point in the history
Add linux PS3/PS4 controller buttons
  • Loading branch information
cxong committed May 25, 2020
1 parent c855c8b commit b8ade48
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ os:
- linux
- osx
env:
- VERSION=0.7.3
- VERSION=0.8.0

addons:
apt:
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.7.3.{build}
version: 0.8.0.{build}

branches:
except:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions build/linux/io.github.cxong.cdogs-sdl.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
3 changes: 3 additions & 0 deletions src/cdogs/SDL_JoystickButtonNames/db.h
Original file line number Diff line number Diff line change
Expand Up @@ -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\
";

0 comments on commit b8ade48

Please sign in to comment.