games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity
3,928 Commits 22 Branches 61 Tags 102 MiB
f01e30a3b1
Commit Graph

3928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ivan Savenko
bac83d8bd0 Compatiblity for last version of Cove (and likely any other town mods) 2014-06-27 00:07:09 +03:00
Ivan Savenko
20b0dd6211 Renamed readme to readme.md to enable formatting in github UI 2014-06-26 21:23:00 +03: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
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
AlexVinS
46d92f11cb Project update, fix build 
(!) register types as usual too huge
 2014-06-23 10:24:49 +04:00
Ivan Savenko
1921bd22d6 Fixed banks config 2014-06-22 17:39:56 +03:00
Ivan Savenko
c605e2d10c Gcc compile & warning fixes 2014-06-22 17:26:08 +03:00
DjWarmonger
3ac306f501 Merge pull request #19 from vcmi/feature/mapObjects 
Feature/map objects
 2014-06-22 14:49:42 +02: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
DjWarmonger
60df94a3f5 Placing towns according to template. 2014-06-15 21:23:53 +02:00
DjWarmonger
8e66b7168a Corrected paths & guard for large objects. 2014-06-15 19:56:58 +02: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
DjWarmonger
e56f41b8be Fixed monster strength selection. 2014-06-15 12:00:34 +02:00
DjWarmonger
01355a77d8 Added "monster strength" info to templates. 2014-06-15 11:08:06 +02:00
DjWarmonger
5c431da0f9 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-15 10:01:18 +02:00
DjWarmonger
890f29fa7e Improved guard placement for large objects. 2014-06-15 09:39:30 +02:00
DjWarmonger
aa54803c50 Refactoring, clearing logs. 2014-06-15 08:48:46 +02:00
DjWarmonger
79da7b92ce Templates now contain info about mines. 2014-06-14 20:05:19 +02: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
DjWarmonger
93b44de63c Handling "terrain type" and "match terrain to town" options. 2014-06-14 17:14:59 +02:00
Ivan Savenko
216ce3f588 Merge pull request #18 from Haryaalcar/develop 
Fix for "0001766: Disassembling artifacts in hero and hero meeting screen doesn't work."
 2014-06-14 17:50:38 +03:00
Haryaalcar
fee9f0c1a0 "0001766: Disassembling artifacts in hero and hero meeting screen doesn't work." fix 2014-06-14 16:52:30 +03:00
DjWarmonger
6cbcfbf0a9 Sealed-off treasure piles will be discarded and filled with obstacles. 2014-06-13 12:04:17 +02:00
DjWarmonger
edd46d87c1 Treasure pile entrance/guard will always be aimed at the center of the zone. 2014-06-13 08:00:26 +02:00
DjWarmonger
2c1001f8e0 Making sure that treasure piles and other objects will always be accessible from the center of zone. 2014-06-12 21:51:16 +02:00
DjWarmonger
236b3ec807 Zones will get random network of passable paths inside them. Treasures will try to fill all remaining fields. 2014-06-12 21:10:43 +02:00
DjWarmonger
e468e8453b Merge pull request #17 from Haryaalcar/develop 
sorting by filename implemented for save and load screens
 2014-06-11 13:10:28 +02:00