games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity
7,213 Commits 20 Branches 62 Tags 110 MiB
f5ba181173
Commit Graph

7213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ArseniyShestakov
bdb0db819d Merge pull request #300 from Chocimier/iss1761 
Correctly display visiting army in kingdom overview, fixes #1761
 2017-05-23 03:53:11 +03:00
Piotr Wójcik
76acc29d6c Correctly display visiting army in kingdom overview, fixes #1761 
Do not modify CIntObject::pos, according to its doc
 2017-05-22 22:34:05 +02:00
Alexander Shishkin
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
Vasya Novikov
a9277d0723 documentation: use git repo address instead of SVN 2017-05-14 12:29:56 +03:00
DJWarmonger
58cca8e9df Fixed self-luck Icon (Thanks Zeryss). 2017-05-14 08:29:51 +02:00
DjWarmonger
1b7420264f Merge pull request #295 from Chocimier/iss1293 
T hotkey select first town when last is active, fixes #1293
 2017-05-13 18:22:28 +02:00
Piotr Wójcik
e4d3cdca09 Simplify 2017-05-13 16:57:15 +02:00
DjWarmonger
adaa8277b1 Merge pull request #296 from Chocimier/iss2598 
Give hero move points at day of visiting stable, fixes #2598
 2017-05-13 12:17:03 +02:00
Alexander Shishkin
b97b3ecec6 Merge pull request #297 from FeniksFire/develop 
Fix game crash after autofight in the battle.
 2017-05-13 11:54:33 +03:00
FeniksFire
d390dff54d Fix game crash after autofight. 
Vcmi makes crash when I turn on autofight in the battle and wait until I
close result battle window.
 2017-05-13 09:54:03 +02:00
Piotr Wójcik
e3992de50e Give hero move points at day of visiting stable, fixes #2598 2017-05-11 20:52:10 +02:00
Piotr Wójcik
cc02001836 T hotkey select first town when last is active, fixes #1293 2017-05-11 20:49:17 +02:00
DjWarmonger
48702a26a4 Merge pull request #294 from dydzio0614/bug2476 
Fix bug #2476 (2nd solution)
 2017-05-02 08:16:54 +02:00
dydzio
944edaf0bb Fix bug #2476 2017-03-27 23:47:26 +02:00
FeniksFire
19a9f05b80 Fix garrison highlight in city (#292) 2017-03-23 22:48:35 +03:00
Dydzio
88952aefff Restart button fix (#288) 2017-03-19 16:58:46 +03:00
Arseniy Shestakov
09d593e59b CBattleInterface: avoid freezes on end of battle. Fix issue 1897 2017-03-19 05:15:31 +03:00
DjWarmonger
d622f37e66 Merge pull request #290 from FeniksFire/develop 
Little fix in highlight in CGarrisonSlot.
 2017-03-18 16:10:35 +01:00
FeniksFire
cde8542475 Oversight. 2017-03-18 14:25:17 +01:00
FeniksFire
dd5660ff08 Simplifity code. 2017-03-18 14:21:41 +01:00
AlexVinS
3c893a6bec Few spell-related tweaks 2017-03-18 14:08:02 +03:00
AlexVinS
5da109ad30 tweaks 2017-03-18 13:25:12 +03:00
AlexVinS
9bf4b2a1b0 [C::B] projects updated 2017-03-18 13:21:23 +03:00
FeniksFire
d045f59a11 Little fix in braces #2. 2017-03-18 07:58:40 +01:00
FeniksFire
68c618cb99 Little fix in highlight in CGarrisonSlot. 2017-03-17 21:24:55 +01:00
DjWarmonger
b06e20bba3 Compilation fixes for MSVS 2017-03-17 19:55:52 +01:00
DjWarmonger
dfb57cdc4a Merge pull request #289 from FeniksFire/develop 
Moving/dividing classes from BattleState to separate files.
 2017-03-17 19:30:58 +01:00
FeniksFire
3de891b4b4 Moving/dividing classes from BattleState to separate files. 2017-03-17 16:48:44 +01:00
Alexander Shishkin
692041a20e Merge pull request #287 from dydzio0614/smallfix 
Cleanup after last MSVS compilation fixes
 2017-03-16 06:32:12 +03:00
dydzio
7ef7711a47 Cleanup after last MSVS compilation fixes 2017-03-15 22:58:25 +01:00
Arseniy Shestakov
d4091db172 CInfoBar: only pop up when adventure map interface is on top 2017-03-14 00:03:15 +03:00
Alexander Shishkin
5893e1e08e Merge pull request #286 from FeniksFire/develop 
Fill a gap in lib/CMakeLists.txt
 2017-03-10 23:50:50 +03:00
FeniksFire
46a06ce184 Change the year from 2016 to 2017 in help description. 2017-03-10 19:28:01 +01:00
FeniksFire
450075bec2 Fill a gap in lib/CMakeLists.txt 2017-03-10 17:39:11 +01:00
Arseniy Shestakov
d0f6ad6e66 Travis CI: disable tests for Coverity Scan builds too 2017-03-09 22:08:56 +03:00
Arseniy Shestakov
98ab9821a5 Travis CI: for now disable tests for Linux 
Tests we have now depend on Boost 1.59+ features not available in 14.04.
There is no alive PPA for Boost / Trusty I can find.

Xenial support might arrive to Travis or we'll rework config.
 2017-03-09 02:52:13 +03:00
Arseniy Shestakov
48f4f42fff Travis CI: update Qt PPA name 2017-03-09 01:44:38 +03:00
DjWarmonger
20700495c0 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2017-03-02 10:59:34 +01:00
DjWarmonger
84bdc5c994 Compilation fixes for MSVS. 
Apparently it doesn't like structs converted to class, needs more investigation.
 2017-03-02 10:58:14 +01:00
AlexVinS
0b50976de1 [C::B] build fixes 2017-02-22 00:39:13 +03:00
Alexander Shishkin
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
DjWarmonger
a75d981962 Merge pull request #282 from drizt/resolution-combobox 
Makes sense to me, thanks!
 2017-02-20 08:46:31 +01:00
DjWarmonger
1f08878620 Merge pull request #283 from janisozaur/override 
Add `override` keyword where applicable
 2017-02-19 21:42:26 +01:00
DjWarmonger
0fdee4fde2 Merge pull request #281 from janisozaur/clang4 
Accepted. This should be fixed in fuzzylite first, still.
 2017-02-19 21:39:01 +01:00
DjWarmonger
2401c81d4e Merge pull request #284 from dydzio0614/Bug2640 
Great :)
 2017-02-18 21:51:50 +01:00
Dydzio
3326bfc067 Naming fix 2017-02-18 21:10:59 +01:00
dydzio
a4f375d9c0 Make AI able tobuy extra buildings. Fix bug #2640 2017-02-18 18:40:44 +01:00
Michał Janiszewski
f5ebc763b4 Add override keyword where applicable 2017-02-17 14:39:16 +01:00
Ivan Romanov
739cb9b2c5 Avoid scroollbar in resolution combobox 2017-02-17 14:00:55 +05:00
Michał Janiszewski
e28f64efd2 Fix compilation with clang 4 
See https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
for details
 2017-02-17 10:00:26 +01:00