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
7,580 Commits 30 Branches 75 Tags
304b6e2fb2292376fc2430efcf6266c52125f332
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander ShishkinandGitHub 35ec9b3394 Merge pull request #552 from nullkiller/ai-pathfinder-fix-crash 
Remove a few more usages of thread shared ai and cb
 2019-02-17 16:40:18 +03:00
Alexander ShishkinandGitHub 6165954e40 Merge pull request #546 from nullkiller/ai-pathfinding-update-paths 
AI pathfinding const api and updatePaths
 2019-02-14 20:33:00 +03:00
Alexander ShishkinandGitHub 5f87c98186 Merge pull request #551 from dydzio0614/DisableTacticalAdvantage 
Disable tactical advantage engine until rework
 2019-02-13 16:43:17 +03:00
Alexander ShishkinandGitHub 1e8fc51f70 Merge pull request #549 from dydzio0614/AiStackSplitImprovement 
AI hero exchange improvement: split last creature stack
 2019-02-13 00:02:31 +03:00
Alexander ShishkinandGitHub 0a722ced76 Merge pull request #550 from vcmi/dydzio0614-patch-1 
remove legacy VisitObj goal name in AI logging
 2019-02-12 21:12:53 +03:00
Alexander ShishkinandGitHub ba803deb58 Merge pull request #548 from dydzio0614/GatherArmyLoop 
Do not generate GatherArmy goal as result of GatherArmy decomposition
 2019-02-11 16:45:37 +03:00
Alexander ShishkinandGitHub b04d73f351 Merge pull request #547 from dydzio0614/filterupdate 
Update VS project filters
 2019-02-09 16:27:19 +03:00
Alexander ShishkinandGitHub 83b9d2943e Merge pull request #545 from nullkiller/ai-pathfinding-refactoring 
AI: extract pathfinding special actions and rules to separate files
 2019-02-09 04:47:42 +03:00
Alexander ShishkinandGitHub 1de7ba99d5 Merge pull request #544 from vcmi/enable-gif-format 
Enabled GIF format for images.
 2019-02-09 04:47:09 +03:00
Alexander ShishkinandGitHub 08b841d668 Merge pull request #542 from nullkiller/ai-stability-fixes 
AI: stability fixes
 2019-01-27 01:08:01 +03:00
Alexander ShishkinandGitHub ccd416908e Merge pull request #541 from ilmikko/ilmikko-patch-fix-tribool-bool 
Fix broken build on libboost 1.69.0
 2019-01-24 22:41:07 +03:00
Alexander ShishkinandGitHub b00e935e4d Warnings fixes (#538) 
Warnings fixes
* Suppress `missing-braces` for Clang
* Fixed many C4275 warnings
* Fixed almost all Clang/GCC warnings
* Silence most frequent MSVC warning.
* Fixed some pessimizing-move warnings
* Fixed some unused capture warnings
 2019-01-19 13:52:02 +03:00
Alexander ShishkinandGitHub 419fee1fb2 Merge pull request #535 from vcmi/VCAI_Fixes 
VCAI performance improvements
 2019-01-17 14:04:33 +03:00
Alexander ShishkinandGitHub 05c9b3e2f9 Merge pull request #534 from nullkiller/ai-fix-crash-in-pathfinding-static-storage 
AI: fix crash in pathfinding
 2019-01-08 00:15:46 +03:00
Alexander ShishkinandGitHub a1ff355927 Merge pull request #533 from nullkiller/AI-fix-freeze-on-buyarmy 
AI: fix one more freeze in buy army
 2019-01-07 05:34:48 +03:00
Alexander ShishkinandGitHub be8d86fe4f Merge pull request #531 from dydzio0614/vsfiles_update 
Fix AI build, update default Windows SDK version for projects
 2018-12-31 17:21:07 +03:00
Alexander ShishkinandGitHub 0a461829fb Merge pull request #529 from nullkiller/AI-fix-freeze-on-buyarmy 
AI: fix freeze on BuyArmy
 2018-12-30 22:37:21 +03:00
Alexander ShishkinandGitHub cbbb85fa87 Merge pull request #527 from nullkiller/ai-recruit-hero-freeze-patch 
AI: fix freeze while endlesly trying to recruit hero
 2018-12-25 19:47:01 +03:00
Alexander ShishkinandGitHub 34cc5dbec1 Merge pull request #525 from dydzio0614/fileupdate 
Update VS files to match AI goals split
 2018-12-05 23:50:52 +03:00
Alexander ShishkinandGitHub 2c1f3dd742 Merge pull request #523 from nullkiller/fix-buld-boat-for-allied-shipyard 
Build boat in allied shipyards is allowed now
 2018-11-19 16:39:46 +03:00
Alexander ShishkinandGitHub 000ca1c823 Merge pull request #520 from nullkiller/freeze-in-gather-troops 
AI: GATHER_TROOPS improvements and fixes
 2018-11-17 18:46:02 +03:00
Alexander ShishkinandGitHub 80b2169e0d Merge pull request #522 from dydzio0614/NewVSFix 
Update VS files
 2018-11-17 18:44:19 +03:00
Alexander ShishkinandGitHub 2748650a57 Merge pull request #521 from dydzio0614/BattleMemoryLeak 
Fix creature animation callback circular reference
 2018-11-15 02:17:20 +03:00
Alexander ShishkinandGitHub 8e34b1b9a8 Merge pull request #519 from dydzio0614/ObjectRemovalFix 
Do not evaluate goals related to removed hero
 2018-11-08 05:26:06 +03:00
Alexander ShishkinandGitHub ec53f52ca7 Merge pull request #518 from nullkiller/freeze-on-control-own-town-win-condition 
AI: fix freeze when AI has a win condition  to control own town
 2018-11-07 09:42:25 +03:00
Alexander ShishkinandGitHub d36f59e1af Merge pull request #517 from nullkiller/freeze-on-quest-selfkilling 
Hero try to execute a quest to kill himself
 2018-11-06 03:12:53 +03:00
Alexander ShishkinandGitHub ff75e5e6e8 Merge pull request #516 from nullkiller/freeze-pathfinding 
Freeze when try to bypass a few adjacent guards
 2018-11-05 10:07:46 +03:00
Alexander ShishkinandGitHub 064130973f Merge pull request #514 from dydzio0614/HeroAiValueFix 
Hero ai value fix
 2018-11-03 23:34:03 +03:00
Alexander ShishkinandGitHub 2857e60588 Merge pull request #513 from dydzio0614/AiFoWCrash 
Allow AI to be aware of invisible heroes deletion
 2018-11-03 11:07:38 +03:00
Alexander ShishkinandGitHub 845f0fbf5c Merge pull request #512 from godric3/jsonSchemas 
Support for using relative file path in json schema references
 2018-11-02 13:07:34 +03:00
Alexander ShishkinandGitHub 44e36d4675 Merge pull request #511 from janisozaur/throw-object 
Throw std::runtime_exception instead of a pointer to new one
 2018-10-31 12:42:04 +03:00
Alexander ShishkinandGitHub 2a282c9a8e Merge pull request #509 from godric3/bonusDescription 
Skill and hero specialty bonus description
 2018-10-31 00:59:05 +03:00
Alexander ShishkinandGitHub e5397c1e23 Merge pull request #504 from janisozaur/shadow-var 
Prevent shadowing of global variable in function argument
 2018-10-30 06:37:12 +03:00
Alexander ShishkinandGitHub 3f49b981d5 Merge pull request #503 from janisozaur/include-guards 
Add missing include guards
 2018-10-30 05:09:16 +03:00
Alexander ShishkinandGitHub e26f6ff15f Merge pull request #505 from janisozaur/catch-by-ref 
Catch exceptions by const-ref, not by value
 2018-10-30 05:08:30 +03:00
Alexander ShishkinandGitHub 3d1bb9850b Merge pull request #506 from janisozaur/shadow-var2 
Prevent shadowing of function arguments by local vars
 2018-10-30 05:07:40 +03:00
Alexander ShishkinandGitHub a3a38a6120 Merge pull request #502 from vcmi/StatusbarFix 
Fix not responding statusbar, issue 3009
 2018-10-30 04:56:34 +03:00
Alexander ShishkinandGitHub e814aca29f Merge pull request #500 from godric3/rmgCrash 
Fix crash when generating random map with random number of players
 2018-10-29 01:38:10 +03:00
Alexander ShishkinandGitHub 1753298ee8 Merge pull request #501 from nullkiller/fix-water-tile-pathinfo-lookup 
AI pathfinding: fix getPathsToTile for water tiles
 2018-10-29 01:36:50 +03:00
Alexander ShishkinGitHubgodric3
 		f563712782 fix formatting 
Co-Authored-By: godric3 <godric3@users.noreply.github.com>
 2018-10-28 16:36:11 +01:00
Alexander ShishkinandGitHub bd0f8f840a Merge pull request #497 from nullkiller/ai-pathfinder-boat 
AI pathfinding: buy boat
 2018-10-28 14:29:09 +03:00
Alexander ShishkinandGitHub 0f1e853b4a Merge pull request #494 from dydzio0614/AiTownDevelopmentFixes 
AI town development fixes
 2018-10-22 09:44:39 +03:00
Alexander ShishkinandGitHub 32c480c33d Merge pull request #498 from dydzio0614/AiHotfix 
Fix severely broken AI behavior + tweak default hero AI value
 2018-10-16 12:25:59 +03:00
Alexander ShishkinandGitHub 6958f2cddf Merge pull request #493 from dydzio0614/FuzzyEvaluationFixes 
Fuzzy evaluation fixes
 2018-10-10 22:00:14 +03:00
Alexander ShishkinandGitHub b5756200da Merge pull request #484 from dydzio0614/ArtifactAiValue 
Create artifact AI value handling
 2018-10-10 21:59:46 +03:00
Alexander ShishkinandGitHub 83aae7d72b Merge pull request #492 from dydzio0614/AiVSFix 
Add AI pathfinding to VS files
 2018-10-10 14:47:02 +03:00
Alexander ShishkinandGitHub f9054c06b3 Merge pull request #470 from nullkiller/ai-pathfinder-extensibility 
AI: add some pathfinder extensibility and replace SectorMap.
 2018-10-07 16:53:53 +03:00
Alexander ShishkinandArseniyShestakov 75f8c8b29a Gui cleanup4 (#446) 
* use smart pointers for almost all widget fields
* use SDL2 texture for cursor
* a lot af small tweaks and formatting
* removed CompImage class, it is actually useless as long as regular SDLImage support margins
* CGuiHandler: use smart pointers for [push|pop]Int
 2018-07-25 01:36:48 +03:00
Alexander ShishkinandGitHub 84be667363 Merge pull request #463 from dydzio0614/skel_transformer_fix 
Fix bone/ghost dragon handling in skeleton transformer
 2018-07-19 00:03:32 +03:00
Alexander ShishkinandGitHub 4d7e2ea441 Merge pull request #461 from dydzio0614/counterattackfix 
Fix counterattack wrong mechanics (Re-fix bug 2501)
 2018-07-18 18:15:21 +03:00
Alexander ShishkinandGitHub 9bd662b2f3 Merge pull request #459 from vcmi/issue2969 
Fix for isuue 2969
 2018-07-17 04:28:59 +03:00
Alexander ShishkinandGitHub 07ae271e91 Merge pull request #460 from dydzio0614/configfix 
Restore VCMI client saving settings.json
 2018-07-17 04:28:21 +03:00
Alexander ShishkinandGitHub 51229e88b2 Merge pull request #458 from dydzio0614/VsUpdate 
Update VS project files to match vcmi code changes
 2018-07-06 22:03:28 +03:00
Alexander ShishkinandGitHub 8798e6e52b Merge pull request #453 from nullkiller/develop 
Android build fix
 2018-05-26 18:06:44 +03:00
Alexander ShishkinandArseniyShestakov 5c09f751b3 Gui cleanup3 - UI refactoring to use smart pointers (#440) 
* Changed most gui classes to use shared pointers
* Store and use IImage as shared_ptr
* CSpellWindow redesign
* AdventureMapClasses cleanup
* CLabel: store background as smart pointer
* Store CObjectList items as smart pointers
* Removed destroy function of list item
* Store toggle buttons as smart pointers
* Use CComponent as smart pointer
* Attempt to fix artifact merchant drawing
 2018-04-07 18:34:11 +07:00
Alexander ShishkinandGitHub 5d0cb31504 Merge pull request #434 from vcmi/CADDINFO_FIX2 
Bugfix for last CAddInfo bugfix
 2018-03-20 04:11:14 +03:00