Compare commits

...

43 commits

Author SHA1 Message Date
Jools Wills
a013e72976 bump version to v2.11.1 2023-02-22 14:12:25 +00:00
Jools Wills
ac482e3970 Merge remote-tracking branch 'retropie/master' into stable 2023-02-22 14:11:21 +00:00
Jools Wills
a0c0b90a72 bump version to v2.11.0 2022-09-18 18:00:03 +01:00
Jools Wills
a885fa262f Merge remote-tracking branch 'retropie/master' into stable 2022-09-18 17:57:18 +01:00
Jools Wills
3d22c283d8 bump version to v2.10.3 2022-04-27 02:57:40 +01:00
Jools Wills
9663f5eaed Merge remote-tracking branch 'retropie/master' into stable 2022-04-27 02:56:28 +01:00
Jools Wills
2dd5e6b679 bump version to v2.10.2 2022-03-07 01:08:31 +00:00
Jools Wills
677f63c9ea Merge remote-tracking branch 'retropie/master' into stable 2022-03-07 01:08:09 +00:00
Jools Wills
c9d905c31a bump version to v2.10.1 2021-12-26 15:38:57 +00:00
pjft
1d05ae4f92 Revert default ThreadedLoading option 2021-12-26 15:35:57 +00:00
Jools Wills
c8056701b6 bump version to v2.10.0 2021-10-31 18:36:38 +00:00
Jools Wills
d9be033349 Merge remote-tracking branch 'retropie/master' into stable 2021-10-31 18:36:16 +00:00
Jools Wills
723935d22a Merge remote-tracking branch 'retropie/master' into stable 2020-11-13 01:39:19 +00:00
Jools Wills
be5dcaf228 bump version to v2.9.6 2020-11-04 14:45:31 +00:00
Jools Wills
eae5f0f7e6 Merge remote-tracking branch 'retropie/master' into stable 2020-11-04 14:44:11 +00:00
Jools Wills
2d6e425260 bump version to v2.9.5 2020-11-03 20:08:17 +00:00
Jools Wills
91760a08df Merge remote-tracking branch 'retropie/master' into stable 2020-11-03 20:07:02 +00:00
Jools Wills
be9e0f323b bump version to v2.9.4 2020-11-01 21:39:18 +00:00
Jools Wills
534883ed02 Merge remote-tracking branch 'retropie/master' into stable 2020-11-01 21:38:17 +00:00
Jools Wills
982f6ccb8d bump version to v2.9.3 2020-06-11 04:18:36 +01:00
Jools Wills
6e24dfecfb Merge remote-tracking branch 'retropie/master' into stable 2020-06-11 04:17:30 +01:00
Jools Wills
e56be5ec8c bump version to v2.9.2 2020-06-09 01:27:01 +01:00
Jools Wills
7aff7ce767 Merge remote-tracking branch 'retropie/master' into stable 2020-06-09 01:26:12 +01:00
Jools Wills
49d440a59d bump version to v2.9.1 2020-04-11 23:18:05 +01:00
Jools Wills
9d97dd174c Merge remote-tracking branch 'retropie/master' into stable 2020-04-11 23:17:14 +01:00
Jools Wills
7e6c2bf5a5 bump version to v2.9.0 2019-12-29 21:18:29 +00:00
Jools Wills
e8216c775b Merge remote-tracking branch 'retropie/master' into stable 2019-12-29 21:14:50 +00:00
Conn O'Griofa
a252ea2528 filterTrigger: filter negative trigger axis event after positive axis detection
If filterTrigger detects a positive axis event on a common trigger axis while also
configuring a trigger, the next input event will be a negative axis press
(as the trigger needs to transition from >0 to rest at -32767).

Filter this negative event or else the next item in the configuration dialog
(typically "left thumb") will erroneously detect this as a separate event.
2019-09-24 04:14:16 +01:00
Jools Wills
72b8644fc8 bump version to v2.8.4 2019-06-26 05:16:56 +01:00
Jools Wills
b4fb8ffe49 Merge remote-tracking branch 'retropie/master' into stable 2019-06-26 05:15:36 +01:00
Jools Wills
3a9297abbb bump version to v2.8.3 2019-04-06 02:36:13 +01:00
Jools Wills
5a4073439f Revert "InputManager: improve trigger axis calibration" 2019-04-06 02:34:59 +01:00
Jools Wills
25ef0c8b77 bump version to v2.8.2 2019-03-04 16:19:48 +00:00
Jools Wills
c6fa3c73a2 Merge remote-tracking branch 'retropie/master' into stable 2019-03-04 16:18:51 +00:00
Jools Wills
10ed2f2191 bump version to v2.8.1 2019-02-12 07:45:16 +00:00
Jools Wills
c296a7d999 Merge remote-tracking branch 'retropie/master' into stable 2019-02-12 07:44:45 +00:00
Jools Wills
2af2ec5f12 bump version to v2.8.0 2019-02-09 19:43:08 +00:00
Jools Wills
a384c20ff7 Merge remote-tracking branch 'retropie/master' into stable 2019-02-09 19:41:50 +00:00
Jools Wills
66853e5565 Revert "Revert "Use local game art ( image, marquee and video ) from romfolder/images if the gamelist didn't specify a path""
This reverts commit 9ab5223d35.
2019-02-09 19:38:37 +00:00
Jools Wills
920db2b620 bump version to v2.7.6 2018-07-11 18:16:47 +01:00
John Rassa
0330cfbda6 set curl to follow redirects to fix scraper error
update to use legacy thegamesdb url
2018-07-11 18:15:54 +01:00
Jools Wills
49ca22a2de bump version to v2.7.5 2018-02-27 17:19:37 +00:00
Jools Wills
9ab5223d35 Revert "Use local game art ( image, marquee and video ) from romfolder/images if the gamelist didn't specify a path"
This reverts commit cd2f2ee42b.

temporarily reverted for performance reasons - #381
2018-02-27 17:18:29 +00:00

View file

@ -5,13 +5,14 @@
// These numbers and strings need to be manually updated for a new version.
// Do this version number update as the very last commit for the new release version.
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 12
#define PROGRAM_VERSION_MAINTENANCE 0
#define PROGRAM_VERSION_STRING "2.12.0rp-dev"
#define PROGRAM_VERSION_MINOR 11
#define PROGRAM_VERSION_MAINTENANCE 1
#define PROGRAM_VERSION_STRING "2.11.1rp"
#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__
#define RESOURCE_VERSION_STRING "2,12,0\0"
#define RESOURCE_VERSION_STRING "2,11,1\0"
#define RESOURCE_VERSION PROGRAM_VERSION_MAJOR,PROGRAM_VERSION_MINOR,PROGRAM_VERSION_MAINTENANCE
#endif // ES_APP_EMULATION_STATION_H