games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
12,109 Commits 30 Branches 75 Tags
0fd118d3ce88baab8e2d7da4dc7d2f712d139f69
Commit Graph
12109 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Danylchenko 0fd118d3ce NKAI: gold reward 2023-07-31 22:01:11 +03:00
Andrii Danylchenko 6ba74f02bc NKAI: playing around with defence 2023-07-31 22:01:11 +03:00
Andrii Danylchenko b19ac01bf9 Fuzzy rework, added more defence and gather army routines 2023-07-31 22:01:10 +03:00
Andrii Danylchenko b1ca663eb6 Fuzzy rework 2023-07-31 22:01:10 +03:00
Andrii Danylchenko 38a98387e4 Temp fix for blocked in garrison ai. 2023-07-31 22:01:10 +03:00
Ivan Savenko e484066772 Merge pull request #2450 from heroesiiifan/patch-6 
Language update (german) for QT applications
 2023-07-31 16:24:07 +03:00
Ivan Savenko d9e7a8f88a Merge pull request #2446 from IvanSavenko/bugfixing 
(1.3.0) Bugfixing
 2023-07-31 16:21:43 +03:00
Ivan Savenko 986c8799a8 Move checkboxes 2 slots above to avoid overflowing below window border 2023-07-31 13:31:44 +03:00
heroesiiifan e9b46363cc Launcher translation german update 2023-07-30 20:11:56 +00:00
heroesiiifan a7fab1099c Mapeditor translation german update 2023-07-30 20:10:38 +00:00
Ivan Savenko 4c3a02c8c9 Merge pull request #2438 from Laserlicht/patch-3 
trigger haptic feedback on button-sound
 2023-07-30 20:14:34 +03:00
Ivan Savenko 5d2dd4c633 Show creature popup window on right-click in town fort 2023-07-30 15:29:18 +03:00
Ivan Savenko 397c4c7595 Fix dismissing heroes on map with "Capture town" victory condition 2023-07-30 15:28:56 +03:00
Ivan Savenko 95dd4b3ffb Fix incorrect warnings about missing translations 2023-07-30 13:19:52 +03:00
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