1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

6214 Commits

Author SHA1 Message Date
Alexander Shishkin
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
AlexVinS
24585cde87 complete fix for http://bugs.vcmi.eu/view.php?id=2507 2016-10-11 18:19:42 +03:00
AlexVinS
5c3f84138b fixed random reward generation in CGVisitableOPW 2016-10-11 18:00:54 +03:00
AlexVinS
7db7ece143 Do not send netpack inside netpack handler. 2016-10-09 19:38:13 +03:00
Piotr Wójcik
bb890098df Fix regression for week-visitable objects 2016-10-09 18:51:41 +03:00
AlexVinS
6664731886 Fixed http://bugs.vcmi.eu/view.php?id=2551 2016-10-09 11:38:02 +03:00
ArseniyShestakov
3cf000572a Merge pull request #234 from dreamer10/develop
Bug fix for berserk:
2016-10-08 17:43:22 +03:00
Hao Hu
9ec9cffe9b Bug fix for berserk: fixed the issue that the berserk affected stack
won't attack the nearest live stack.
2016-10-07 23:50:34 -04:00
ArseniyShestakov
8af4d97664 Merge pull request #233 from vmarkovtsev/develop
Bunch of random stuff
2016-10-03 22:25:39 +03:00
Vadim Markovtsev
34cf92cb9b Change logging style 2016-10-03 20:32:01 +02:00
Vadim Markovtsev
eac5aab396 Survive client<->server ABI mismatch 2016-10-02 22:45:00 +02:00
Vadim Markovtsev
a15b8f4c99 Fix IntObject re-activated with mismatching used and active at game start 2016-10-02 22:45:00 +02:00
Vadim Markovtsev
d5327f3daf Fix loading "" bitmap at game start 2016-10-02 22:45:00 +02:00
Vadim Markovtsev
a4e550e3cf Add log levels report 2016-10-02 22:45:00 +02:00
ArseniyShestakov
6f82dc3e15 Merge pull request #230 from dydzio0614/CommanderExperience
Some repair for WoG commanders
2016-10-02 19:29:55 +03:00
Vadim Markovtsev
6e9431a0fb Merge pull request #231 from vmarkovtsev/fix-cmake-warnings
Fix cmake warnings
2016-10-02 18:17:50 +02:00
ArseniyShestakov
5593eb5769 Merge pull request #232 from vmarkovtsev/develop
Add the option to forcefully use bundled fuzzylite
2016-10-02 19:05:47 +03:00
Vadim Markovtsev
63383502c3 Add the option to forcefully use bundled fuzzylite
cmake -DFORCE_BUNDLED_FL=TRUE ...

As requested in #231
2016-10-02 17:47:27 +02:00
ArseniyShestakov
1c2a40592a Merge pull request #229 from vmarkovtsev/develop
Fix freshly recruited hero phantom in castle entrance
2016-10-02 18:26:40 +03:00
Vadim Markovtsev
8546f510d1 Update cotire 2016-10-02 17:12:08 +02:00
Vadim Markovtsev
6d89a2f15c Fix whitespace dev warnings
They are bogus, but still
2016-10-02 17:12:08 +02:00
Dydzio
b84e680f57 Revert changing class structure 2016-10-02 16:57:26 +02:00
Vadim Markovtsev
7ac4e6ed18 Fix freshly recruited hero phantom in castle entrance 2016-10-02 16:29:24 +02:00
Vadim Markovtsev
05dff6b8e2 Merge pull request #228 from vmarkovtsev/develop
Fix launcher's UI for Ubuntu's scaled view on Retina displays
2016-10-02 16:29:04 +02:00
AlexVinS
85863dbed6 Fix build 2016-10-02 17:25:55 +03:00
dydzio
02e795d508 Fix commander appearing in battles while dead 2016-10-02 16:25:20 +02:00
AlexVinS
723734fd04 Fixed commander always dies. 2016-10-02 17:15:25 +03:00
AlexVinS
5fa9d64d78 Do not allow cast if it affects only "wrong" targets 2016-10-02 16:46:04 +03:00
Arseniy Shestakov
7b7958c548 Cheat codes: add option to apply cheats on different players
All suitable codes can now be used with "ai", "all" color or with object ID:
vcminahar all - will apply cheat to all heroes of all players
vcminahar ai - will apply cheat  to all heroes of AI players
vcminahar blue - will apply it to all heroes of blue player
vcminahar 553 - will apply cheat to hero with instance id of 553 if it's exist
Cheats without options work as before.
2016-10-02 16:21:46 +03:00
AlexVinS
cd5c0b3297 Style tweaks. 2016-10-02 15:22:55 +03:00
AlexVinS
34a494ade0 hack-fixed http://bugs.vcmi.eu/view.php?id=2533 2016-10-02 12:39:25 +03:00
AlexVinS
affbc71c56 cleanup 2016-10-02 11:58:53 +03:00
Arseniy Shestakov
bccb82ffcb Add important changes to ChangeLog 2016-10-02 11:49:46 +03:00
Arseniy Shestakov
04eb0e3787 CGameState::battleGetBattlefieldType: avoid crash on tile 0,0,0
Fix issue 2524
2016-10-02 08:39:01 +03:00
AlexVinS
c5440a1c6c Fixed http://bugs.vcmi.eu/view.php?id=2541 2016-10-02 01:32:28 +03:00
Vadim Markovtsev
ac3c231fee Fix launcher's UI for Ubuntu's scaled view on Retina displays 2016-10-02 00:31:22 +02:00
AlexVinS
8aa57f0cbc fix 2016-10-02 01:07:13 +03:00
Alexander Shishkin
a92e820eb4 Merge pull request #227 from Chocimier/book
Prevent flipping empty spellbook
2016-10-02 00:42:33 +04:00
Piotr Wójcik
ea6545b1d3 Prevent flipping empty spellbook
When hero has no travel spells he can no longer flip spell book opened from right panel button
2016-10-01 21:39:40 +02:00
AlexVinS
23b7a803b6 cleanup 2016-10-01 20:07:36 +03:00
DjWarmonger
76408e9de0 Merge pull request #226 from vmarkovtsev/develop
Looks like I could approve this one ;)
2016-10-01 18:15:15 +02:00
AlexVinS
7c91d378c8 Display specific message if cast blocked by CURSED_GROUND 2016-10-01 18:35:56 +03:00
AlexVinS
52ae5b4a86 Fixed http://bugs.vcmi.eu/view.php?id=482 2016-10-01 18:18:46 +03:00
Vadim Markovtsev
205fb01e65 Add myself to AUTHORS 2016-10-01 17:17:37 +02:00
AlexVinS
799b8519e0 Allow cast avdmap spells without spellbook
* fixes http://bugs.vcmi.eu/view.php?id=1898
* partial fix for http://bugs.vcmi.eu/view.php?id=482
* fixes http://bugs.vcmi.eu/view.php?id=2155
2016-10-01 17:21:39 +03:00
AlexVinS
f124db9f61 Get rid of Bonus::sourceSpell()
* now bonus API looks more or less clean
2016-10-01 14:47:21 +03:00
AlexVinS
c2a6c268c0 Cleanup terrain overlay bonuses, fixed CURSED_GROUND 2016-10-01 14:10:09 +03:00
AlexVinS
b6368e23ab cleanup 2016-10-01 11:05:58 +03:00
AlexVinS
f6bfba0ced Unified Dispell-related bonus selectors 2016-10-01 10:31:59 +03:00
AlexVinS
96c17505ae get rid of IBonusBearer::getSpellBonuses & Selector::anyRange 2016-10-01 09:07:18 +03:00