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,485 Commits 30 Branches 75 Tags
bd11e87f6ab619c70d73662c0b42e7c5b886d2c7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander ShishkinandGitHub 1e9a3e0fe4 Merge pull request #431 from vcmi/ISSUE_2918 
Fixed Issue 2914 & 2918
 2018-03-17 02:49:11 +03:00
Alexander ShishkinandGitHub 8b002ad774 Issue2888 (#421) 
Fixed issue 2888
* Merged AFTER_ATTACK & BEFORE_ATTACK cast modes.
* Introduced new caster class for creature ability usage
* Added few tests
 2018-03-02 13:22:51 +03:00
Alexander ShishkinandGitHub 936a310b0a Merge pull request #413 from dydzio0614/sr9_vsfix 
update VS files to match spellrefactoring9 changes
 2018-02-09 21:13:40 +03:00
Alexander ShishkinandGitHub 85ed630ba6 Merge pull request #407 from FeniksFire/develop 
Fix positioning
 2018-01-16 06:01:27 +03:00
Alexander ShishkinandGitHub e90fcea3d3 Merge pull request #396 from FeniksFire/update 
Update graphics for QuickRecruitmentWindow
 2018-01-14 10:42:23 +03:00
Alexander ShishkinandGitHub aadc09b9f0 Merge pull request #405 from dydzio0614/vsupdate 
Update project files to Visual Studio 2017
 2018-01-14 03:03:45 +03:00
Alexander ShishkinandGitHub a209d10f23 Merge pull request #395 from FeniksFire/update 
Adding simple background for quick recruitment window
 2017-12-23 16:30:51 +03:00
Alexander ShishkinandGitHub ffe4dc582b Merge pull request #391 from dydzio0614/VS_quickrecruitment_update 
Update VS project files to mach latest develop
 2017-11-17 18:43:10 +03:00
Alexander ShishkinandGitHub fd4ecbd40b Merge pull request #385 from Chocimier/altar 
Fixed "Altar of Sacrifice only sacrifices creatures one kind at a time"
* https://bugs.vcmi.eu/view.php?id=2607
 2017-10-28 14:04:34 +03:00
Alexander ShishkinandGitHub 52e837bde3 Merge pull request #386 from FeniksFire/SplittingShortcuts 
Add keyboard shortcuts for splitting army from HD mod.
 2017-10-27 07:08:27 +03:00
Alexander ShishkinandGitHub 5067e73c30 Merge pull request #364 from vcmi/newLogApi 
Finished conversion to new logging API
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
 2017-08-12 16:55:18 +03:00
Alexander ShishkinandGitHub 88ea28ca8d Merge pull request #334 from dydzio0614/patch-2 
Adding myself to authors
 2017-07-08 20:54:13 +03:00
Alexander ShishkinandGitHub b5fb7acffe Merge pull request #331 from dydzio0614/patch-1 
Update ChangeLog
 2017-07-08 13:18:20 +03:00
Alexander ShishkinandGitHub d8545d9c3b Merge pull request #321 from viciious/nodecompare_fix 
Fix NodeComparer::operator() to provide strict weak ordering
 2017-07-03 13:11:46 +03:00
Alexander ShishkinandGitHub f85632ea92 Merge pull request #301 from vcmi/moreWarMachines 
More war machines
 2017-06-06 20:15:48 +03:00
Alexander ShishkinandGitHub a3b04da5f0 Merge pull request #309 from vcmi/magicTweaks 
Magic tweaks
 2017-06-06 01:55:29 +03:00
Alexander ShishkinandGitHub 8c9d6c1c1d Merge pull request #308 from vcmi/mapServiceTweaks 
Map service tweaks
 2017-06-05 18:30:52 +03:00
Alexander ShishkinandGitHub 7e1b0d71c5 Added option for saving generated maps on client side (#307) 
* new configuration option 'general.saveRandomMaps'
* maps being saved to 'userCachePath/RandomMaps'
* no deletion of old random maps
* map filename generated based on template name and random seed
 2017-06-04 20:33:28 +03:00
Alexander ShishkinandGitHub f24396f3b3 Merge pull request #302 from FeniksFire/develop 
Fix http://bugs.vcmi.eu/view.php?id=2677.
 2017-05-28 14:36:12 +03:00
Alexander ShishkinandGitHub 62b8991b6a Merge pull request #200 from vcmi/feature/VCMIMapFormat2 
VCMI map format part 2
 2017-05-27 02:14:52 +03:00
Alexander ShishkinandGitHub b7a19fdefe Merge pull request #298 from vn971/documentation-update 
documentation: use git repo address instead of SVN
 2017-05-14 12:37:02 +03:00
Alexander ShishkinandGitHub b97b3ecec6 Merge pull request #297 from FeniksFire/develop 
Fix game crash after autofight in the battle.
 2017-05-13 11:54:33 +03:00
Alexander ShishkinandGitHub 692041a20e Merge pull request #287 from dydzio0614/smallfix 
Cleanup after last MSVS compilation fixes
 2017-03-16 06:32:12 +03:00
Alexander ShishkinandGitHub 5893e1e08e Merge pull request #286 from FeniksFire/develop 
Fill a gap in lib/CMakeLists.txt
 2017-03-10 23:50:50 +03:00
Alexander ShishkinandGitHub 0af7ee393b Merge pull request #270 from FeniksFire/develop 
Making unit tests for BattleHex and some estetic improvements.
 2017-02-21 23:56:26 +03:00
Alexander ShishkinandGitHub 76d3c98b85 Merge pull request #265 from dydzio0614/patch-3 
Remove leftover commander artifact code
 2017-01-01 02:47:59 +03:00
Alexander ShishkinandGitHub fdec57b1c7 Merge pull request #261 from dydzio0614/patch-1 
Regression fix - enemy hero info crash
 2016-12-03 12:02:43 +03:00
Alexander ShishkinandGitHub a73ca79ed1 Merge pull request #257 from vcmi/mapHandlerRefactoring2 
Map handler refactoring, part 2.
 2016-11-12 09:20:45 +03:00
Alexander ShishkinandGitHub 0cf5a10bd1 Merge pull request #243 from vcmi/guiCleanup 
Gui cleanup
 2016-10-28 08:53:03 +03:00
Alexander ShishkinandGitHub ffbad42b8f Merge pull request #239 from vcmi/issue/2555 
Improved creature casting GUI.
 2016-10-17 09:31:52 +03:00