1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

6312 Commits

Author SHA1 Message Date
AlexVinS
3c9695abcc Fixed CID 1366310 2016-11-25 13:58:20 +03:00
AlexVinS
692d23e580 Fixed CID 1366376 2016-11-25 13:38:26 +03:00
Arseniy Shestakov
f8ccc27702 Travis CI: add notification email for Coverity 2016-11-25 03:24:14 +03:00
AlexVinS
bd4040245f Fixed CID 1288859 2016-11-24 22:34:42 +03:00
AlexVinS
db40e125eb Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359 2016-11-24 21:56:30 +03:00
Arseniy Shestakov
b880e2b586 Travis CI: fix 2016-11-24 21:33:06 +03:00
Arseniy Shestakov
438bf68ac7 Travis CI: one more fix 2016-11-24 21:18:41 +03:00
Arseniy Shestakov
7800524b48 Travis CI: fix config parse error 2016-11-24 21:13:50 +03:00
Arseniy Shestakov
880d3e8792 Travis CI: attempt to enable Coverity Scan integration 2016-11-24 21:08:47 +03:00
Arseniy Shestakov
30bc46877a Add Coverity Scan status badge 2016-11-24 19:53:30 +03:00
AlexVinS
04d22644e5 fixed http://bugs.vcmi.eu/view.php?id=2617 2016-11-23 14:47:57 +03:00
AlexVinS
52c610bbb0 Silence "X doesn't have a base stack!" warning (fixed version) 2016-11-18 18:35:05 +03:00
AlexVinS
2af7331088 Revert "Silence "X doesn't have a base stack!" warning"
This reverts commit 6d13c8938c.
2016-11-18 17:49:55 +03:00
AlexVinS
dc39fb2d14 Removed useless CPack::type field.
* it was an ancient network protocol artifact
2016-11-18 17:45:59 +03:00
AlexVinS
ebb88f4133 There no point for struct MetaString and struct Component to have CPack as base 2016-11-18 16:58:22 +03:00
AlexVinS
6d13c8938c Silence "X doesn't have a base stack!" warning 2016-11-18 15:52:45 +03:00
AlexVinS
931656f24a possible fix for http://bugs.vcmi.eu/view.php?id=2612 2016-11-18 14:27:20 +03:00
AlexVinS
f8bf2c3746 Fixed http://bugs.vcmi.eu/view.php?id=2611 2016-11-18 12:56:58 +03:00
ArseniyShestakov
6a9d3d07e9 Merge pull request #260 from dalerank/patch-1
set correct paths for libraries for game directory
2016-11-15 00:18:03 +03:00
dalerank
6ca49695e6 set correct paths for libraries for game directory 2016-11-15 00:10:13 +03:00
AlexVinS
33c0bc49f6 Merge branch 'CommanderArtifacts3' into develop 2016-11-13 15:31:16 +03:00
AlexVinS
713403a0e4 Cleanup 2016-11-13 13:15:36 +03:00
AlexVinS
4ff4e41e81 fixed typo 2016-11-13 13:13:41 +03:00
AlexVinS
2aa8c79a2c fixed boost::optional load, regression from https://github.com/vcmi/vcmi/pull/212 2016-11-13 11:46:26 +03:00
AlexVinS
4338fc4ffb CMessage converted to CAnimation 2016-11-13 08:11:01 +03:00
Alexander Shishkin
a73ca79ed1 Merge pull request #257 from vcmi/mapHandlerRefactoring2
Map handler refactoring, part 2.
2016-11-12 09:20:45 +03:00
AlexVinS
9e6bd48038 fix 2016-11-10 14:38:33 +03:00
ArseniyShestakov
06437aa202 Merge pull request #258 from dydzio0614/spellingfix
Minor typo fixes. Fix issue #2596
2016-11-10 13:58:25 +03:00
dydzio
5c07e1c432 Minor typo fixes 2016-11-10 11:51:47 +01:00
AlexVinS
b248642468 fixes and cleanup 2016-11-09 09:32:44 +03:00
dydzio
b626f9a134 Fix CCommanderArtPlace localization + minor fixes 2016-11-08 17:26:24 +01:00
AlexVinS
a8a661b159 Map handler refactoring, part 2. 2016-11-08 00:19:53 +03:00
AlexVinS
aad675a7c4 Revert "Merge branch 'p254_4' into develop"
This reverts commit 37f68713a7, reversing
changes made to 4477b7c35d.
2016-11-08 00:17:20 +03:00
Arseniy Shestakov
37f68713a7 Merge branch 'p254_4' into develop 2016-11-08 00:12:01 +03:00
AlexVinS
4d510c172d Terrain drawing converted to CAnimation. 2016-11-07 23:48:30 +03:00
AlexVinS
c9a3d92ff3 cleanup 2016-11-06 17:36:46 +03:00
dydzio
96fa0fb6d4 Implement giving commander artifacts back to hero 2016-11-06 13:02:00 +01:00
ArseniyShestakov
4477b7c35d Merge pull request #255 from vcmi/travisMXE
Travis: add Windows build via MXE
2016-11-06 06:36:18 +03:00
Arseniy Shestakov
c7056c0302 Travis: add Windows build via MXE
Tests are disabled for MXE since they fail to build. Problem is lack of proper main, but fix might break them on other platforms.
Since we don't have many automated tests anyway better to disable it for now when it's built using MXE.
2016-11-06 05:36:50 +03:00
AlexVinS
6782136e3e Map edge drawing converted to CAnimation 2016-11-06 05:27:58 +03:00
AlexVinS
46196daa07 cleanup 2016-11-06 05:27:56 +03:00
AlexVinS
6a272d8f0c FoW drawing converted to CAnimation 2016-11-06 05:27:45 +03:00
AlexVinS
c11a660d21 Fixed and cleanup 2016-11-06 05:27:44 +03:00
AlexVinS
186cd7a163 Mao object drawing converted to CAnimation 2016-11-06 05:27:26 +03:00
dydzio
baeb3c9e55 Refactor CArtPlace + use it for commanders 2016-11-04 17:54:09 +01:00
AlexVinS
08252a1282 Merge remote-tracking branch 'remotes/dydzio/CommanderArtifacts2' into develop 2016-11-03 22:27:08 +03:00
dydzio
03620b3cbe Remove artifact assembly check for commanders 2016-11-03 19:49:55 +01:00
AlexVinS
329a537eec Plug assertion (report warning instead) on some maps start. 2016-11-03 19:15:16 +03:00
AlexVinS
9e366df70f Merge branch 'PregameCache' into develop 2016-11-03 17:10:54 +03:00
dydzio
47a72d4441 Make artifacts worn by commander visible 2016-11-03 14:25:17 +01:00