From 027a7502319c391faa0dfcedb8d0f105b17eca34 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 11 Aug 2021 11:36:42 +0200 Subject: [PATCH] Bumped the version to 1.2.0-alpha --- CHANGELOG.md | 8 ++++++++ CONTRIBUTING.md | 10 ---------- es-app/CMakeLists.txt | 2 +- es-app/assets/EmulationStation-DE_Info.plist | 4 ++-- es-app/assets/emulationstation.6.gz | Bin 1039 -> 1043 bytes es-app/assets/emulationstation.desktop | 2 +- es-app/src/EmulationStation.h | 6 +++--- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47e7f494e..329694bd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ [[_TOC_]] +## Version 1.2.0 (in development) + +**Release date:** TBD + +### Release overview + +### Detailed list of changes + ## Version 1.1.0 **Release date:** 2021-08-10 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1782ef565..21eac6cb0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. -#### 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 * Support for pre-defined alternative emulators and cores (configured in es_systems.xml) diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 33325b9df..ab318c60a 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -275,7 +275,7 @@ endif() set(CPACK_PACKAGE_VENDOR "Leon Styhre") # 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. if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64) diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/EmulationStation-DE_Info.plist index f2dead49e..4171fff82 100644 --- a/es-app/assets/EmulationStation-DE_Info.plist +++ b/es-app/assets/EmulationStation-DE_Info.plist @@ -11,7 +11,7 @@ CFBundleExecutable EmulationStation CFBundleGetInfoString - EmulationStation Desktop Edition 1.1.0 + EmulationStation Desktop Edition 1.2.0 CFBundleIconFile EmulationStation-DE.icns CFBundleName @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleVersion - 1.1.0 + 1.2.0-alpha LSMinimumSystemVersion 10.14.0 LSUIPresentationMode diff --git a/es-app/assets/emulationstation.6.gz b/es-app/assets/emulationstation.6.gz index c86a6af3787ee4201711b72537d9546523fc075d..2fbe8f1fa7e0f1c4df82ac366478b3237c604c4e 100644 GIT binary patch delta 884 zcmV-)1B?8R2$Kj0ABzYGD47$H2d;nKg|`8%nv$aaH(E2@Az}Oov*C11{&hcq@vA64 zibhOtjcj0?ad-CM`1@?Wh@+T<_i$~4JSTaS^km~@Nk7S#YY!TY<6oE2!o^Ph&kJGW&q!t6cr%i(tJhvuf61cYN(xo<%;)8Le z-h0}#3OHt%S>^bPevxKe8_jZL18JS!Kg1P=<-W~ zl4qG~uE+YAUD~bmXps6zuCUwseY~INYrGd;&`GM4wXAY?AKcOB@D#Pw!OlIP@(s+E zOTB#;^t;o(iOT*1lf8l9qOsUQTq!v(PT2NrRXevb2Y(MTw&Q>4#l)1dW}cG`#j(eA zp>Tysb$BHu?jm;uocdzlu#NTp7RWDW7?0@0Z9{s!Aa>Y_cE)?{n zFa18#m{TZK(f?$H5WjjC+^?%Ncx delta 880 zcmV-$1CRWZ2#*K{ABzYGibWBT2d;k(!duk*Mr)=!B#a+nHk^*hzitLFeig+>(TM4- zkqwM9?#><@f1k}4aTJsA9_{jxc6n~;&AIhGa@|dMm8njJIz-F0}!IBvzhYAI$R7_)w z77OB&o%=koK&u5w^7|x6f{bg7=79BpXO2E!V2}hK*JRYn`?VAtJ-A3PjB_NKmX&qE zc<`QQrd-2w$#_wkH5oQd#nXSbj;E{V2KMMr?pcO#^2hNTYMHSf=u+A$bGfIo-f)2m zpYU6*&rRmGs&uLt6G?NiffYuQdEvOB;N7{s5P?2cBd_=m-8uTMv;X*aQBb{G;0Up z)j;@CSLcR#fh}Wa4$yyeGwz1yd0{P_(;}M;>ZAh;d#1320&Umk#{GF$5yP4pqeGlwjsuR)^ zKDITkGhE%83B&Q%!=@K5X1k$&K@Oi*kMkv&FuWFV>OJf@SrQc^7 za|)#@`o9q3SMOkg`?XbD+?)sK{*ZYfAwyjDFp>FR){(g@6)(8J^>obV#s|`g$72{y z;(3QSqCh57TVup+U)=k%qr9R>dZ6aZDVl;Cl!oZOUorRkxg7e}uOUW^(f$L)bmM~l G2LJ%fEVz^a diff --git a/es-app/assets/emulationstation.desktop b/es-app/assets/emulationstation.desktop index bf283c1f0..c96fbfcf3 100644 --- a/es-app/assets/emulationstation.desktop +++ b/es-app/assets/emulationstation.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.1.0 +Version=1.2.0-alpha Name=EmulationStation Desktop Edition GenericName=Emulator Front-end Type=Application diff --git a/es-app/src/EmulationStation.h b/es-app/src/EmulationStation.h index 564b099b5..5a3a03e5e 100644 --- a/es-app/src/EmulationStation.h +++ b/es-app/src/EmulationStation.h @@ -12,14 +12,14 @@ // Do this version number update as the very last commit for the new release version. // clang-format off #define PROGRAM_VERSION_MAJOR 1 -#define PROGRAM_VERSION_MINOR 1 +#define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_MAINTENANCE 0 // 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 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 #endif // ES_APP_EMULATION_STATION_H