beegee1
40ab89e179
- copy of campaign heroes can be done later (at the point where it's clear if they will be replaced)
2014-05-29 17:07:21 +02:00
Ivan Savenko
1d17d60449
gcc update:
...
- removed support for 4.6
- compilation fixes for 4.7
2014-05-29 13:42:05 +03:00
karol57
6a65802f22
Removed hardcoded value
2014-05-26 11:52:27 +02:00
karol57
5907735676
All inline functions are now part of definition.
2014-05-26 10:37:04 +02:00
karol57
dd33fd51a8
int3 dist2d microoptimization
2014-05-25 20:42:25 +02:00
karol57
df8cce0d61
Declarations and definitions are now separated.
...
Added explicit int3(si32) c-tor.
Operators like += now return reference to object.
Operator != has now own implementation.
Added dist2SQ for optimization proposes.
areNeighbours now uses dist2SQ
Removed unnecessary comments
2014-05-25 20:12:53 +02:00
AlexVinS
c40c79fa94
Make gcc happy
2014-05-25 13:02:15 +04:00
DjWarmonger
69457dbd75
- Implemented some really nice gravity-based algorithm
...
- Fixed zones placed outside the map (causing various bugs)
2014-05-25 06:20:02 +02:00
DjWarmonger
b9de3875d9
- Attempt to move zones away from map boundaries
...
- Tweaking algorithm parameters
- Refactorings
2014-05-24 18:39:58 +02:00
DjWarmonger
021c6b9af3
All zones will be painted with terrain. Removed unused code.
2014-05-24 14:33:22 +02:00
DjWarmonger
d2fd71d087
Zone shapes & terrains work nicely.
2014-05-24 14:06:08 +02:00
DjWarmonger
27dcf70b1a
Randomized center positions of zones.
2014-05-24 12:42:06 +02:00
DjWarmonger
3a6f748fb5
Paint native terrain in zones.
2014-05-23 21:43:33 +02:00
DjWarmonger
75cea9206d
- Fixed uninitialized guarding creature positions
...
- Fix for guard placement
2014-05-23 19:45:17 +02:00
DjWarmonger
35d6215b7b
jfhs patch integration is now complete:
...
Lots of fixes for object placement.
Fixed blocked paths on generated maps.
2014-05-23 19:14:33 +02:00
DjWarmonger
4ea9810831
First version that works:
...
- Covered RMG with exceptions
- Fixes for object randomization & placement
2014-05-23 17:12:31 +02:00
DjWarmonger
342aec0700
More rollback.
2014-05-23 13:23:03 +02:00
DjWarmonger
5b0b152aa3
Trying to restore recent type of mapGenOptions.
2014-05-23 11:56:51 +02:00
DjWarmonger
eae7e5c51f
Rolled back some incorrect values.
2014-05-23 09:22:22 +02:00
DjWarmonger
67793a2db4
Some more.
2014-05-22 21:40:34 +02:00
DjWarmonger
2d8cd1c5b5
Some more.
2014-05-22 21:06:26 +02:00
DjWarmonger
aead8da54f
Fixed some obvious bugs with random map options.
2014-05-22 20:50:24 +02:00
DjWarmonger
1e1dce20a8
Something that compiles, but crashes when launching RMG map.
2014-05-22 19:25:17 +02:00
DjWarmonger
88f962d6d5
Taken jfhs code as it is.
...
http://forum.vcmi.eu/viewtopic.php?p=10040#10040
2014-05-22 16:27:13 +02:00
AlexVinS
8a3b997fa5
fix a few comments. No code changes.
2014-05-21 13:02:20 +04:00
AlexVinS
6f65d2484b
Extract battleStackIsImmune from battleIsImmune
...
This fix possible problems with rising spells as now immunty is handled on stack level not on hex level
* battleIsImmune in now protected - only used in canCastThisSpellHere
2014-05-19 13:44:38 +04:00
AlexVinS
eff801f39a
Extract "inherit node" function
2014-05-19 02:28:44 +04:00
AlexVinS
2fc16b231f
Implemented inheritance semantic for spell level configuration.
...
This allows more simplification.
2014-05-18 21:16:10 +04:00
AlexVinS
f2b61f7e69
Spell configuration: introduce simplifaction mechanism for level conficuration
...
* also aviable for other handlers
2014-05-18 18:47:18 +04:00
AlexVinS
950ca1156a
Use absoluteLimit
...
* all "old" limits are now absolute
2014-05-18 17:55:26 +04:00
AlexVinS
b6b12ad8f6
Merge and simplify resistance calculation
2014-05-18 17:03:01 +04:00
AlexVinS
7cf64a0628
Made onlyAlive flag a part of TargetInfo
2014-05-18 17:03:01 +04:00
AlexVinS
6bf4140145
Just remove hardcoded targetting for DEATH_RIPPLE & DESTROY_UNDED.
...
It will now affect all creatures (massive, non smart). Immunities are handled separately.
2014-05-18 17:03:01 +04:00
AlexVinS
1431fcedf7
handleSpellCasting: Handle immunity before RESISTANCE. Now immune creatures shouldnt show resisted animation
2014-05-18 17:03:00 +04:00
AlexVinS
d9368ca5ba
Use new battleGetStacksIf method
2014-05-18 17:02:59 +04:00
AlexVinS
0e93ec28c5
Add new general method for battle stack access
2014-05-18 17:02:59 +04:00
DjWarmonger
e074c9b310
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-05-18 09:00:32 +02:00
DjWarmonger
e2d44f6ac6
Fixed #868 - wrong battlefield in ship-to-ship combat
2014-05-18 08:52:03 +02:00
DjWarmonger
9f28e4e4ca
Merge pull request #10 from Macron1Robot/works
...
Bug 0001789 correction (incorrect battle field detection)
2014-05-18 08:26:36 +02:00
Macron1Robot
e4cbfe7f0b
Bug 0001789 correction (incorrect battle field detection)
2014-05-18 03:16:53 +04:00
AlexVinS
5be005ee36
Try to fix #1763 and a small refactoring
2014-05-17 11:24:26 +04:00
DjWarmonger
1ea6723a32
Merge pull request #8 from xyzz/android-rolling
...
Android port.
2014-05-17 05:17:54 +02:00
Ilya Zhuravlev
db7cd79cf7
Android port.
...
Conflicts:
lib/vcmi_endian.h
2014-05-16 23:24:29 +04:00
DjWarmonger
eb337d7407
Fixed #1638 - spells banned in map settings appeared in town guild
2014-05-16 12:15:35 +02:00
Ilya Zhuravlev
3c35b3eefe
Replace defined(linux) with __linux__/__linux/linux in vcmi_endian.h
2014-05-14 09:49:25 +04:00
beegee1
60f6c00f2e
Logging API: - removed unused method declaration - updated comments - ensured thread safety
2014-05-10 21:12:33 +02:00
AlexVinS
3e101d89ef
few formatting. Mostly space-> tab
2014-05-07 03:58:58 +04:00
DjWarmonger
fb5152254d
Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup
...
Conflicts:
client/CKingdomInterface.cpp
2014-05-02 12:03:02 +02:00
Macron1Robot
345df14d60
Update JsonDetail.cpp
...
Replaced new JSON by previous version of JSON comitted by IvanSav and added video file test again
2014-04-30 13:11:04 +04:00
Macron1Robot
9494c6d335
Update JsonDetail.cpp
...
Added video file existence check
2014-04-29 21:53:50 +04:00
