diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a4b22e0092f..8fbfe20c4eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ #### **Do you want to contribute to the project?** -fheroes2 is a volunteer effort. We encourage you to pitch in and [join the team](https://github.com/ihhub/fheroes2/wiki/Contributors)! If you see that your name is not present in the list, please be free to contact us and report about such terrible mistake. +fheroes2 is a volunteer effort. We encourage you to pitch in and join the team! Thanks! :heart: :heart: :heart: diff --git a/Makefile b/Makefile index cf46181c1fa..c7bb91f2ebd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,23 @@ -# makefile -# project: Free Heroes of Might and Magic II (https://github.com/ihhub/fheroes2) -# +########################################################################### +# Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 # +# Copyright (C) 2021 # +# # +# This program is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program; if not, write to the # +# Free Software Foundation, Inc., # +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +########################################################################### + # Options: # DEBUG: build in debug mode # RELEASE: build with addons extensions diff --git a/README.md b/README.md index 6b6b2f86891..e2be5d415a1 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ MacOS and Linux Contribution --------------------------- -We welcome and appreciate any help, even if it is a tiny text or code change. Please read [contribution](https://github.com/ihhub/fheroes2/blob/master/CONTRIBUTING.md) page before starting work on a pull request. All contributors are listed in the project's wiki [page](https://github.com/ihhub/fheroes2/wiki/Contributors). +We welcome and appreciate any help, even if it is a tiny text or code change. Please read [contribution](https://github.com/ihhub/fheroes2/blob/master/CONTRIBUTING.md) page before starting work on a pull request. Not sure what to start with? Feel free to refer to [good first issue](https://github.com/ihhub/fheroes2/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) or [help wanted](https://github.com/ihhub/fheroes2/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) tags. License diff --git a/appveyor.yml b/appveyor.yml index 415e815f816..b27b4f35ea0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ skip_commits: skip_tags: true # version format -version: 0.9.0.{build} +version: 0.9.1.{build} # Build worker image (VM template) image: Visual Studio 2015 diff --git a/changelog.txt b/changelog.txt index 7b5c7de9937..565ff8cfb89 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,61 @@ +version 0.9.1 (04 March 2021) +- add "Artifacts" category in Oracle Screen +- add barrier fading animation +- improve AI retreat condition +- fix Split-related issues and implement some new techniques +- disable retreat for auto battle mode +- fix object's visited info and grammar +- fix issues with path finding during combat to avoid being stopped by moat +- fix incorrect names of Ballista and Turret during battle +- add missing shadow for arrow cursor on SDL2 +- fix ACCEPT button font for Good Interface +- fix AI wide units pathfding and moat logic +- allow to modify a hero during level up +- fix summon boat logic +- fix monster movement nearby moat +- AI does not chase faster units during battle +- fix hero shadow drawing on world map +- fix missing animation frame for wince +- fix object fading animation on world map +- fix missing last lost hero condition reset +- fix simultaneous animation of boat while during another building construction +- change logic in monster hiring window +- fix save loading crash for broken saves +- add middle resolution status support +- do not show waiting cursor for an exhausted hero +- fix post Daemon Cave missing music +- fix well's max button drawing +- fix incorrect castle focus while visiting by a hero +- fix fog drawings +- reduce income window area in towns +- fix autosave option logic +- fix overlapped battleground objects +- remember scenario difficulty while restarting or choosing a new scenario +- fix multiple game frezes with MIDI music playback +- add resizable window support on SDL2 +- make deterministic bonus for hero level-up +- fix wrong controller pointer speed option name and touch coordinates translation +- add auto battle resolve mode to the game +- add logic to support video frame rescaling +- optimize screen resolution logic +- fix garrison strength estimation by AI +- fix magic gardens priority if object capture is enabled +- optimize AI's troop placement before the battle +- use same colour for all battlegrounds +- change text in map size hint, to be displayed in more pleasant manner +- load game button from UI should lead to common load game logic +- initial implementation of "View World" +- fix application crash for drawings +- change building status message for Dwellings +- fix crash when entering ally castle +- add Campaign continuation initial support +- speed up rendering of World Map +- fix spell book status on hovering +- save fullscreen mode in configuration file while switching between modes +- AI should avoid spellcasting if has advantage in battle +- fix rendering with mouse emulation +- fix extensive memory usage by dialog windows + version 0.9.0 (04 February 2021) - make AI to buy magic books in castles - fix infinite AI turns diff --git a/sonar-project.properties b/sonar-project.properties index fe31cf72cb2..e9fd8d528ab 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=ihhub # This is the name and version displayed in the SonarCloud UI. sonar.projectName=fheroes2 -sonar.projectVersion=0.9.0 +sonar.projectVersion=0.9.1 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. sonar.sources=. diff --git a/src/Makefile b/src/Makefile index 2343b8f6dc9..9be31a21c86 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,22 @@ -# makefile -# project: Free Heroes of Might and Magic II (https://github.com/ihhub/fheroes2) +########################################################################### +# Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 # +# Copyright (C) 2021 # +# # +# This program is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program; if not, write to the # +# Free Software Foundation, Inc., # +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +########################################################################### TARGET := fheroes2 diff --git a/src/dist/Makefile b/src/dist/Makefile index 54d8f3b8686..3128c466b61 100644 --- a/src/dist/Makefile +++ b/src/dist/Makefile @@ -1,6 +1,22 @@ -# makefile -# project: Free Heroes2 -# +########################################################################### +# Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 # +# Copyright (C) 2021 # +# # +# This program is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program; if not, write to the # +# Free Software Foundation, Inc., # +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +########################################################################### ifeq ($(PREFIX),) PREFIX := /usr/local diff --git a/src/engine/Makefile b/src/engine/Makefile index cddeef8aa9a..6c36bfea174 100644 --- a/src/engine/Makefile +++ b/src/engine/Makefile @@ -1,6 +1,22 @@ -# makefile -# project: Free Heroes2 -# libSDL C++ wrapper engine +########################################################################### +# Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 # +# Copyright (C) 2021 # +# # +# This program is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program; if not, write to the # +# Free Software Foundation, Inc., # +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +########################################################################### TARGET := libengine CFLAGS := $(CFLAGS) -I../thirdparty/libsmacker diff --git a/src/fheroes2/game/game_credits.cpp b/src/fheroes2/game/game_credits.cpp index 14af1ff6f38..3635fbcb8eb 100644 --- a/src/fheroes2/game/game_credits.cpp +++ b/src/fheroes2/game/game_credits.cpp @@ -96,7 +96,15 @@ void Game::ShowCredits() title.Blit( screenOffset.x + 2 * columnStep + ( columnStep - title.w() ) / 2, offsetY ); offsetY += title.h(); - const std::string contributors( "LeHerosInconnu\nshprotru\nundef21\nvincent-grosbois\neos428\nAndrey Starodubtsev\nVasilenko Alexey\nemotionalamoeba\ntau3\n" + const std::string contributors( "LeHerosInconnu\n" + "shprotru\n" + "undef21\n" + "vincent-grosbois\n" + "eos428\n" + "Andrii Kurdiumov\n" + "Vasilenko Alexey\n" + "Andrey Starodubtsev\n" + "dimag0g\n" "and many other contributors!" ); name.Set( contributors, Font::BIG, textWidth ); diff --git a/src/fheroes2/system/gamedefs.h b/src/fheroes2/system/gamedefs.h index acdebf20e54..8c677a88b4f 100644 --- a/src/fheroes2/system/gamedefs.h +++ b/src/fheroes2/system/gamedefs.h @@ -27,7 +27,7 @@ #define MAJOR_VERSION 0 #define MINOR_VERSION 9 -#define INTERMEDIATE_VERSION 0 +#define INTERMEDIATE_VERSION 1 // hardcore defines: kingdom #define KINGDOMMAX 6 diff --git a/src/tools/Makefile b/src/tools/Makefile index be3284831aa..163c70aee95 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -1,5 +1,22 @@ -# makefile -# project: Free Heroes2 Tools +########################################################################### +# Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 # +# Copyright (C) 2021 # +# # +# This program is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program; if not, write to the # +# Free Software Foundation, Inc., # +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +########################################################################### ifdef FHEROES2_SDL1 SDL_LIBS := $(shell sdl-config --libs)