Bumped the version to 1.2.0-alpha

This commit is contained in:
Leon Styhre 2021-08-11 11:36:42 +02:00
parent a7e8457f57
commit 027a750231
7 changed files with 15 additions and 17 deletions

View file

@ -2,6 +2,14 @@
[[_TOC_]] [[_TOC_]]
## Version 1.2.0 (in development)
**Release date:** TBD
### Release overview
### Detailed list of changes
## Version 1.1.0 ## Version 1.1.0
**Release date:** 2021-08-10 **Release date:** 2021-08-10

View file

@ -26,16 +26,6 @@ You can contact me (Leon) via email, either at info@es-de.org or alternatively u
This plan is under constant review so expect it to change from time to time. Still it should give some feeling for which direction to move and what to work on first. These are only the larger topics, there are of course many smaller changes and improvements in addition to these. This plan is under constant review so expect it to change from time to time. Still it should give some feeling for which direction to move and what to work on first. These are only the larger topics, there are of course many smaller changes and improvements in addition to these.
#### v1.1
* Mix image generation based on screenshots, 3D boxes and marquee files (as in Skyscraper)
* Ability to show game media in full screen from the gamelist view
* Proper game launching screen
* New FFmpeg-based video player
* Move to the SDL2 GameController API
* Different button graphics and names applied depending on controller type (Xbox, PlayStation and SNES style)
* Add to the Debian repository
#### v1.2 #### v1.2
* Support for pre-defined alternative emulators and cores (configured in es_systems.xml) * Support for pre-defined alternative emulators and cores (configured in es_systems.xml)

View file

@ -275,7 +275,7 @@ endif()
set(CPACK_PACKAGE_VENDOR "Leon Styhre") set(CPACK_PACKAGE_VENDOR "Leon Styhre")
# Update this when there has been a new release. # Update this when there has been a new release.
set(CPACK_PACKAGE_VERSION "1.1.0") set(CPACK_PACKAGE_VERSION "1.2.0-alpha")
# Use the shorter x64 descriptor if on the x86_64/AMD64 architecture. # Use the shorter x64 descriptor if on the x86_64/AMD64 architecture.
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64) if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64)

View file

@ -11,7 +11,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>EmulationStation</string> <string>EmulationStation</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>EmulationStation Desktop Edition 1.1.0</string> <string>EmulationStation Desktop Edition 1.2.0</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>EmulationStation-DE.icns</string> <string>EmulationStation-DE.icns</string>
<key>CFBundleName</key> <key>CFBundleName</key>
@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.1.0</string> <string>1.2.0-alpha</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.14.0</string> <string>10.14.0</string>
<key>LSUIPresentationMode</key> <key>LSUIPresentationMode</key>

Binary file not shown.

View file

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Version=1.1.0 Version=1.2.0-alpha
Name=EmulationStation Desktop Edition Name=EmulationStation Desktop Edition
GenericName=Emulator Front-end GenericName=Emulator Front-end
Type=Application Type=Application

View file

@ -12,14 +12,14 @@
// Do this version number update as the very last commit for the new release version. // Do this version number update as the very last commit for the new release version.
// clang-format off // clang-format off
#define PROGRAM_VERSION_MAJOR 1 #define PROGRAM_VERSION_MAJOR 1
#define PROGRAM_VERSION_MINOR 1 #define PROGRAM_VERSION_MINOR 2
#define PROGRAM_VERSION_MAINTENANCE 0 #define PROGRAM_VERSION_MAINTENANCE 0
// clang-format on // clang-format on
#define PROGRAM_VERSION_STRING "1.1.0" #define PROGRAM_VERSION_STRING "1.2.0-alpha"
#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__ #define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__
#define RESOURCE_VERSION_STRING "1,1,0\0" #define RESOURCE_VERSION_STRING "1,2,0\0"
#define RESOURCE_VERSION PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_MAINTENANCE #define RESOURCE_VERSION PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_MAINTENANCE
#endif // ES_APP_EMULATION_STATION_H #endif // ES_APP_EMULATION_STATION_H