games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity
2,901 Commits 21 Branches 61 Tags 104 MiB
afe3f77a59
Commit Graph

2901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger
afe3f77a59 Fixed Artifact parser. Check http://forum.vcmi.eu/viewtopic.php?p=7889#7889 for example mod. 2012-12-14 08:37:46 +00:00
alexvins
a8175c13bd fix to prev. revision 2012-12-13 15:38:04 +00:00
DjWarmonger
62a281a665 Complete parsing for new Artifacts. iconIndex needs to be handled. 
Otherwise, they are ready for test.
 2012-12-13 14:27:33 +00:00
Ivan Savenko
23fcdd1a4a - missing fields in town serialization 2012-12-13 13:07:56 +00:00
DjWarmonger
71cbde7bbc Bonus limiters are now implemented using Decorator design pattern, which allows to chain them. 2012-12-13 10:49:12 +00:00
Ivan Savenko
a1c7beeb83 cmake fix 2012-12-12 15:13:26 +00:00
Ivan Savenko
ec8e078ef8 - fixed out of sync hero armies 
- one more crash in garrison
 2012-12-12 14:52:42 +00:00
Ivan Savenko
72ea5e4ac9 - fixed crash in AI logging (objID is object index, not hero ID) 2012-12-12 13:32:37 +00:00
Ivan Savenko
ca4f53aea1 - some fixes for garrisons (crashfix and correct behaviour of split button) 2012-12-12 12:03:02 +00:00
Ivan Savenko
04358ed0c6 multiple changes in config system, breaks existing mods. See upcoming post on forums. 
- filesystem initialization works in conjuction with modHandler
- (config) split buildings.json in multiple files in "factions" directory
- (mods) merged filesystem.json and config/mod.json into mod.json
 2012-12-12 11:13:57 +00:00
Ivan Savenko
e3231db1c9 - primaryResource and warMachine now use string ID 
- fixed long delays on moving units in garrisons
- fixed bug on loading available spells from map
- removed unused bigImgs from Graphics
 2012-12-11 12:12:46 +00:00
Ivan Savenko
16b72ee89b minor: 
- siege tower shooters use string ID's
- cmake will install vcmibuilder with correct permissions
- vcmibuilder will not extract outdated config files from core.zip
 2012-12-10 20:08:00 +00:00
Ivan Savenko
1c5a4c669c - merged minimap.json into terrains.json 
- removed no longer used fields from Graphics + portraits.json
 - work on pregame:
 - - new code for map options window icons + popups
 - - fixed bugs related to new towns
 - - less hardcoded magic numbers
 2012-12-10 14:28:27 +00:00
DjWarmonger
730cbd930a Parsing for new artifact format: http://wiki.vcmi.eu/index.php?title=Artifact_Format 
Not finished, not tested.
 2012-12-10 13:55:54 +00:00
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