1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Commit Graph

9319 Commits

Author SHA1 Message Date
f5ebc763b4 Add override keyword where applicable 2017-02-17 14:39:16 +01:00
739cb9b2c5 Avoid scroollbar in resolution combobox 2017-02-17 14:00:55 +05:00
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
d23328f697 Merge pull request #278 from FeniksFire/SmallBugFix
Simplest solutions are usually the best. Thanks!
2017-02-11 09:27:53 +01:00
873cee5adf Small fix. 2017-02-10 19:31:50 +01:00
fd5b94d1f8 Merge pull request #280 from dydzio0614/KingdomOverviewFix
Nice, thanks :)
2017-02-10 16:37:22 +01:00
8a2b47d967 Fix for bug #2435 2017-02-10 12:19:35 +01:00
3316136ae9 Merge pull request #279 from dydzio0614/patch-6
Approved, thanks!
2017-02-10 09:04:22 +01:00
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
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
53b2add434 Merge pull request #276 from dydzio0614/patch-5
Update year to 2017
2017-02-07 15:38:57 +01:00
d529b17ce7 Update year to 2017 2017-02-07 13:33:48 +01:00
a8c39d9267 Merge pull request #274 from dydzio0614/ShooterInit
Approved. One guy named Avatar requested it recently ;)
2017-02-06 21:18:19 +01:00
ba9ea84718 Merge pull request #275 from dydzio0614/RangedRetaliation
Okay, let's try this.
2017-02-05 20:55:51 +01:00
21f4a0ba60 Implement ranged counterattack 2017-02-04 10:33:45 +01:00
141e5ad032 Implement "emergency" projectile init attempt 2017-02-03 23:25:46 +01:00
1e38b29add Merge pull request #273 from dydzio0614/CommanderCrash
Ah right, I forgot about this bug :/. Thanks.
2017-02-02 21:20:15 +01:00
81a00f59d1 Basic fix for bug #2635 2017-02-02 19:17:15 +01:00
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
6c8ef79727 Merge branch 'develop' into MakeWOGGreatAgain 2017-02-01 23:14:36 +01:00
cffa616bf1 Refactor SOUL_STEAL bonus handler 2017-02-01 22:58:31 +01:00
6d37c8bceb Merge pull request #272 from dydzio0614/bug2600
Nice, thanks :)
2017-02-01 17:57:58 +01:00
4c4539b00e Rename ADVANCED_CATAPULT bonus to reflect the purpose better 2017-02-01 15:05:46 +01:00
f4c55ae3c9 Merge pull request #271 from dydzio0614/patch-4
Fix mantis #2642
2017-02-01 14:56:42 +01:00
a8f04aede7 Extend creature siege support. Fix bug #2600 2017-02-01 11:25:57 +01:00
90d638179c Fix mantis #2642
Add meteor shower vulnerability to magma elementals
2017-02-01 10:25:25 +01:00
49e32325c4 Uncommend code fragment and make simple protect from error. 2017-01-31 19:55:43 +01:00
54e75eb0e3 Delete unnecessary range. 2017-01-29 16:44:54 +01:00
de7184d68d Making unit tests for BattleHex and some estetic improvements. 2017-01-29 16:38:13 +01:00
b5bfb763fd Allow different subtypes of SOUL_STEAL work concurrently 2017-01-29 14:45:36 +01:00
330c0961b7 Add missing code fix 2017-01-29 12:52:18 +01:00
2f1f725ae6 Code improvements, minor fixes 2017-01-29 11:50:37 +01:00
f5b5fa149f Build #1 2017-01-28 12:28:30 +01:00
a344205c13 Merge pull request #267 from FeniksFire/improvementAI
Okay let's do this
2017-01-26 21:38:25 +01:00
f447e44427 Add missing skill description, handler refactoring 2017-01-26 21:24:01 +01:00
3e285c2004 Add santa gremlin missing creature ability, fix shooter init bug 2017-01-26 20:53:28 +01:00
c86304ac3b Fixed http://bugs.vcmi.eu/view.php?id=2634 2017-01-26 10:52:19 +03:00
0b3c1c7185 Fixed http://bugs.vcmi.eu/view.php?id=2639 2017-01-26 10:44:30 +03:00
daec6d933c Add "WoG werewolf"-like ability support 2017-01-22 20:28:08 +01:00
c310138fc3 Add WoG ghost ability support 2017-01-20 15:48:45 +01:00
4d39f652bf Making more detailed options when choosing AI in launcher: http://
bugs.vcmi.eu/view.php?id=2369
2017-01-17 12:34:28 +01:00
76d3c98b85 Merge pull request #265 from dydzio0614/patch-3
Remove leftover commander artifact code
2017-01-01 02:47:59 +03:00
79c101a56d Remove leftover commander artifact code 2016-12-31 21:29:47 +01:00
73c62f1b4c Restore cut ring around main town. 2016-12-21 22:23:55 +01:00
e54bde9d22 Merge pull request #264 from NikolayIT/patch-1
Added few files and folders to .gitignore which should not be part of…
2016-12-21 21:05:11 +01:00
4b3a878c00 Fix for passability. 2016-12-21 13:37:19 +01:00
a0596ebecf Add clearance under town to ensure passability. 2016-12-21 10:43:24 +01:00
cc452bdfa9 Improved road routing so they can go under any passable object. 2016-12-21 10:10:37 +01:00
c82a4fc3a2 Added few files and folders to .gitignore which should not be part of the repository when compiling with Visual Studio 2015 2016-12-21 11:04:29 +02:00
f78b524731 - Remove obstacle in front of player-owned towns
- Allow obstacles to touch town object
2016-12-20 15:23:47 +01:00