Ivan Savenko
|
d86c0a969d
|
Fix conflicting market/town hotkeys
|
2023-07-30 12:34:34 +03:00 |
|
Ivan Savenko
|
5776e171c4
|
Fix list of possible resources given by some objects, e.g. windmills
|
2023-07-30 12:31:35 +03:00 |
|
Ivan Savenko
|
a73146751c
|
Execute cursor changes in main thread on any platform
|
2023-07-30 12:30:56 +03:00 |
|
DjWarmonger
|
4e044a78ce
|
Merge pull request #2436 from vcmi/fix-freeze-ai-attacking-dwelling
Fix freeze ai attacking dwelling
|
2023-07-29 09:22:06 +02:00 |
|
Tomasz Zieliński
|
943e3e888c
|
Merge remote-tracking branch 'origin/beta' into fix-freeze-ai-attacking-dwelling
# Conflicts:
# server/CGameHandler.cpp
|
2023-07-29 08:11:27 +02:00 |
|
Michael
|
aaa115cf4b
|
Button-Sound -> haptic feedback
|
2023-07-29 00:11:16 +02:00 |
|
Ivan Savenko
|
6c52293dd9
|
Merge pull request #2425 from IvanSavenko/fix_combat_replay
Attempt to fix combat replay queries
|
2023-07-29 00:03:44 +03:00 |
|
Andrii Danylchenko
|
8e1dc785eb
|
Wrong player was engaged for 5lvl dwelling
|
2023-07-28 14:19:12 +03:00 |
|
Ivan Savenko
|
1983078ba9
|
Merge pull request #2430 from IvanSavenko/update_translations
Update translations
|
2023-07-28 13:50:20 +03:00 |
|
Ivan Savenko
|
6153c1b203
|
Merge pull request #2422 from IvanSavenko/hero_pool_fix
Fix errors about "hero has no army" for defeated heroes
|
2023-07-28 13:43:50 +03:00 |
|
Ivan Savenko
|
b52a21f8ee
|
Regenerated map editor translations to include missing strings
|
2023-07-28 13:42:53 +03:00 |
|
Ivan Savenko
|
4ba6806a69
|
Added missing string to Editor translation
|
2023-07-28 13:42:53 +03:00 |
|
Ivan Savenko
|
8c4e23f2d6
|
Updated Launcher localization
|
2023-07-28 13:42:49 +03:00 |
|
Ivan Savenko
|
5caf987894
|
Merge pull request #2435 from heroesiiifan/patch-4
Vietnamese language support
|
2023-07-28 13:39:36 +03:00 |
|
Ivan Savenko
|
dd88d39a82
|
Merge pull request #2419 from dydzio0614/multiplayer-adventure-map-responsiveness
Multiplayer adventure map responsiveness
|
2023-07-28 13:39:02 +03:00 |
|
heroesiiifan
|
bee59b3c1c
|
Update Languages.h
|
2023-07-28 00:48:06 +00:00 |
|
heroesiiifan
|
648f7344c7
|
Update mod.json
|
2023-07-28 00:34:28 +00:00 |
|
heroesiiifan
|
ddfeeb152d
|
Update settings.json
|
2023-07-28 00:33:42 +00:00 |
|
heroesiiifan
|
da7f1f4620
|
Update LanguageSettingDialog.java
|
2023-07-28 00:31:59 +00:00 |
|
heroesiiifan
|
840d5afe17
|
Update languages.cpp
|
2023-07-28 00:31:07 +00:00 |
|
heroesiiifan
|
917229b988
|
Update Languages.h
|
2023-07-28 00:29:57 +00:00 |
|
Ivan Savenko
|
aed8c411fc
|
Minor rework & cleanup of combat replays
|
2023-07-27 19:25:55 +03:00 |
|
Ivan Savenko
|
b8110218c0
|
Silence unnecessary warning on flagging guarded garrison
|
2023-07-27 18:39:05 +03:00 |
|
Dydzio
|
0b5cea0320
|
Use new adventure map state to detect opponent human turn
|
2023-07-27 17:26:52 +02:00 |
|
Ivan Savenko
|
72210afc92
|
Do not attempt to reset movement for inactive heroes in pool
|
2023-07-27 15:51:38 +03:00 |
|
DjWarmonger
|
a188d55685
|
Merge pull request #2418 from vcmi/fix_morn_battlefields
Fix morn battlefields
|
2023-07-27 07:08:10 +02:00 |
|
Dydzio
|
ff1a635e9e
|
Unblock basic adventure map actions (scrolling / right-click) in multiplayer
|
2023-07-26 21:20:11 +02:00 |
|
Tomasz Zieliński
|
2747174810
|
Fix incorrect sand shore id
|
2023-07-26 17:12:09 +02:00 |
|
Ivan Savenko
|
7b17c5ae18
|
Merge pull request #2416 from IvanSavenko/fix_battlefield_resolving
Fix resolving of battlefield identifiers
|
2023-07-26 16:15:48 +03:00 |
|
Ivan Savenko
|
5f1af86536
|
Merge pull request #2413 from dydzio0614/fix-bonuses-missing-entries
Fix bonuses missing entries
|
2023-07-26 02:02:35 +03:00 |
|
Ivan Savenko
|
ff2ae1d2d3
|
Merge pull request #2414 from IvanSavenko/fix_autocombat_crash
Fix autocombat crash
|
2023-07-26 02:02:28 +03:00 |
|
Ivan Savenko
|
e733b55c90
|
Removed buggy and poorly designed fromString method
Use VLC->modh directly with proper parameters instead
|
2023-07-25 22:36:45 +03:00 |
|
Ivan Savenko
|
32f7a95e38
|
Use capture by value since thread might start after local method returns
|
2023-07-25 22:33:59 +03:00 |
|
Ivan Savenko
|
1335a834e2
|
Merge pull request #2408 from IvanSavenko/remove_log_warning
Remove log warning
|
2023-07-25 18:15:52 +03:00 |
|
Ivan Savenko
|
eccd8590f5
|
Merge pull request #2406 from IvanSavenko/fix_mutex
Fix game hang/crash on locking mutex
|
2023-07-25 18:15:37 +03:00 |
|
Ivan Savenko
|
705cdb846d
|
Merge pull request #2403 from IvanSavenko/error_detection_fix
Attempt to fix & improve error reporting
|
2023-07-25 18:15:28 +03:00 |
|
Dydzio
|
e4303c63ce
|
Add json entries for missing bonuses
|
2023-07-25 17:13:02 +02:00 |
|
DjWarmonger
|
ae1aa816d3
|
Merge pull request #2405 from vcmi/fix-2389
#1965 - treat dwelling defenders as neutrals
|
2023-07-25 17:02:45 +02:00 |
|
DjWarmonger
|
b4c9b81a33
|
Update SideInBattle.cpp
|
2023-07-25 15:02:28 +03:00 |
|
DjWarmonger
|
71fe5c556f
|
Merge pull request #2203 from vcmi/remove_seed_info
Remove random seed from map description
|
2023-07-25 10:36:32 +02:00 |
|
DjWarmonger
|
c46f9b900a
|
Merge pull request #2411 from vcmi/fix-2044
Fix 2044
|
2023-07-25 10:08:54 +02:00 |
|
Andrii Danylchenko
|
ec8898a0e7
|
#1965 - treat dwelling defenders as neutrals
|
2023-07-25 10:13:41 +03:00 |
|
Andrii Danylchenko
|
fe9090ddfa
|
#2044 - changed order of destructors to avoid crash
|
2023-07-25 10:09:28 +03:00 |
|
Ivan Savenko
|
823080be86
|
Fix error on opening map list with hota maps
|
2023-07-24 23:27:26 +03:00 |
|
Ivan Savenko
|
bf7d8ba6de
|
Fix typo
|
2023-07-24 23:16:44 +03:00 |
|
Ivan Savenko
|
37437224f9
|
Remove excessive warning
|
2023-07-24 23:16:34 +03:00 |
|
Ivan Savenko
|
f827571f9b
|
Fix assertion failure on exit due to mutex lock
|
2023-07-24 23:01:44 +03:00 |
|
Ivan Savenko
|
e23166df88
|
Fix locking of mutexes by StupidAI
|
2023-07-24 23:01:18 +03:00 |
|
Ivan Savenko
|
be3ed014a7
|
Merge pull request #2404 from dydzio0614/autosave-fix
End turn autosave fix
|
2023-07-24 22:26:43 +03:00 |
|
DjWarmonger
|
9b3618b664
|
Merge pull request #2378 from vcmi/default_template_to_random
Rename default map template to random map template
|
2023-07-24 19:16:02 +02:00 |
|