1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

15932 Commits

Author SHA1 Message Date
Ivan Savenko
e5322eacfd
Merge pull request #4017 from IvanSavenko/version_bump_152
Version bump to 1.5.2
2024-05-20 18:11:27 +03:00
Ivan Savenko
25556424c7 Version bump to 1.5.2 2024-05-20 15:11:08 +00:00
Ivan Savenko
82af0639df
Merge pull request #4004 from Laserlicht/background
[1.5.2] background for multiple windows
2024-05-20 18:10:38 +03:00
Ivan Savenko
ffe14fc1fc
Merge pull request #4022 from vcmi/master
Merge master -> beta
2024-05-20 18:09:51 +03:00
Ivan Savenko
26d1e2e870
Merge pull request #4001 from IvanSavenko/stabilization
[1.5.2] Stabilization
2024-05-20 18:09:08 +03:00
Ivan Savenko
e445e9d6c5 Android build ID bump 2024-05-20 12:18:56 +00:00
Ivan Savenko
52840afb24 Try to detect corrupted mod earlier 2024-05-20 11:00:35 +00:00
Ivan Savenko
017aaefc40 Handle invalid main menu config 2024-05-20 11:00:21 +00:00
Ivan Savenko
d6ff7896fe Fix possible crash on closing game from main menu 2024-05-20 10:57:25 +00:00
Ivan Savenko
215b279ea8 Contact between allies will no longer break simturns 2024-05-19 20:18:14 +00:00
Ivan Savenko
e04c662bc9 Owned object in range of enemy heroes now break simturns 2024-05-19 20:03:24 +00:00
Ivan Savenko
10b50cd905 It is now possible to vote for simturns and turn timer changes 2024-05-19 18:31:32 +00:00
Ivan Savenko
6f6555d19c Downgrade fatal exception to disconnection message 2024-05-19 12:54:51 +00:00
Ivan Savenko
d5f32c27b0
Merge pull request #3996 from IvanSavenko/retaliation_tweaks
[1.5.2] Retaliation preview tweaks
2024-05-19 15:44:16 +03:00
Ivan Savenko
23c56444cd
Merge pull request #3966 from vcmi/rmg_docs
RMG docs
2024-05-19 15:43:48 +03:00
Ivan Savenko
692cbfb7e2
Merge pull request #3992 from IvanSavenko/mod_validation_fix
Tweaks to modding docs
2024-05-19 15:43:16 +03:00
Ivan Savenko
9ed749e104
Merge pull request #3991 from Laserlicht/preselect_last_save_while_loading
[1.5.2] preselect last save in loading screen
2024-05-19 15:42:59 +03:00
Ivan Savenko
c5a53f4866
Merge pull request #3990 from IvanSavenko/random_monsters
[1.5.2] Exclude some AB creatures from randomization picks
2024-05-19 15:42:29 +03:00
Ivan Savenko
fd74d5391e
Merge pull request #3988 from IvanSavenko/ubuntu_24_04_runner
[1.5.2] Use Ubuntu 24.04 runner for some presets
2024-05-19 15:42:18 +03:00
Ivan Savenko
68883e0b29 Fixed disabling of text input on closing high scores 2024-05-19 12:39:59 +00:00
Ivan Savenko
5feef488e3 Added Ctrl & Shift versions for swap artifacts shortcut. Exchange window
shortcuts now work even without vcmi extras
2024-05-19 12:28:03 +00:00
Ivan Savenko
896fd27ead Add alternative shortcuts to hero movement 2024-05-19 10:54:12 +00:00
Ivan Savenko
d965226cbd Moved Exchange Window to new file, no functionality changes 2024-05-19 10:53:56 +00:00
Ivan Savenko
6f37d5c753 Add all new shortcuts to config file, apply alphabetic sort 2024-05-19 09:59:54 +00:00
Ivan Savenko
ad264699c3 Update names of changed shortcuts 2024-05-19 09:59:28 +00:00
Ivan Savenko
0d6d6fca03 Add detection of missing shortcuts 2024-05-19 09:59:12 +00:00
Ivan Savenko
16f963bed5 Fix zooming with keyboard shortcuts 2024-05-19 09:58:55 +00:00
Ivan Savenko
11c00711f9 Add string ID's for all new shortcuts 2024-05-19 09:12:36 +00:00
Ivan Savenko
6ba36cf6c0 Add separate shortcuts for adventure map and settings window 2024-05-19 09:12:36 +00:00
Ivan Savenko
dd337dba7b Fixed Puzzle Map hotkey not working due to having inactive button in
world view mode
2024-05-19 09:12:36 +00:00
Ivan Savenko
0db8266495 Implemented some of the requested shortcuts 2024-05-19 09:12:36 +00:00
Ivan Savenko
88fbb7ee71 Most of buttons created in cpp now have assigned shortcut 2024-05-19 09:12:36 +00:00
Ivan Savenko
f83aaccbb5
Merge pull request #4003 from IvanSavenko/artset_shortcut_fix
[1.5.2] Add separate shortcuts for saving and loading of artifact costumes
2024-05-19 12:10:58 +03:00
Laserlicht
c676b999e5 use showAll 2024-05-18 20:21:47 +02:00
Laserlicht
fc50482b43 background for multiple windows 2024-05-18 19:58:51 +02:00
Ivan Savenko
947d07faa4 Add separate shortcuts for saving and loading of artifact costumes 2024-05-18 16:27:42 +00:00
Ivan Savenko
d502850054 Add network thread termination logic for adventure map animations 2024-05-18 12:15:48 +00:00
Ivan Savenko
9bfe000724 Added semi-workaround method for network thread shutdown:
Currently closing game while network thread is waiting for something is
very bug-prone, since network thread may resume during shutdown and
access partially destroyed client state.

Now if exit has been requested, the very first step would be semi-
graceful shutdown of network thread (via exception throwing). This may
in theory skip some cleanup in non-RAII code, but since game is shutting
down this does not matters much.

This logic applies to:
- shutting down while network thread is waiting for dialogs
- shuttind down while network thread waiting for animations in combat
2024-05-18 11:04:10 +00:00
Ivan Savenko
0dfa781655 Add mutex as a quick fix for concurrent access to text handler by client
and server
2024-05-18 09:02:21 +00:00
Ivan Savenko
004e6d1fcb Fix crash on starting random map with random number of players 2024-05-17 18:25:09 +00:00
Ivan Savenko
7f9df2ef6f Tweaks to retaliation damage calculation:
- method now uses early returns to avoid deeply nested if's
- assume that retaliation damage is zero if target will die from attack
- account for BLOCKS_RETALIATION bonus when computing whether target
will retaliate
2024-05-17 12:23:51 +00:00
Ivan Savenko
85d8e093df Battle console: attempt to re-split string if it is too long to fit into
two lines due to line break
2024-05-17 12:22:21 +00:00
Ivan Savenko
cba49a9952 Fix gcc-14 build 2024-05-17 10:10:06 +00:00
Ivan Savenko
dd7991b70f Use 24.04 runner for presets that don't produce output artifacts 2024-05-17 10:03:52 +00:00
Ivan Savenko
65f63e862c Tweaks to modding docs & error reporting based on discovered issues 2024-05-16 15:14:36 +00:00
Laserlicht
359503f878 preselect last save in loading screen 2024-05-16 13:16:14 +02:00
Ivan Savenko
194b3389f9
Merge pull request #3989 from vcmi/beta
Merge beta -> master
2024-05-16 13:08:20 +03:00
Ivan Savenko
f309a4eb82 Exclude some AB creatures from randomization picks
This changes handling of several campaign-only creatures to be in line
with H3 - Sharpshooters, Enchanters and Azure/Rust/Faerie/Crystal
dragons.

Now these creatures will not be picked for
- random creatures in Refugee Camp
- as replacement for Random Monster object from map editor

Random map generator is not affected and can still pick this creatures
(confirmed to be same in H3)
2024-05-16 09:53:37 +00:00
Ivan Savenko
1f1e693a5b
Merge pull request #3972 from IvanSavenko/release_151
Release 1.5.1 preparation
2024-05-16 11:50:07 +03:00
Ivan Savenko
09416a5687 Update changelog 2024-05-16 08:03:06 +00:00