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
6,967 Commits 30 Branches 75 Tags
69dbf339fc2c4b34b0d22e6338d5f3dbc347f5d0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander ShishkinandGitHub 4876cc178d Merge pull request #240 from vcmi/spellWindowRewrite 
Spell window rewrite
 2016-10-17 07:58:56 +03:00
Alexander ShishkinandGitHub 9f9e1cea17 Merge pull request #241 from vmarkovtsev/develop 
Fix issue #2068 - maps list update
 2016-10-17 02:52:11 +03:00
Alexander ShishkinandGitHub bdbbc22c66 Merge pull request #235 from vcmi/issue/2545 
Fixes: http://bugs.vcmi.eu/view.php?id=2545, http://bugs.vcmi.eu/view.php?id=2520
 2016-10-11 22:39:02 +03:00
Alexander ShishkinandGitHub 0857197ff9 Merge pull request #236 from vcmi/issue/2527 
Fixes: http://bugs.vcmi.eu/view.php?id=2527, http://bugs.vcmi.eu/view.php?id=2507
 2016-10-11 20:02:29 +03:00
Alexander ShishkinandGitHub a92e820eb4 Merge pull request #227 from Chocimier/book 
Prevent flipping empty spellbook
 2016-10-02 00:42:33 +04:00
Alexander ShishkinandGitHub 0f7a68684d Merge pull request #224 from dydzio0614/patch-2 
Update year to 2016 in readme
 2016-09-30 15:56:49 +04:00
Alexander ShishkinandGitHub 7cef9529e2 Merge pull request #223 from dydzio0614/patch-1 
Fixing some wrong ingame sounds
 2016-09-30 03:25:01 +04:00
Alexander ShishkinandGitHub 41abce102e Merge pull request #210 from Chocimier/display-fix 
Fix choosing display
 2016-09-09 07:24:35 +04:00
Alexander ShishkinandGitHub 11a1cf0493 Merge pull request #208 from Mixaill/travis 
update travis.yml
 2016-09-04 16:11:30 +04:00
Alexander ShishkinandGitHub ce669c8a0a Merge pull request #207 from krnowak/krnowak/leak-fix 
Fix memory leak
 2016-08-31 15:58:26 +04:00
Alexander ShishkinandGitHub 5e5ce0bb09 Merge pull request #203 from vcmi/logFormat 
boost::format support for CLogger
 2016-08-29 17:32:44 +04:00
AlexVinSandAlexVinS b3e7e2e04a [WiP] Fix one case of bonus node copying. 2016-08-18 15:03:55 +03:00
Alexander Shishkin 20fd7cf916 Merge pull request #190 from vmarkovtsev/feature/fix_uf_warning 
Fix unused function warning in release mode
 2016-02-02 15:23:37 +03:00
AlexVinS 16e0d18880 Added special slots for war machines and arrow towers 2016-01-30 00:53:53 +03:00
AlexVinS ba017c443d Start from diff of pull request #124 from vcmi/issue/1372 2016-01-29 21:05:17 +03:00
AlexVinS 0011507e42 wipe constexpr on @DjWarmonger request 2016-01-29 00:34:54 +03:00
AlexVinS 048e22dbe6 Fix build. 2016-01-27 19:32:59 +03:00
AlexVinS d7c0c3759a Merge branch 'Zyx-develop' into develop 
Conflicts:
	lib/filesystem/AdapterLoaders.h
 2016-01-27 18:53:41 +03:00
Alexander Shishkin 1472ed970d Merge pull request #176 from vmarkovtsev/issue/2160 
Fix 2160 dismissing a VIP hero.
 2016-01-27 18:28:57 +03:00
AlexVinS bffdc2813d revert some project changes 2016-01-27 15:21:29 +03:00
Alexander Shishkin 17d0e9c66e Merge pull request #169 from vmarkovtsev/issue/2014 
Fix 2014 cursor must disappear during movement and Magi's Eye
 2016-01-23 01:54:15 +03:00
Alexander Shishkin 47a4d74e79 Merge pull request #168 from vmarkovtsev/issue/1799 
Fix 1799 not updated hero info box on artifact pickup
 2016-01-23 01:52:41 +03:00
Alexander Shishkin e4b73180bd Merge pull request #159 from vmarkovtsev/issue/2390 
Check against nullptr in VisitHero::fulfillsMe()
 2016-01-19 22:49:54 +03:00
Alexander Shishkin 02c3c226e6 Merge pull request #155 from vmarkovtsev/feature/fix_unknown_objects 
Fix crash on unknown map objects
 2016-01-19 20:39:23 +03:00
Alexander Shishkin 8be660aae8 Merge pull request #153 from vmarkovtsev/develop 
Revert 5cd4e852d4 "Use portable cast in…
 2016-01-18 17:00:39 +03:00
Alexander Shishkin 698df110d8 Merge pull request #154 from vmarkovtsev/feature/macosx_right_click 
Enable right mouse button click emulation on MacOSX
 2016-01-18 16:44:07 +03:00
AlexVinS 5cd4e852d4 Use portable cast in CTeleportDialogQuery also 2015-12-13 15:59:48 +03:00
AlexVinS 9a0161e4e2 Fix and unify CBattleQuery::blocksPack 2015-12-13 15:57:33 +03:00
Alexander Shishkin d9ada3a42f Merge pull request #149 from vmarkovtsev/issue/2306 
Remove undefined behavior in requestActionASAP
 2015-12-13 15:31:34 +03:00
AlexVinS 0fab319c73 Merge remote-tracking branch 'remotes/origin/develop' into issue/2306 
s reverts commit fa8a282696.

Conflicts:
	AI/VCAI/VCAI.cpp

Conflicts:
	AI/VCAI/VCAI.cpp
	client/windows/CAdvmapInterface.cpp
	lib/CPathfinder.cpp
	lib/CPathfinder.h
 2015-12-05 12:56:12 +03:00
AlexVinSandAlexVinS 60825fbbd3 Start implementing PlayerInfo serialisation 2015-12-05 12:36:37 +03:00
AlexVinSandAlexVinS 2f67e015e1 Fix build 2015-12-05 12:36:36 +03:00
AlexVinSandAlexVinS 7c8d29b871 Start implementing player info serialization 2015-12-05 12:36:36 +03:00
AlexVinSandAlexVinS f5b348a1d1 Formatting 2015-12-05 12:36:35 +03:00
AlexVinSandAlexVinS 3af255d1b9 Implemented terrain serialisation 
* with test
 2015-12-05 12:36:34 +03:00
AlexVinSandAlexVinS 3d63a97cf9 Fix TriggeredEvent check 2015-12-05 12:36:33 +03:00
AlexVinSandAlexVinS b828f8fa9b Added checks fro terrain 2015-12-05 12:36:32 +03:00
AlexVinSandAlexVinS 6552acdff6 Check coastal tile OTF 2015-12-05 12:36:29 +03:00
AlexVinSandAlexVinS a3c3f935b9 Advance map checks 2015-12-05 12:06:53 +03:00
AlexVinSandAlexVinS 8bc242d002 Cleanup 2015-12-05 12:06:52 +03:00
AlexVinSandAlexVinS 27bf2524a3 Advance triggered events serialization 
(-) missing indentifier serialization (unimplemented in engine)
(-) missing tests
 2015-12-05 12:06:51 +03:00
AlexVinSandAlexVinS 11af00bcdf Start working on Triggered Events 2015-12-05 12:06:50 +03:00
AlexVinSandAlexVinS b683c29b6e Added modification time to zip. 
* it is required to consider archive valid (by some tools)
 2015-12-05 12:06:49 +03:00
AlexVinSandAlexVinS f6e2cd16ed Fix header.mapLevels saving 2015-12-05 12:06:48 +03:00
AlexVinSandAlexVinS 0cc7213a27 WiP on zip serialization 
(-) still not works correctly
 2015-12-05 12:06:47 +03:00
AlexVinSandAlexVinS fc2cbc841a Another fix for JsonWriter::writeString 
* RMG description check passed
 2015-12-05 12:06:46 +03:00
AlexVinSandAlexVinS ff18944088 Fix writing escaped string json fields 2015-12-05 12:06:45 +03:00
AlexVinSandAlexVinS f2164abf1b Wip on zip serialize fixes 2015-12-05 12:06:45 +03:00
AlexVinSandAlexVinS 27a29bd035 Start implementing actulal json serialization 2015-12-05 12:06:44 +03:00
AlexVinSandAlexVinS 580263201a Cleanup old tests 2015-12-05 12:06:43 +03:00
AlexVinSandAlexVinS 1a8faeb0b9 Start implementing map saver 2015-12-05 12:06:42 +03:00
AlexVinSandAlexVinS 0040b459c3 Add support of CIOApi to CZipStream and CZipLoader (unused, untested) 2015-12-05 12:06:41 +03:00
AlexVinSandAlexVinS b3ac146ba9 Define bridge interface to minizip IOAPI 2015-12-05 12:06:40 +03:00
AlexVinSandAlexVinS 8f209b17b6 Few more checks 2015-12-05 12:06:39 +03:00
AlexVinSandAlexVinS 3d265f94dc Update projects 2015-12-05 12:06:39 +03:00
AlexVinSandAlexVinS a2b4b8a6de Fix filename 2015-12-05 12:06:38 +03:00
AlexVinSandAlexVinS c53718a0d5 Enabled unit test by default 2015-12-05 12:06:37 +03:00
AlexVinSandAlexVinS 0798ef4b2a Advance MapComparer 2015-12-05 12:06:36 +03:00
AlexVinSandAlexVinS 0cc47f00c5 Advance map format simple test 2015-12-05 12:06:35 +03:00
AlexVinSandAlexVinS 7d16585f89 Use COutputStream in CMapSaverJson 2015-12-05 12:06:34 +03:00
AlexVinSandAlexVinS c965f9d02d Added draft of IO memeory buffer 2015-12-05 12:06:33 +03:00
AlexVinSandAlexVinS 221ec55f51 Define basic design of output streams 2015-12-05 12:06:32 +03:00
AlexVinSandAlexVinS adc271d7b3 Draft on classes hierarchy. 
* patcher and loader uses diferent input (JsonNode and binary stream of zipped map archive), dicided to split them
 2015-12-05 12:06:32 +03:00
AlexVinSandAlexVinS 36f4d86844 Test drafts 2015-12-05 12:06:31 +03:00
AlexVinS d6bb599bc8 Another ffmpeg api fix 2015-11-14 03:59:16 +03:00
AlexVinS cdec29e413 Merge branch 'ffmpeg-cleanup' into develop 2015-11-12 15:47:02 +03:00
AlexVinS c9ad7167d1 another try to fix travis build. 2015-11-11 16:27:04 +03:00
AlexVinS e20f861727 try to fix travis build. 
What an ancient version of ffmpeg does it have?
 2015-11-11 15:44:17 +03:00
AlexVinS f9dfa8d0c2 try to fix libav 9.18 2015-11-11 15:18:05 +03:00
AlexVinS 33c933c208 All "old" APIs are deprecated in ffmgeg 2.2.3 - remove them entirely 2015-11-11 13:07:56 +03:00
AlexVinS 4b94efe6b5 Hopefully proper fix for ffmpeg on MSVS 2015-11-11 12:41:28 +03:00
AlexVinS e645b46aed Revert "Merge pull request #124 from vcmi/issue/1372" 
This reverts commit da01af319b, reversing
changes made to 8b6b4e2e0b.
 2015-11-07 11:35:02 +03:00
Alexander Shishkin da01af319b Merge pull request #124 from vcmi/issue/1372 
Issue/1372
 2015-11-04 10:39:40 +03:00