1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Commit Graph

2887 Commits

Author SHA1 Message Date
DjWarmonger
f4ec678b0c Removed unused code. Some properties of artifacts will be generated automatically. 2012-12-07 11:35:57 +00:00
DjWarmonger
cff758cfba Moved artifact-related text to CArtifact class. 2012-12-06 19:03:47 +00:00
alexvins
a6388652d3 [c::b] update projects 2012-12-06 12:16:26 +00:00
Ivan Savenko
cfaa9fd00a - fixed deadlock on visiting such objects like artifacts
- typos in vcmibuilder script
2012-12-05 10:46:53 +00:00
Ivan Savenko
85a23e298c - generic string ID -> numeric ID resolution system
- - hero army and creature upgrade names are resolved using new system
- - faction names and creatures in towns are resolved using new system
- (linux) replaced build_data.sh with hopefully better vcmibuilder script
- minor fixes
2012-12-03 16:00:17 +00:00
Ivan Savenko
c9dd80ea6d - moved json-related functions (e.g. ParseBonus) into JsonUtils namespace
- replaced JsonNode::toStdVector with more universal convertTo
- some renaming in StartInfo
2012-12-02 12:21:44 +00:00
DjWarmonger
ca9033d0e4 - Support for "Enchanted" WoG ability.
- Precision will not be cast on non-shooters
2012-12-01 18:30:03 +00:00
DjWarmonger
c5d9110176 Compile fix for last commit. 2012-12-01 07:17:55 +00:00
Ivan Savenko
2643762f08 Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
DjWarmonger
7be00e97a0 Fixed #1124. Probably also other bugs related to two-hex creatures (or they were already resolved). 2012-11-30 14:06:22 +00:00
DjWarmonger
52242692f1 Fixed #1130.
Moved isToReverse() function to battleCallback so that creature rotation will be handled by core mechanics and not only GUI.
2012-11-29 15:02:55 +00:00
Ivan Savenko
89196c577e autotools compile fix 2012-11-28 09:16:59 +00:00
DjWarmonger
9d68b9d58d Compile fix. Keep StdInc consistent. 2012-11-21 09:13:33 +00:00
beegee1
53169abea7 - Foundation for starting a random map is done - Moved StdInc.h to header file in some /Map and /RMG compilation units(better syntax highlighting, should have no negative impact) 2012-11-20 17:53:45 +00:00
Ivan Savenko
8eba824ada - updated icons + psd file
- better log messages if server failed to open port
 - 1148 should be fixed. Cleanup in CGameHandler::moveHero()
 - compile fixes
2012-11-15 21:29:22 +00:00
DjWarmonger
c54b983663 Some improvements for AI logging. 2012-11-15 10:40:40 +00:00
mateuszb
100dad889a * much better callback function declaration (previous version inspired me to write a new coding guideline) 2012-11-14 21:19:32 +00:00
DjWarmonger
13a5a820d0 - Fixed #1032
- Fixed upgrades not working after recent changes. Now all upgrades will be handled by creature names.
2012-11-14 15:26:33 +00:00
DjWarmonger
a7cea94247 - Hopefully fixed #1103
- Fixed #1137
2012-11-14 14:27:18 +00:00
beegee1
e08db9790b * Map size can be any integer value * Changed new_*; to new_*(); for zero-parameter c-tors (=code convention; stack allocated objects without parantheses as ever to avoid c++ most vexing parse) 2012-11-13 18:01:31 +00:00
DjWarmonger
f5ddc44827 - Compile fix - unique_ptr can't be serialized
- Linking fix - now MapGenOptions have DLL-interface (but probably shouldn't be called directly from client anyway)
2012-11-13 12:55:47 +00:00
Ivan Savenko
f7915d9e61 - removed creature-related code from ModHandler
- new towns can be loaded as mods
 - removed separate DefInfos for towns\capitals
 - a bit simpler handling of adventure map def's
2012-11-13 11:52:23 +00:00
beegee1
c336abcf4a * Added RMG tab to pregame(disabled by default, activate with: enableRMG=true in settings.json) * Fixed tab intendation * Renamed colors to more comprehensible names 2012-11-11 12:23:31 +00:00
Ivan Savenko
0d863c83d7 - removed autogenerated by autotools files
- fixes for #386 using patches from Ixtreon
2012-11-10 21:56:19 +00:00
DjWarmonger
d5aed7c0c7 Compile fix - why would lib headers be dependent on IDE? 2012-11-07 20:14:31 +00:00
beegee1
105083dd70 * Code convention updates * Default values for CMap types * Updated BinaryReader c-tor * Converted "bool" int types to bool in CMap classes * Removed map event operators in favor of member methods 2012-11-06 16:39:29 +00:00
Ivan Savenko
fc85e08a64 - clang and gcc 4.5 compatibility
- autotools update
- debian build system fixes
2012-11-03 19:31:16 +00:00
alexvins
7722682ccb [c::b] update projects 2012-11-03 16:44:50 +00:00
Michał W. Urbańczyk
9707e73eda MSVC compile fixes:
* in projct file some headers were marked as compile objects
* pow(int,int) is ambiguous
* some missing includes
2012-11-03 14:29:54 +00:00
beegee1
a878f5f79a * Separated map loading from the map object * Moved map classes to lib/Map * Renamed map.h/cpp to CMap.h/cpp * Profiling of map loading is now optional * Updated CMemoryStream 2012-11-03 13:30:47 +00:00
Ivan Savenko
2cd774fe42 - gcc 4.5 compatibility 2012-11-02 20:08:37 +00:00
DjWarmonger
347bfde310 Added patch for #1144. Thanks cirdan! 2012-10-27 16:59:24 +00:00
beegee1
720deba838 * Added comments to map.h * Refactoring(renamed attributes, some steps towards coding guidelines, ..) 2012-10-26 17:51:05 +00:00
Ivan Savenko
8604234f8d - fixes for autotools build 2012-10-26 12:57:18 +00:00
beegee1
c05c05962d * Fixed bug #1142 (GCC 4.7.0 and 4.7.1 aren't supported) 2012-10-24 15:29:54 +00:00
beegee1
a3d8ca65fa * Updated RPM spec(see mantis #1142) * Updated linux readme 2012-10-22 16:32:27 +00:00
Ivan Savenko
9f0d3c9944 - compile flags for fuzzylite should not be arch-specific. 2012-10-19 14:30:55 +00:00
beegee1
2a50d8d464 * Fixed battle crash (if they're double wide creatures) 2012-10-19 13:16:14 +00:00
Ivan Savenko
fcc66b7bb9 - fixed RPATH in cmake
- minor fixes
2012-10-08 15:21:59 +00:00
Ivan Savenko
db10f512d5 - game won't crash on missing dwellings (instead random one will generated)
- added disabled code that can be used to fix buildings blit order
- minor fixes
2012-10-07 14:58:48 +00:00
alexvins
b3f317c1ed fix to prev. commit 2012-10-07 10:38:35 +00:00
alexvins
ff3da291a1 [refactor] reduce some code duplication. no functional changes 2012-10-06 20:35:04 +00:00
beegee1
3f0c225880 * Fixed building, installing on Fedora * Updated RPM spec 2012-10-06 16:09:20 +00:00
alexvins
2942e2e824 [c::b] update projects
-boost::iostreams
*link with release boost libs always
2012-10-06 15:12:07 +00:00
Ivan Savenko
da7a6234b1 - some tweaks towards new towns
- it is possible for faction to have 0 available heroes
2012-10-06 08:47:13 +00:00
Ivan Savenko
9f0441a0be - adventure map defs are now part of town config. Should be the last part
- possibly fixed #1136
2012-10-05 19:57:28 +00:00
Ivan Savenko
c071a03a8a - fix for #1135
- merged wall_pos.json into town config
- removed tower_shooter field from creatures.json
2012-10-05 18:03:49 +00:00
Ivan Savenko
306d64b0c4 - it is possible to read json file with vector
- town configuration:
- - all town-related texts are now in TownHandler
- - alignments are now part of faction
- - removed CTown::bonus field
2012-10-05 13:11:26 +00:00
Ivan Savenko
f113f9573d - CPack support. Works on my side, needs tweaks for Win 2012-10-05 12:38:17 +00:00
DjWarmonger
b3acde24d5 Fixed #1131 - AI will use subterranean gate for exploration 2012-10-04 10:17:51 +00:00