Ivan Savenko
c956b3f02a
Fixed #1820 , better detection of object below cursor that uses same logic as renderer
2014-07-01 17:19:08 +03:00
DjWarmonger
bae9f2083f
Workaround for hero & town issue. Game still crashes elsewhere, though.
2014-07-01 12:07:53 +02:00
DjWarmonger
dc98f14884
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-07-01 09:13:42 +02:00
DjWarmonger
bf567c9e50
Fixed crash caused by hiding tiles around AI heroes.
2014-07-01 09:13:19 +02:00
DjWarmonger
54390ea81c
Merge branch 'develop' into RMG
2014-07-01 08:25:53 +02:00
DjWarmonger
e3303326fc
Merge branch 'develop' into RMG
2014-07-01 07:52:58 +02:00
DjWarmonger
bda71bed83
Uploading misc tweaks.
2014-07-01 07:07:40 +02:00
Ivan Savenko
db221829aa
Modding-related bugfixes:
...
- hero classes will be loaded correctly
- objects without index will have correctly assigned ID's
2014-06-30 17:13:01 +03:00
AlexVinS
50dfe05cd1
[C::B] Small projects fix
2014-06-30 11:19:55 +04:00
DjWarmonger
a556ef64e9
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-30 06:45:35 +02:00
Ivan Savenko
a1fff864e6
Fixed missing names for dwellings and creature banks
2014-06-30 00:16:45 +03:00
Ivan Savenko
f01ab0d48f
Fixed rest of reported on forums bugs in rewardables
2014-06-29 20:13:25 +03:00
Ivan Savenko
1157111fcf
More bugfixing:
...
- Fixed compile in VCAI (precompiled headers should not include VCMI headers)
- Fixed crash on visiting observatories, including shroud of darkness
2014-06-29 17:23:06 +03:00
DjWarmonger
7dbe2f5c40
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-28 16:31:06 +02:00
Ivan Savenko
917b1ffca8
Bugfixing:
...
- Added missing types for serialization
- Fixed possible crash in removable objects (campfire)
- Fixed typo in bank config
2014-06-28 17:21:38 +03:00
DjWarmonger
920f56969b
Create random obstacles that match terrain.
2014-06-28 09:46:32 +02:00
DjWarmonger
7aa8213cd5
Tweaked templates to allow all map sizes.
...
To be released as 0.95c.
2014-06-27 21:48:17 +02:00
DjWarmonger
90b72a7856
Workaround with Obelisks. Kill me later.
2014-06-27 20:28:21 +02:00
DjWarmonger
05d172ccb8
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 20:07:08 +02:00
Ivan Savenko
0f5826802d
Defined templates for objects with incorrect info in objects.txt:
...
- random arts
- random resources
- random creatures
- spell scroll
2014-06-27 20:36:50 +03:00
DjWarmonger
383280f72a
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 18:26:43 +02:00
Ivan Savenko
52b17334a0
Added object for scrolls and hero placeholders. Typo fix
2014-06-27 19:15:47 +03:00
Ivan Savenko
f01e30a3b1
Added random objects to configs. For now as separate "random handlers", should be merged into main handlers later
2014-06-27 19:15:47 +03:00
AlexVinS
f63b1256d3
[ERM] Fix build
...
* update project
2014-06-27 12:12:45 +04:00
DjWarmonger
ccb475b699
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 06:24:05 +02:00
Ivan Savenko
bac83d8bd0
Compatiblity for last version of Cove (and likely any other town mods)
2014-06-27 00:07:09 +03:00
DjWarmonger
57fa905a2b
Something that compiles.
2014-06-26 22:05:27 +02:00
Ivan Savenko
20b0dd6211
Renamed readme to readme.md to enable formatting in github UI
2014-06-26 21:23:00 +03:00
DjWarmonger
e51e2190fd
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-26 20:12:37 +02:00
AlexVinS
aea5a7ba75
add comment. no code changes.
2014-06-26 20:49:18 +04:00
AlexVinS
c28b5f6633
fix mingw build
2014-06-26 20:41:27 +04:00
Ivan Savenko
00b6232ff6
Replaced usage of DLL_LINKAGE with ELF_VISIBILITY in netpacks. Please make sure that compilation now works on all platforms
2014-06-26 18:34:54 +03:00
Ivan Savenko
af1ce59ab4
Fixed path to header in ERM module
2014-06-26 18:16:16 +03:00
Ivan Savenko
94e661b2bf
Merge pull request #20 from Haryaalcar/develop
...
build fixes for mac os
2014-06-26 16:31:50 +03:00
Haryaalcar
88122ee253
another build fix:
...
Undefined symbols for architecture x86_64:
"operator<<(std::__1::basic_ostream<char, std::__1::char_traits<char> >&, EVictoryLossCheckResult const&)
2014-06-26 02:19:10 +03:00
Haryaalcar
ce6940e272
build fix for mac os:
...
1) type_info visibility for CatapultAttack
2) using IObjectInfo::CArmyStructure in min_element : operator< should be const
2014-06-26 01:24:48 +03:00
Ivan Savenko
955552488e
- H3M parser will create objects that don't have data in map file via
...
object handler.
- Added large number of missing objects to config
2014-06-25 20:26:47 +03:00
Ivan Savenko
32240da34e
Reduced number of #include's in headers. May break compilation on Win
...
since some net packs now need DLL_LINKAGE
2014-06-25 17:11:07 +03:00
Ivan Savenko
3b0ecee678
Ugly workaround for DLL_LINKAGE issue. Should be removed once I figure
...
out what's triggering it.
2014-06-25 00:37:33 +03:00
Ivan Savenko
6e3eaeee21
Minor fix to schema, server will print visited objects in debug log
2014-06-25 00:23:56 +03:00
Ivan Savenko
a0689fa377
Refactoring of hoverText from objects:
...
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
2014-06-24 20:39:47 +03:00
Ivan Savenko
ad632d1e8a
Moved FoW management from CGObjectInstance to callback
2014-06-24 20:39:47 +03:00
Ivan Savenko
5ebc0e8614
First part of object instance API cleanup
...
- removed passability() method in favour of passableFor(PlayerColor)
- moved operator < code to map handler
- updated class documentation
2014-06-24 20:39:47 +03:00
AlexVinS
c7dc4c05b8
fix mingw build
...
(?) does this brake *nix build?
2014-06-24 18:17:25 +04:00
Ivan Savenko
13bc4cb24f
Added -fvisibility=hidden parameter for gcc.
...
Should help a bit with endless missing DLL_LINKAGE attributes and
(according to gcc docs) help a bit with library loading times.
2014-06-24 00:05:53 +03:00
DjWarmonger
79036484dd
Trying to sort out project changes and compile issues.
2014-06-23 19:58:19 +02:00
Ivan Savenko
db49798b4d
Fixed random artifact selection
2014-06-23 20:47:09 +03:00
Ivan Savenko
7c52db923a
Removed mods compatibility code from 0.95
2014-06-23 20:47:09 +03:00
Ivan Savenko
06d17f709d
fixed compatibility code for resource-granting buildings
2014-06-23 20:47:09 +03:00
Ivan Savenko
47639832b1
Probably fixed bug with map border rendering in rectangular maps
2014-06-23 20:47:09 +03:00