games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity
3,352 Commits 22 Branches 65 Tags
Commit Graph

1559 Commits

Author SHA1 Message Date
Ivan Savenko
62e99a1ae5 - basic loading screen, no progress bar 
- startGame() call will run in separate thread if loading screen is used (looks OK so far)
 2012-12-17 18:01:17 +00:00
Ivan Savenko
ff146a80fe - fixed empty tavern in new towns 
- by default new heroes\new towns will be enabled on maps (no effect without mods)
 2012-12-17 12:55:29 +00:00
Ivan Savenko
e36bc50504 - support for new heroes and hero classes 
- moved hero-specific data from text handler to CHero
- moved hero classes-specific data into heroClasses.json
 2012-12-16 13:47:53 +00:00
Ivan Savenko
c764ce6ebe - one more unitialized memory crash (#1163) 
- minor tweaks for hero handler
 2012-12-15 13:40:22 +00:00
DjWarmonger
f05b398e5c Compile fixes. 2012-12-15 09:04:55 +00:00
Ivan Savenko
d2ee602b29 - fix uninitialized cursor 
- stubs for loading heroes and classes from mods (no real code yet)
- heroes loading uses string IDs for secondary skills, some cleanup in HeroHandler
 2012-12-15 08:47:02 +00:00
Ivan Savenko
423a226e31 OS X patch from stopiccot 2012-12-15 07:24:25 +00:00
Ivan Savenko
e695f1ad63 - fixed slow hero screen (not specific to it, but most notable here) 
- fixed some bugs related to animation (cove buildings mostly)
 2012-12-14 19:47:38 +00:00
Ivan Savenko
ffe8b99369 - reorganized hero classes 
- artifact iconIndex should work
- new file with hardcoded string constants: lib/StringConstants.h

Note: some minor bugs, will fix soon:
- slow to open hero window
- hero adventure map images serialization is broken\incorrect
 2012-12-14 15:32:53 +00:00
Ivan Savenko
23fcdd1a4a - missing fields in town serialization 2012-12-13 13:07:56 +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
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
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
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
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
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
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
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
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
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
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
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
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
4bacd97497 Quests now handled by pointers again, this time without bugs. 
Fixed some issues with quests and AI.
 2012-10-03 14:49:29 +00:00
Ivan Savenko
3542bfdc63 - fixed #1128 #1127 #1121 #1119 
- instructions in linux readme use cmake instead of autotools
- update autoconf files
 2012-10-02 14:22:58 +00:00
Ivan Savenko
42cbbc8682 - linux version update 2012-10-01 07:05:12 +00:00
mateuszb
099e6bf776 * implemented #1111 2012-09-30 12:19:14 +00:00
Ivan Savenko
07f9cb16c5 - spellbook fix (#1110) 
- possible fix for kingdom overview (#1109)
- tweaks for recruit window (part of #1113)
 2012-09-30 10:35:17 +00:00
Ivan Savenko
77710eaffb - fix for #1106 and #1107 2012-09-29 19:18:35 +00:00
mateuszb
657ed41088 * fixed bug in campaigns 
* turned off artifacts.json creation
* minor changes
 2012-09-29 17:36:48 +00:00
Ivan Savenko
b1557bc6c4 - fixes #1105 
- minor improvement to resolution selection dialog
- removed (hopefully) all cases where neutral faction uses id -1
 2012-09-29 15:10:56 +00:00