Commit Graph
100 Commits
Author SHA1 Message Date
AlexVinSandAndrii Danylchenko 594d1684e9 Switch to MinGW 7.3 2021-07-26 21:02:50 +03:00
Alexander ShishkinandGitHub 2669aa446e Merge pull request #697 from vcmi/fix-campaign-transition
3095 - fix campaign transition
2021-06-20 21:10:24 +03:00
Alexander ShishkinandGitHub 9e422a1664 Merge pull request #690 from nullkiller/erm-fix-vr
ERM: fix string concatenations and bit operations
2021-04-29 16:05:20 +03:00
Alexander ShishkinandGitHub b310f2e61e Merge pull request #687 from kambala-decapitator/fix-server-crash-client-disconnect
fix server crash on unexpected client disconnect
2021-04-29 16:03:07 +03:00
Alexander ShishkinandGitHub 2b4a99994a Merge pull request #691 from ShubusCorporation/do/fix/many_mods_gaisen_bug
Fix: ID-collisions on large mods collections loading
2021-04-29 15:54:33 +03:00
Alexander ShishkinandGitHub ef363ba4ed Merge pull request #692 from ShubusCorporation/do/fix/attempt_equip_spellbook
Fix: VCAI should not attempt to move Spell Book
2021-04-29 15:52:06 +03:00
Alexander ShishkinandGitHub 4063ab5894 Merge pull request #689 from kdmcser/develop
fix bug: may load mod before dependencies
2021-04-11 01:07:12 +03:00
AlexVinS f0a7a6ffbf Fixed build
Some stubs for !!UN

C::B project update
2021-04-10 02:04:07 +03:00
AlexVinS 483a4689ce Fixes for code review issues 2021-02-20 04:57:50 +03:00
784f6b973b Apply suggestions from code review
Co-authored-by: Andrii Danylchenko <danilchenko.andrij@gmail.com>
2021-02-20 02:31:00 +03:00
d74127cb84 Update lib/ScriptHandler.cpp
Co-authored-by: Andrii Danylchenko <danilchenko.andrij@gmail.com>
2021-02-20 02:04:10 +03:00
AlexVinS 6d245a7821 Less ugly API declarations 2021-02-17 01:14:53 +03:00
AlexVinS ec6f7b88fe !?OB WIP 2021-02-16 13:32:18 +03:00
Alexander ShishkinandGitHub 094486eec1 Merge pull request #682 from vlad-yakovlev/macos-cpack-fix
[3148] [MacOS] Game always crash after end of the day button is pressed
2021-02-16 08:02:17 +03:00
Alexander ShishkinandGitHub 5e707eee0f Merge pull request #683 from vlad-yakovlev/fix-map-select-crahs
[3167] Crash when click single scenario in new game
2021-02-16 07:59:47 +03:00
AlexVinS a59e12ca5f tweaks 2021-02-15 15:03:32 +03:00
Alexander ShishkinandGitHub 11bb46780a Merge pull request #678 from MikeLodz/develop
Fixes mantis tickets 2899 and 2984 (bugged hero spell specialties)
2021-02-14 11:22:23 +03:00
Alexander ShishkinandGitHub 6055747dc1 Merge pull request #681 from ShubusCorporation/do/fix/hero_classes_initial_values
Fix: Some map objects sometimes do not increment some primary skills of some heroes
2021-02-13 03:51:31 +03:00
Alexander ShishkinandGitHub 8e1a3924e7 Merge pull request #679 from ShubusCorporation/do/fix/mod_resolving_typo
Fix: Error in mods resolving routine
2021-02-10 01:39:47 +03:00
Alexander ShishkinandGitHub db1f9a15b0 Merge pull request #675 from ShubusCorporation/do/fix/mod_system_and_interface_bugs
Fixed: Mods dependency issues leading to hanging & 'Restart Scenario' button functionality
2021-02-08 07:32:09 +03:00
Alexander ShishkinandGitHub 3b8d610091 Merge pull request #670 from nullkiller/fix-crash-battle-ai
found a bug in code where AI can change client gamestate directly
2021-01-31 04:38:29 +03:00
Alexander ShishkinandGitHub 5dc6d782f7 Merge pull request #674 from ShubusCorporation/do/fix/game_interface/load_and_main_menu_buttons
Fix: 'Load' and 'Main Menu' in-game buttons should work properly
2021-01-20 21:52:51 +03:00
Alexander ShishkinandGitHub 2f5c8d7587 Merge pull request #673 from ShubusCorporation/do/fix/creature_not_a_shooter_siege_crashes
Fix: Siege crashes when creature on the archer's tower is not a shooter
2021-01-17 19:29:46 +03:00
Alexander ShishkinandGitHub 925857d845 Merge pull request #672 from ShubusCorporation/do_feature_part3
Feature: Mods system improvement, Part III. Bonusing buildings customization.
2021-01-14 06:15:47 +03:00
Alexander ShishkinandGitHub e60e0a0a8c Merge pull request #671 from nullkiller/fix-stupid-ai-attacking-through-obstacles
Fix StupidAI trying to attack through obstacle
2021-01-12 23:56:49 +03:00
Alexander ShishkinandGitHub f31c5169b5 Merge pull request #669 from ShubusCorporation/do_fix
Fix: Creature resolution failed when mod is installed to the custom directory
2020-12-13 07:03:40 +03:00
Alexander ShishkinandGitHub 6bf0bea286 Merge pull request #666 from ShubusCorporation/do_feature_lodestar
Lodestar Grail should work.
2020-12-12 13:05:48 +03:00
Alexander ShishkinandGitHub a630d3b34c Merge pull request #668 from Illithidek/develop
Fix Erdamon earth elemental speciality
2020-12-07 06:27:11 +03:00
Alexander ShishkinandGitHub e3c6483365 Merge pull request #667 from nullkiller/improve-battle-ai-fort-capturing
Improve battle ai fort capturing
2020-12-03 04:11:37 +03:00
Alexander ShishkinandGitHub 61f870af90 Merge pull request #665 from vcmi/2184-fix-unreachable-corners
2184 - fix battlefield corners unreachable for 2 hex units
2020-12-01 17:23:26 +03:00
Alexander ShishkinandGitHub 58b8fe3d26 Merge pull request #664 from nullkiller/fix-broken-fort-gate-bypass
Try fix bypassing destroyed fort drawbridge
2020-11-24 17:35:23 +03:00
Alexander ShishkinandGitHub eb011e59c4 Merge pull request #663 from Baltix/patch-1
Disable tests to fix building deb packages
2020-11-12 15:41:04 +03:00
Alexander ShishkinandGitHub 1f0f58a111 Merge pull request #662 from ShubusCorporation/do_fix_morale
Fix: Morale bonus should be shown correctly
2020-11-12 03:20:16 +03:00
Alexander ShishkinandGitHub 9ca9c809c6 Merge pull request #660 from ShubusCorporation/shc_rmg_issue
Mod system improvement: Patch 2
2020-10-26 09:26:14 +03:00
Alexander ShishkinandGitHub dfeb801425 Merge pull request #661 from jambolo/bug/fix-0003154
Fixed potential race condition
2020-10-26 01:02:59 +03:00
Alexander ShishkinandGitHub c0a5d1ccf0 Merge pull request #659 from ShubusCorporation/shc_special_buildings_2
Mod system improvement: Special buildings should work in modders towns. Part II.
2020-10-20 17:29:15 +03:00
Alexander ShishkinandGitHub ff7fd2077a Merge pull request #658 from ShubusCorporation/shc_test_centered
Fix: Issue #3151 - text centralization
2020-10-16 08:33:37 +03:00
Alexander ShishkinandGitHub 830b3f1dc7 Merge pull request #657 from ShubusCorporation/shc_special_buildings_I_patch
Special buildings support : Patch 1
2020-10-16 06:20:43 +03:00
Alexander ShishkinandGitHub 12a4cee092 Merge pull request #652 from ShubusCorporation/shc_special_buildings_support
Mod system improvement Part I : Special buildings should work in  modders towns
2020-10-12 00:19:18 +03:00
Alexander ShishkinandGitHub 124b2a7613 Merge pull request #655 from jambolo/bug/fix-0003143
Fixed lots of warnings.
2020-10-06 11:44:54 +03:00
Alexander ShishkinandGitHub 4a5070d5ea Merge pull request #656 from xtouqh/fbsd1
FreeBSD: need libexecinfo for backtrace()
2020-10-05 22:56:53 +03:00
Alexander ShishkinandGitHub 0d0f1cea2b Merge pull request #653 from jambolo/bug/fix_0003142
Fixed incorrect usage of const std::shared_ptr. Resolves 0003142.
2020-10-01 11:59:26 +03:00
Alexander ShishkinandGitHub a54626459d Merge pull request #651 from snizovtsev/develop
lib: fix CPathfinder build error on GCC 10.2
2020-09-30 16:53:20 +03:00
Alexander ShishkinandGitHub 1161967e34 Merge pull request #650 from ShubusCorporation/shc_fix_mana_vortex
Minor fix: Apply Monday bonuses to heroes who have slept overnight
2020-09-28 17:51:36 +03:00
Alexander ShishkinandGitHub fbb272bb27 Merge pull request #649 from ShubusCorporation/shc_mapgen_issue
Fix: Random map generator crashes when nativeTerrain is not specified in the town mod
2020-09-24 12:18:12 +03:00
Alexander ShishkinandGitHub 15d9c4438c Merge pull request #647 from ShubusCorporation/shc_fix_pathfinder
Fix exception while calculating paths
2020-09-22 13:23:00 +03:00
Alexander ShishkinandGitHub 08ce838e04 Merge pull request #645 from Adriankhl/develop-khl
Fix mingw build and Random Map Generator Option
2020-09-21 21:15:49 +03:00
Alexander ShishkinandGitHub d13834fed2 Merge pull request #648 from LibertyPaul/develop
Fixed tmp resources destination
2020-09-21 21:09:35 +03:00
Alexander ShishkinandGitHub 8c77f0488c Merge pull request #644 from nullkiller/optimize-a-few-bonus-requests
hacks to optimize a few bonus requests
2020-07-05 05:39:40 +03:00
Alexander ShishkinandGitHub cc75b859d4 Merge pull request #609 from viciious/improve_battleai
Improve battle AI
2020-05-25 05:50:40 +03:00
Alexander ShishkinandGitHub 710b7c5f5b Merge pull request #633 from hwiorn/develop
Add Korean encoding(CP949)
2020-05-11 21:20:12 +03:00
Alexander ShishkinandGitHub f05d2b6586 Merge pull request #643 from viciious/fix_cmp_stack
Fix CMP_stack to follow strict weak ordering of elements
2020-05-11 20:04:54 +03:00
Alexander ShishkinandGitHub 8871368c5b Merge pull request #642 from vcmi/issue3112
Fixed Gargoyles immunity, issue 3112.
2020-05-09 07:04:46 +03:00
Alexander ShishkinandGitHub b6ee5d09bc Merge pull request #641 from runlevel5/patch-1
Update RPM spec
2020-05-05 14:31:29 +03:00
Alexander ShishkinandGitHub 0f7de511be Merge pull request #626 from nullkiller/fix-quest
Fix quest handling
2020-01-31 10:24:04 +03:00
Alexander ShishkinandGitHub 00de1fd734 Merge pull request #625 from Toneyisnow/toneyisnow/Battle_Clone_Effect
Implement the Clone Effect in battle.
2020-01-27 13:42:58 +03:00
Alexander ShishkinandGitHub 304b6e2fb2 Merge pull request #624 from Toneyisnow/toneyisnow/Fixbug_LobbyScreen_LoadGame
Fix bug: LobbyScreen UI has a bug on the Difficulty toggle group.
2020-01-23 16:13:51 +03:00
Alexander ShishkinandGitHub 5afcb070fa Merge pull request #621 from sztupy/android_fix_sdl_letterboxing
Fix SDL letterboxing on Android builds
2020-01-08 10:17:03 +03:00
Alexander ShishkinandGitHub d81940d3b0 Merge pull request #620 from sztupy/android_campaing_fix
Add support for the Android App to notify if the server has been closed
2020-01-06 20:40:25 +03:00
Alexander ShishkinandGitHub c538705fcd Merge pull request #619 from JakubK44/more_mouse_scroll_fixes
More mouse scrolling fixes
2020-01-06 08:42:25 +03:00
Alexander ShishkinandGitHub 98e2d177c0 Merge pull request #618 from vcmi/dydzio0614-patch-1
Update year to 2020
2020-01-01 18:11:21 +03:00
Alexander ShishkinandGitHub 730a2a32f6 Merge pull request #617 from JakubK44/fullscreen_mousemove
Fix fullscreen map mouse scrolling
2020-01-01 02:16:28 +03:00
Alexander ShishkinandGitHub 3290ae19b0 Merge pull request #616 from nullkiller/fix-3085
[3085] - MapObjectEvaluator crashes on custom monolith
2019-09-14 16:49:44 +03:00
Alexander ShishkinandGitHub f599187563 Merge pull request #608 from vcmi/BreakVS2015Compatibility
Break Visual Studio 2015 support
2019-07-03 11:23:48 +03:00
Alexander ShishkinandGitHub 8014cdc3e7 Merge pull request #607 from vcmi/AppveyorQtFix
Fix Qt-related dll files not used when building appveyor installer
2019-06-22 09:19:26 +03:00
Alexander ShishkinandGitHub a2364b9351 Merge pull request #606 from dydzio0614/UpdateVSto2019
Update VS files to 2019, partially fix test project
2019-06-09 20:05:18 +03:00
Alexander ShishkinandGitHub c2ad0e67de Merge pull request #605 from vcmi/VictoryDefeatCrashFix
Fix all common victory/defeat crashes
2019-06-08 21:54:48 +03:00
Alexander ShishkinandGitHub 6c64356e48 Merge pull request #604 from dydzio0614/StatusbarFix2
Revert old statusbar hackfix
2019-06-07 01:03:27 +03:00
Alexander ShishkinandGitHub f6ab4c1f63 Merge pull request #603 from dydzio0614/AiPrisonValueFix
Fix wrong AI prison value handling
2019-06-06 05:13:50 +03:00
Alexander ShishkinandGitHub e3b3bba603 Merge pull request #602 from dydzio0614/TownEventFix
Do not build pseudo-buildings explicitly with events
2019-06-05 01:25:30 +03:00
Alexander ShishkinandGitHub b16af04a09 Merge pull request #597 from dydzio0614/AiInterruptFix
Ensure no freeze on AI interruption
2019-06-03 16:53:35 +03:00
Alexander ShishkinandGitHub 5ccc411971 Merge pull request #601 from dydzio0614/HotseatFreezeFix2
Fix dialog showing for losing player
2019-06-02 02:54:58 +03:00
Alexander ShishkinandGitHub c8888feafe Merge pull request #598 from nullkiller/ai-fix-3062
AI: blind fix for 3062
2019-05-29 23:58:46 +03:00
Alexander ShishkinandGitHub 21f74a9968 Merge pull request #590 from Ewilhan/fixCombatOrder
Fixed Battle Creature Ordering
2019-05-29 17:51:52 +03:00
Alexander ShishkinandGitHub 76e913f76f Merge pull request #599 from dydzio0614/NoTownWarningFix
Do not display "you have no towns" warning if player already lost
2019-05-29 17:49:55 +03:00
Alexander ShishkinandGitHub 4acec00aea Merge pull request #596 from dydzio0614/HeroSpeedFix2
Re-fix map hero movement speed, was too fast on land
2019-05-28 17:52:48 +03:00
Alexander ShishkinandGitHub 54bbf2abb3 Merge pull request #595 from dydzio0614/BattleConsoleButtons
Fix wrong battle console button image
2019-05-21 10:05:01 +03:00
Alexander ShishkinandGitHub 40d65b40a2 Merge pull request #591 from dydzio0614/ShipyardCrashFix
Spawn ship placed outside map if it has visitable position inside map
2019-05-21 09:47:51 +03:00
Alexander ShishkinandGitHub 6ddebfd43e Merge pull request #594 from dydzio0614/HeroSpeedFix
Fix hero/boat speed on adventure map
2019-05-19 21:49:53 +03:00
Alexander ShishkinandGitHub 26e70a236e Merge pull request #593 from dydzio0614/PerformanceTweak
Tweak statusbar options, fixes mouse stuttering
2019-05-19 21:48:36 +03:00
Alexander ShishkinandGitHub 21a6e37b2f Merge pull request #592 from dydzio0614/NoHeroWarningFix
Remove false warning indicating something is wrong
2019-05-19 21:47:33 +03:00
Alexander ShishkinandGitHub a7cd668a80 Merge pull request #587 from Ewilhan/fixNeutralCreaturesGrowth
Fix Neutral Creatures Weekly Growth
2019-05-06 19:06:40 +03:00
Alexander ShishkinandGitHub 49404bfa24 Merge pull request #579 from vcmi/dydzio0614-patch-1
Hackfix crash on "victory by town capture"
2019-05-04 10:35:13 +03:00
Alexander ShishkinandGitHub 14e3bb29f1 Merge pull request #584 from dydzio0614/HeroMovementOptimization
Fix laggy hero movement on adventure map
2019-05-04 06:31:45 +03:00
Alexander ShishkinandGitHub 66de80452d Merge pull request #582 from Ewilhan/ewilhan-fixCursorOnFriendlyMine
Fixed wrongCursorOnFriendlyDwelling
2019-05-03 09:15:15 +03:00
Alexander ShishkinandGitHub 1965bc0e40 Merge pull request #581 from Ewilhan/ewilhan-fixCryptVisitingSound
Fixed Crypt/Pyramid double visit sound.
2019-05-03 09:13:03 +03:00
Alexander ShishkinandGitHub bd11e87f6a Merge pull request #572 from dydzio0614/FuzzyHelperCrash
Fix crash caused by FuzzyLite destructor
2019-04-21 22:06:53 +03:00
Alexander ShishkinandGitHub baafefa1cd Merge pull request #577 from dydzio0614/PregameOptimization
Optimize button responsiveness during pregame options
2019-04-21 22:04:02 +03:00
Alexander ShishkinandGitHub 427a57551e Merge pull request #555 from nullkiller/ai-fix-hero-exchange
AI: fix hero exchange logic + refactoring
2019-03-24 10:50:53 +03:00
Alexander ShishkinandGitHub 34f934370b Merge pull request #565 from dydzio0614/moralewaitfix
Fix lack of unit action with morale+wait
2019-03-24 10:49:49 +03:00
Alexander ShishkinandGitHub 9ad71b200f Merge pull request #562 from dydzio0614/BattleIntroFix
Battle action start on client after intro sound
2019-03-24 10:36:01 +03:00
Alexander ShishkinandGitHub 2e7ae5546d Merge pull request #564 from vcmi/dydzio0614-patch-2
Update year in readme
2019-03-24 10:22:55 +03:00
Alexander ShishkinandGitHub 73a99893d4 Merge pull request #561 from vcmi/dydzio0614-patch-1
Tweak effect / spell animation speed
2019-03-24 10:21:56 +03:00
Alexander ShishkinandGitHub 87f216ac0d Merge pull request #560 from dydzio0614/bug2814
Fix for arrow cart at bank fights
2019-03-24 10:20:58 +03:00
Alexander ShishkinandGitHub db83b3641c Merge pull request #559 from dydzio0614/AcidBreathFix
Acid dragon / acid breath fix
2019-03-24 10:17:02 +03:00
Alexander ShishkinandGitHub 549d8c97df Merge pull request #557 from dydzio0614/CrystalDragonAbility
Fix crystal dragon ability to match H3
2019-03-21 17:02:20 +03:00
Alexander ShishkinandGitHub 61c8d78846 Merge pull request #556 from dydzio0614/NoRandomMonths
Hardcoded feature: no random week/month effects
2019-03-21 06:24:02 +03:00
Alexander ShishkinandGitHub 8b6316c8ee Merge pull request #554 from dydzio0614/MagicSchoolFix
Fix magic school gold payment (bug #3043)
2019-03-12 10:23:13 +03:00
Alexander ShishkinandGitHub 83094faf8e Merge pull request #553 from nullkiller/ai-fix-town-portal-to-occupied-town
ai fix town portal to occupied town
2019-03-08 20:26:32 +03:00
AlexVinSandAlexVinS 9311966706 [C::B] Switch to MinGW 7.3 2019-02-19 14:59:10 +03:00