1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

7992 Commits

Author SHA1 Message Date
nordsoft
53d9cb6d00 Merge remote-tracking branch 'upstream/develop' into mod-from-github 2022-08-31 23:41:31 +04:00
nordsoft
9ac8f5bfda Update link to the mod repo 2022-08-30 21:35:03 +04:00
Andrey Filipenkov
d7650ce9c0
use Conan to make macOS CI builds for both Intel and ARM (#782)
* [CI] append platform to output artifact name if it's given
2022-08-30 17:29:00 +03:00
nordsoft
80a206116e Merge remote-tracking branch 'origin/check-for-updates' into mod-from-github 2022-08-30 13:46:03 +04:00
Nordsoft91
4f1f9e3c5d
Fix start game button for rmg without templates (#781) 2022-08-30 08:30:21 +03:00
Nordsoft91
b664f9a128
Fix for #3218 (#777) 2022-08-28 12:55:37 +03:00
nordsoft
e547b468b6 Update only historical builds 2022-08-28 12:41:36 +04:00
nordsoft
b8243b3858 Merge remote-tracking branch 'origin/check-for-updates' into mod-from-github
# Conflicts:
#	config/schemas/settings.json
2022-08-28 04:16:43 +04:00
nordsoft
e5c49f7980 Fix default path to mods repo 2022-08-27 20:45:39 +04:00
nordsoft
559d3f5daf Final changes 2022-08-27 20:15:48 +04:00
nordsoft
7412432111 Fix folder naming from github 2022-08-27 20:02:50 +04:00
nordsoft
03e7b5d39f Support redirecting downloads 2022-08-27 19:59:50 +04:00
nordsoft
e4ac496c07 Try to fix compilation 2022-08-26 22:58:46 +04:00
nordsoft
bb3c1879b7 Final fixeds 2022-08-26 22:26:56 +04:00
nordsoft
5cb1097053 Code review 2022-08-26 03:11:35 +04:00
nordsoft
fd25c76664 Code review fixes 2022-08-26 03:07:07 +04:00
nordsoft
79f0dd7d22 Update headings and fix typo 2022-08-25 07:34:23 +04:00
nordsoft
79fc8d60fb Message for network error 2022-08-25 07:30:50 +04:00
nordsoft
fffab5dcd5 code cleanup 2022-08-25 07:21:03 +04:00
nordsoft
1c94f73e78 Do not show dialog if version is up to date 2022-08-25 06:45:31 +04:00
nordsoft
f434c4d112 Autoscale for the dialog 2022-08-25 06:18:55 +04:00
nordsoft
4f93929c43 All necessary functionality work 2022-08-25 05:34:36 +04:00
nordsoft
744afdbde2 Implemented auto-update 2022-08-25 05:09:20 +04:00
nordsoft
28063cfcf3 update on startup 2022-08-25 03:43:58 +04:00
nordsoft
9eeab608f3 Make new dialog for checking updates 2022-08-25 03:14:12 +04: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