Skip to content

Commit

Permalink
Update to 0.9.1 verson (#2877)
Browse files Browse the repository at this point in the history
  • Loading branch information
ihhub committed Mar 4, 2021
1 parent 80d561d commit f73ba73
Show file tree
Hide file tree
Showing 12 changed files with 168 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
23 changes: 20 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
58 changes: 58 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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=.
Expand Down
21 changes: 19 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
22 changes: 19 additions & 3 deletions src/dist/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 19 additions & 3 deletions src/engine/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 9 additions & 1 deletion src/fheroes2/game/game_credits.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/fheroes2/system/gamedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 19 additions & 2 deletions src/tools/Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit f73ba73

Please sign in to comment.