diff --git a/Makefile.am b/Makefile.am index 8f75d491d..9cb0e9866 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,3 +3,6 @@ ACLOCAL_AMFLAGS = --install -I m4 SUBDIRS = data include src po doc_DATA = COPYING README + +# these are included recursively by dist +EXTRA_DIST = doc packaging diff --git a/README b/README index 31126ba81..df0bb8008 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Seven Kingdoms: Ancient Adversaries ----------------------------------- -Release version 2.14.7-dev +Release version 2.14.7 Project website: www.7kfans.com This is a GPL release of the Seven Kingdoms: Ancient Adversaries thanks to @@ -13,15 +13,16 @@ of the game. Summary of changes in this release --------- - * Added support for 7kfans.com match-making. - * Added LAN game browsing support. - * Added Mobilize Worker button on firms. (sraboy/Microvirus) - * Improvements to mouse acceleration. - * Fixes to mouse movement in fullscreen mode. - * Fixed a bug with 64-bit multiplayer matches. - * Begun translation work. (toaster) - * Fix character encoding with accented characters. (MicroVirus) - * Bugfixes... + * Fixed the visibly fake spy loyalty, leading to easy spy detection + * Increased the rate of fryhtan attacks, based on the number of lairs (MicroVirus) + * Fixed the greater being mana exploit (sraboy) + * Implement better penalty levels for killing civilians + * Fixed a number of AI bugs + * Fixed bugs and crashes + * Improved platform compatibility + * Disabled virtualized window scaling in Windows, which may fix strange mouse behavior + * Added a login dialog for using 7kfans multiplayer service + * Added support for NAT punch-through Thanks to all who made this release possible. @@ -55,13 +56,14 @@ Building the game --------- Required dependencies -* GCC 4.xx or later +* GCC 4.6+ or later (or other C++11 compliant compiler) * SDL 2.0.2 or later (http://libsdl.org/) * enet 1.3.xx (http://enet.bespin.org/) * OpenAL-soft or equivalent driver (http://kcat.strangesoft.net/openal.html) Optional dependencies * Autoconf 2.65 (when using git snapshot) +* libcurl the URL transfer library, for full 7kfans multiplayer integration * gettext 0.18 or later * Game music bundle (copy music into data folder or PACKAGE_DATA_PATH) * NSIS for building a Windows installer @@ -73,5 +75,5 @@ Running To run the game from the build directory, you need to point to the game data folder. The game data folder is set by the environment variable SKDATA. In a bash shell, this can be accomplished by -$ SKDATA=data src/client/7kaa +$ SKDATA=data src/7kaa diff --git a/include/version.h b/include/version.h index 289c2a80a..665f97dd0 100644 --- a/include/version.h +++ b/include/version.h @@ -32,6 +32,6 @@ #define SKVERMED 14 #define SKVERMIN 7 -#define DEV_VERSION +//#define DEV_VERSION #endif diff --git a/packaging/windows/install.nsi b/packaging/windows/install.nsi index 91ff98971..14b22d98f 100644 --- a/packaging/windows/install.nsi +++ b/packaging/windows/install.nsi @@ -99,8 +99,6 @@ Section "7kaa (required)" 7kaareq Rename "$INSTDIR\README" "$INSTDIR\README.txt" File ".\COPYING" Rename "$INSTDIR\COPYING" "$INSTDIR\COPYING.txt" - File ".\COPYING.uuid" - Rename "$INSTDIR\COPYING.uuid" "$INSTDIR\COPYING-uuid.txt" File ".\doc\7kaa-hotkeys-2.14.5.png" File /r ".\data\encyc" File /r ".\data\encyc2" @@ -112,6 +110,8 @@ Section "7kaa (required)" 7kaareq File /r ".\data\sprite" File /r ".\data\tutorial" File .\src\7kaa.exe + File ".\SDL2.dll" + File ".\libcurl.dll" ;Reset Install path ;SetOutPath "$INSTDIR" @@ -145,13 +145,6 @@ Section "OpenAL" openal SectionEnd -Section "SDL" sdl - - SetOutPath "$INSTDIR" - File ".\SDL2.dll" - -SectionEnd - ; Start Menu Shortcuts (can be disabled by the user) Section "Start Menu Shortcuts" startshort @@ -174,8 +167,7 @@ SectionEnd LangString secreq ${LANG_ENGLISH} "Files required for 7kaa to run" LangString secmusic ${LANG_ENGLISH} "Music files for 7kaa" LangString secshort ${LANG_ENGLISH} "Start menu shortcuts" - LangString secopenal ${LANG_ENGLISH} "OpenAL-soft shared library (recommended if not provided by your hardware driver)" - LangString secsdl ${LANG_ENGLISH} "SDL shared library (recommended)" + LangString secopenal ${LANG_ENGLISH} "OpenAL-soft shared library (recommended if not provided by your sound driver)" ;Assign language strings to sections !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN @@ -183,7 +175,6 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${music} $(secmusic) !insertmacro MUI_DESCRIPTION_TEXT ${startshort} $(secshort) !insertmacro MUI_DESCRIPTION_TEXT ${openal} $(secopenal) - !insertmacro MUI_DESCRIPTION_TEXT ${sdl} $(secsdl) !insertmacro MUI_FUNCTION_DESCRIPTION_END ;-------------------------------- @@ -219,6 +210,7 @@ Section "Uninstall" Delete "$INSTDIR\README-music.txt" Delete "$INSTDIR\OpenAL32.dll" Delete "$INSTDIR\SDL2.dll" + Delete "$INSTDIR\libcurl.dll" Delete "$INSTDIR\Uninstall.exe" ; Remove shortcuts