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
f39e619304 More tweaks 2016-09-06 13:51:53 +03:00
1ce4675df6 Tweaks 2016-09-06 13:33:11 +03:00
838717dfc1 Magic mirror unified again with normal cast. 2016-09-06 13:05:33 +03:00
686cd00c68 Cleanup. 2016-09-06 12:26:01 +03:00
cc4362211c Extracted MagicMirror handling 2016-09-06 11:03:36 +03:00
f3d9e718bf Handle AcidBreathDamage immunity in standard way. 2016-09-06 10:52:54 +03:00
0241c6e843 Improved spell range calculation.
* should now support smart custom range AOE spells
2016-09-06 08:56:31 +03:00
1e32c71e47 Make sure that there is no unwanted stack affect by spells. 2016-09-06 08:20:17 +03:00
39c2c6cde7 Ensure no immunity to AcidBreathDamage 2016-09-06 07:16:32 +03:00
f1d0bede11 Moved all affected stacks calculations to mechanics 2016-09-06 07:05:55 +03:00
18fc94d709 WIP on SpellCastContext 2016-09-06 06:40:23 +03:00
9ee954edcc WIP on SpellCastContext 2016-09-06 05:11:32 +03:00
1d840a33a5 Started SpellCastContext rework 2016-09-06 04:11:30 +03:00
289cbbf2e7 Teach AI how to use massive timed effects. 2016-09-05 14:17:46 +03:00
82ac035340 OO design for obstacle spells. 2016-09-05 13:34:48 +03:00
f3b7fe947c Reworked spell target existence check.
* related to 2269
2016-09-05 11:36:25 +03:00
4cd264ef86 Merge branch 'develop' into SpellsRefactoring8 2016-09-05 05:22:50 +03:00
13aedac3f4 Fixed war machines spell immunity.
* Should fix http://bugs.vcmi.eu/view.php?id=2407
2016-09-05 05:21:13 +03:00
8e94b1c4d2 VCAI::objectRemoved: handle hero boat removal. Fix issue 2350
Avoid situation when AI attempt to visit boat after it's killed hero who used it.
2016-09-04 15:44:42 +03:00
11a1cf0493 Merge pull request #208 from Mixaill/travis
update travis.yml
2016-09-04 16:11:30 +04:00
6122186efa Removed old template duplicated by new package. 2016-09-04 13:31:04 +02:00
d2bd749b4f MSVS project fixes. 2016-09-04 13:30:11 +02:00
9cf7596344 update travis.yml 2016-09-04 13:49:03 +03:00
22f729a3fe CPlayerState serialize fix. 2016-09-04 13:43:09 +03:00
948a339463 Merge branch 'develop' into SpellsRefactoring8 2016-09-04 11:27:15 +03:00
f4f170bf92 Merge pull request #202 from vcmi/noncopyableBonusSystemNode2
Didn't manage to find any crashes in newly created games. Merging.

Keep in mind that even if most of old saves will load properly some of them still corrupted beyond repair and after some turns they might eventually crash.
2016-09-04 11:06:05 +03:00
5fc1fd4daf Merge pull request #206 from Chocimier/fixes
genBuildingRequirements is tricky one, but in tests it's seems everything is okay
2016-09-04 09:02:34 +03:00
a23144b361 Extracted adventure spell mechanics to distinct class hierarchy. 2016-09-04 08:19:28 +03:00
eb128a0207 More style tweaks 2016-09-04 05:15:37 +03:00
c0cf5d6956 Style tweaks 2016-09-04 04:59:30 +03:00
ad3049e6f8 Merge branch 'krnowak/choose-display' into develop 2016-09-04 04:06:42 +03:00
076924166a CPlayerInterface: always choose hero if there no town. Fix issue 2073 2016-09-01 07:08:37 +03:00
ce669c8a0a Merge pull request #207 from krnowak/krnowak/leak-fix
Fix memory leak
2016-08-31 15:58:26 +04:00
46bd1c40cc Fix memory leak
SDL_RWFromMem does not take the ownership of the passed memory, so we
have to free it ourselves.
2016-08-31 11:45:37 +02:00
58bc0f7272 Allow choosing the display from the launcher
This adds another combobox for choosing the display. To ease the
display choice we try to roughly describe the display (its resolution
and location).

The combobox is hidden for single display setups.
2016-08-31 11:12:59 +02:00
12f2006fbf Show the game window on the configured display
This basically starts respecting the displayIndex setting. When
changing the fullscreen setting in-game, we read the display index
from the already existing window.
2016-08-31 11:12:59 +02:00
32f5033a4d Add a displayIndex setting to the video settings
This setting will control on which display the game window will be
shown.
2016-08-31 11:12:59 +02:00
437eadf1ed do not leak scenarioOpts in CMapInfo 2016-08-31 06:18:01 +03:00
a4f12fb007 Show downloaded mods with no need to reload remote repositories 2016-08-30 22:16:52 +02:00
044e2b9e51 Properly calculate building requirements
In OH3 you can't build Capitol when Tavern is not builded.
In VCMI up to now you could.
2016-08-30 22:15:24 +02:00
326be61ecb Show atrifact's name in message of Warrior's tomb 2016-08-30 20:50:03 +02:00
52797082aa Do not show whether Shrine is visited by hero, if was not visited by player yet 2016-08-30 20:48:03 +02:00
1e7e7a7006 Fixed http://bugs.vcmi.eu/view.php?id=2419 2016-08-30 12:20:17 +03:00
5d329b40a4 Factored spell action selection for location target. 2016-08-30 12:20:15 +03:00
d1579ea620 Simplify spell action selection for creature target. 2016-08-30 12:20:13 +03:00
b09f150e7b Factored out battleCanCastThisSpellHere 2016-08-30 12:20:11 +03:00
0d5eaa1183 Proper fix for http://bugs.vcmi.eu/view.php?id=2422 2016-08-30 12:20:09 +03:00
b634482bb0 Fix http://bugs.vcmi.eu/view.php?id=2422 2016-08-30 12:20:07 +03:00
22d885af22 Fixed http://bugs.vcmi.eu/view.php?id=2302 2016-08-30 12:20:05 +03:00
be67faad90 Drafts 2016-08-30 12:20:03 +03:00