1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Commit Graph

7983 Commits

Author SHA1 Message Date
DjWarmonger
dac4628c45
Mine roads (#808)
* Create dirt roads to mines if there are no roads in a zone.
2022-09-04 09:54:06 +03:00
Nordsoft91
c6c5c07e2d
Final preparations for merge into develop (#780)
* version updated, change log updated from release draft
* horse sounds for terrains
* Update and freeze essential files
2022-09-03 19:02:24 +03:00
nordsoft
be6a7d1836 Randomly shuffle required objects to avoid patterns 2022-09-01 13:26:11 +03:00
Nordsoft91
47d3539f41 Fix problems with water zone (#784) 2022-08-29 08:53:36 +03:00
Nordsoft91
f668c65eb2 Fix RMG bug with incorrect town placement (#779)
* Fix RMG bug with incorrect town placement
* Readability tweak
2022-08-29 08:53:36 +03:00
Nordsoft91
f3f1fb8033 Improve treasure placement logic (#775)
Improve treasure placement logic (#775)
2022-08-29 08:53:36 +03:00
Nordsoft91
ae63e0c30e Fix problem with empty areas (#772)
* Fixes for obstacles and treasures
2022-08-29 08:53:36 +03:00
Nordsoft91
9ec0ca332c Fix for sealed-off treasures (#771)
Fix for sealer-off treasures
2022-08-29 08:53:36 +03:00
Nordsoft91
c0db4f1d96 Random map generator refactoring (#762)
random map generator refactoring and improvements
2022-08-29 08:53:36 +03:00
nordsoft
4eb3982172 Fix typo 2022-08-29 08:53:35 +03:00
Andrii Danylchenko
a454edacea Fix getting battlefield crash 2022-08-29 08:53:35 +03:00
Andrii Danylchenko
ac2bd4f79c battlefields in VLC and custom bonuses for terrain patches 2022-08-29 08:53:35 +03:00
Andrii Danylchenko
2228a6f9bf allow configurable battleground graphics 2022-08-29 08:53:35 +03:00
Nordsoft91
9241cd1e62 New battlegrounds (#758) 2022-08-29 08:53:35 +03:00
Nordsoft91
5151da59a7 New terrain support - part 1 (#755)
Initial support of new terrains
2022-08-29 08:53:35 +03:00
Nordsoft91
b664f9a128
Fix for #3218 (#777) 2022-08-28 12:55:37 +03:00
nordsoft
92dc902748 Fix for #3228 and #3042 2022-08-24 14:58:56 +03:00
Evgeniy Meshcheryakov
ff00747ecf Fixed 3206 Bugged 'Start Walking' animation 2022-08-15 09:23:35 +03:00
Andrey Filipenkov
c0825149cf fix error C2338 when building Client on Windows
Windows headers require the default packing option. Changing this can lead to memory corruption. This diagnostic can be disabled by building with WINDOWS_IGNORE_PACKING_MISMATCH defined.
2022-08-06 11:47:09 +03:00
Andrey Filipenkov
7150ee565a [macOS] text input handling must be done on main thread
Xcode's Main Thread Checker warns about that
2022-08-03 12:09:49 +03:00
Andrey Filipenkov
f2187f6767 fix infinite recursion when using SDL_mixer v2.6
Mix_HaltChannel -> soundFinishedCallback -> Mix_FreeChunk -> soundFinishedCallback -> ...
2022-08-03 12:08:41 +03:00
Andrey Filipenkov
0429ff61b0 don't link client to TBB 2022-07-29 11:18:36 +03:00
nordsoft
53b9434a22 Fix crash 2022-07-29 11:08:38 +03:00
Evgeniy Meshcheryakov
e38b822303 Fix crash in scenario information window if campaign has no difficulty settings 2022-07-28 11:35:14 +03:00
Andrey Filipenkov
37f56e075a specify that update_version target produces file Version.cpp
without it Xcode's new build system complains that Version.cpp doesn't exist and building freezes
2022-07-21 17:24:43 +03:00
Max Desiatov
b8b330668d Remove ffmpeg@4 from $CMAKE_PREFIX_PATH as unused 2022-06-27 10:49:10 +03:00
Max Desiatov
aaa2cd6f04 Support Homebrew on M1
Homebrew uses prefix path on M1 (`/opt/homebrew`) different from x86_64 Homebrew path. It can be queried with `brew --prefix` command, which allows supporting both platforms in `mac/before_install.sh`.
2022-06-27 10:49:10 +03:00
Nordsoft91
54fab9f0f8
Freeze macos build version to ensure compatibility with older macos v… (#759) 2022-06-21 16:52:49 +03:00
Andrii Danylchenko
c4dec67acc Fix movement freeze after battle in teleport 2022-06-20 09:05:05 +03:00
Soar Qin
188607b05f Replace cotire with CMake builtin precompiled headers support (Requires CMake version >= 3.16) 2022-06-17 17:20:08 +03:00
Andrii Danylchenko
2521e7bac9 Fix flickering in fullscreen 2022-06-13 16:11:53 +03:00
Soar Qin
c87df8e704
Fix warnings/errors on MSVC (#753)
* Fix warnings/errors on MSVC
1. update googletest to tag release-1.11.0 to make googletest and
   googlemock compile on MSVC2022.
2. set gtest_force_shared_crt to ON in test cmake project to make tests
   compile on MSVC.
3. add /wd4251 and /wd4275 to MSVC compile flags to ignore DLL related
   warnings for class exports.
4. fix some other warnings and errors while compiling on MSVC2022.
2022-06-11 18:45:34 +03:00
Nordsoft91
0b29fec63c Rmg water support (#754)
* Final changes before merge
2022-06-11 18:40:24 +03:00
Nordsoft91
5054ee011a Rmg water support (#751)
* Roads added to shipyard
* Load general rmg parameters from config
* Fix issue with default zone guard
* Move magic numbers related to balance to randomMap.json
2022-06-11 18:40:24 +03:00
Nordsoft91
5c1a66ab69 Rmg water support (#745)
* RMG: water support and refactoring
* Fix seers hut bug
2022-06-11 18:40:24 +03:00
Andrii Danylchenko
b698f32557 Allow features/* branches to be published to downloads 2022-06-11 18:40:24 +03:00
Andrii Danylchenko
1128abc593 Fix hero movement animation 2022-06-07 15:00:39 +03:00
Andrii Danylchenko
31c9d6e28d Fix performance issue related to TurnInfo construction 2022-06-06 09:47:37 +03:00
Soar Qin
b061c4988c
Changes to resolution check on window creation (#747)
* Changes to resolution check on window creation:
1. Allow scaled rendering in window mode
2. Match closest logical rendering resolution while scaling is used
2022-06-06 09:46:24 +03:00
Konstantin
1a6ee0d697
Launcher: Qt6 support. Qt 5.12 required (#746)
* Launcher: Qt6 support. Qt 5.12 required
2022-05-28 16:32:20 +03:00
Nordsoft91
9d06e51631
Place proper towns in underground (#743)
Implement feature of proper town selection in underground and surface
* Some minor refactoring of rmg
2022-05-28 16:03:50 +03:00
nordsoft
d92356f085 Fixed game crash: divide by zero due to threads racing 2022-05-28 14:34:36 +03:00
Konstantin
7a32e41d47
Correct linux preset (#748)
* presets: add correct linux presets
* CMakePresets: added MSVC Release preset
2022-05-28 14:32:54 +03:00
Andrii Danylchenko
6c9b0f5667 Switch back to Release for now 2022-05-27 10:11:44 +03:00
Konstantin
8fc14369a4
CMake presets. (#744)
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
2022-05-26 08:55:20 +03:00
Nordsoft91
a8265c7052
[0002285] Implement feature with extra resources near mines (#742)
* RMG: clear start position
* [0002285] some heaps of resources are placed nearby mines
* Fix leak in case of inability to place resource
* Fix indentation according to vcmi style
* Add constant for random amount of resources
* Code review fixes
2022-05-23 13:08:36 +03:00
Andrii Danylchenko
c293b655f5 Fix one more battle ai related crash. 2022-05-21 15:41:56 +03:00
Konstantin
c6b198ce14
Warning fix (I moved C++17 and CI to another branch) (#739)
* clang warning fixes
* use CMake 3.10 due to MXE CI does not have 3.13 yet

Co-authored-by: Konstantin <rilian@niisi.ras.ru>
2022-05-19 15:14:50 +03:00
Andrii Danylchenko
55b8aac63e fix missed required fields in settings 2022-05-16 12:09:10 +03:00
Andrii Danylchenko
b269d7fed6 Fix case when defender creature is killed with pre-attack spell like liches death ripple 2022-05-14 17:38:06 +03:00