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
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
383280f72a
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 18:26:43 +02: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
DjWarmonger
57fa905a2b
Something that compiles.
2014-06-26 22:05:27 +02:00
DjWarmonger
e51e2190fd
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-26 20:12:37 +02: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
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
4e4ba6654c
fix Eye of magi, also fix #1608
...
Conflicts:
lib/CObjectHandler.cpp
2014-06-24 18:20:28 +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
AlexVinS
46d92f11cb
Project update, fix build
...
(!) register types as usual too huge
2014-06-23 10:24:49 +04:00
Ivan Savenko
c605e2d10c
Gcc compile & warning fixes
2014-06-22 17:26:08 +03:00
Ivan Savenko
ab475195ac
Banks now use new scheme as well
...
- Implemented Bank Constructor object.
- Merged Pyramid object into common Bank class. Banks can now grant
spells as part of their reward.
- Move bank config code to config/objects/creatureBanks.json. Note: WoG
banks are not updated yet, should be moved to WoG mod.
- Updated AI code so it can correctly evaluate bank danger (should be
generic enough for use with other objects)
- New files JsonRandom.* that contain routines for loading random
objects from Json (still WiP but should be stable)
2014-06-22 13:39:40 +03:00
Ivan Savenko
0a71e89f58
Created large number of missing objects in configs
...
Minor bugfixes in code
2014-06-17 14:57:47 +03:00
Ivan Savenko
09d595e385
- Implemented "mapObject" entry for hero classes
...
- Updated schemas
- Some bugfixing
2014-06-16 19:27:26 +03:00
Ivan Savenko
89b89ff85d
Bugfixing. Game seems to be working without major bugs.
2014-06-15 23:25:10 +03:00
Ivan Savenko
836c466f81
- Implementation of overrides for towns
...
- Converted dwellings.json into new format
- Implemented "mapObject" entry in town format
- Removed capital/fort/village fields from town in favor of overrides
2014-06-15 19:43:01 +03:00
Ivan Savenko
7cfd9a0903
First part of implementation of some type-specific handlers.
...
TODO:
- merge dwellings.json into object configs
- proper implementation of overrides for towns
- fully connect new API to RMG/H3M
2014-06-14 18:42:13 +03:00
Ivan Savenko
44742814cd
More cleanup:
...
- moved SoundBase.h to lib since it contains shared data
- added RMG info to object format. Note that data is not yet imported in
configs
- slightly updated API of object handlers
2014-06-05 23:51:24 +03:00
Ivan Savenko
b2e8c92383
Cleanup:
...
- removed commented-out #includ'es
- renamed some files to match name of class
2014-06-05 20:26:50 +03:00
Ivan Savenko
76bf5351c6
Line endings are now unix-style
2014-06-05 19:57:43 +03:00
Ivan Savenko
652ceb2bde
Finally shattered CObjectHandler.cpp into tiny bits
...
- This file is now split into multiple smaller files in mapObjects
directory
- CObjectHandler itself now contains only core classes (Handler itself,
CGObject and interfaces)
- Cleaned up excessive #include's through whole project
2014-06-05 19:52:14 +03:00
Ivan Savenko
0afdfa529c
Moved all object-related files to lib/mapObjects directory.
...
Renamed some classes to more readable names
2014-06-05 14:19:47 +03:00