games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
6,795 Commits 19 Branches 62 Tags 110 MiB
dfe781945b
Commit Graph

6795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
DjWarmonger
d23328f697 Merge pull request #278 from FeniksFire/SmallBugFix 
Simplest solutions are usually the best. Thanks!
 2017-02-11 09:27:53 +01:00
FeniksFire
873cee5adf Small fix. 2017-02-10 19:31:50 +01:00
DjWarmonger
fd5b94d1f8 Merge pull request #280 from dydzio0614/KingdomOverviewFix 
Nice, thanks :)
 2017-02-10 16:37:22 +01:00
dydzio
8a2b47d967 Fix for bug #2435 2017-02-10 12:19:35 +01:00
DjWarmonger
3316136ae9 Merge pull request #279 from dydzio0614/patch-6 
Approved, thanks!
 2017-02-10 09:04:22 +01:00
Dydzio
86fe44d9ac Counterattack correction. Fixes bug #2501 
Creatures should not be able to counterattack multiple times during one opponent attack under any circumstances.
 2017-02-10 00:36:15 +01:00
FeniksFire
e3ffdca65f During the unit tests I saw that hex can take from occupiedHex() signed 
values and then he get stupid value. So changing from ui16 to si16.
 2017-02-09 20:08:34 +01:00
DjWarmonger
53b2add434 Merge pull request #276 from dydzio0614/patch-5 
Update year to 2017
 2017-02-07 15:38:57 +01:00
Dydzio
d529b17ce7 Update year to 2017 2017-02-07 13:33:48 +01:00
DjWarmonger
a8c39d9267 Merge pull request #274 from dydzio0614/ShooterInit 
Approved. One guy named Avatar requested it recently ;)
 2017-02-06 21:18:19 +01:00
DjWarmonger
ba9ea84718 Merge pull request #275 from dydzio0614/RangedRetaliation 
Okay, let's try this.
 2017-02-05 20:55:51 +01:00
dydzio
21f4a0ba60 Implement ranged counterattack 2017-02-04 10:33:45 +01:00
dydzio
141e5ad032 Implement "emergency" projectile init attempt 2017-02-03 23:25:46 +01:00
DjWarmonger
1e38b29add Merge pull request #273 from dydzio0614/CommanderCrash 
Ah right, I forgot about this bug :/. Thanks.
 2017-02-02 21:20:15 +01:00
dydzio
81a00f59d1 Basic fix for bug #2635 2017-02-02 19:17:15 +01:00
DjWarmonger
c91bc25e70 Merge pull request #269 from dydzio0614/MakeWOGGreatAgain 
Okay it's time to merge this awesome branch 👍
 2017-02-02 06:57:54 +01:00
Dydzio
6c8ef79727 Merge branch 'develop' into MakeWOGGreatAgain 2017-02-01 23:14:36 +01:00