games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-10 00:43:59 +02:00
Code Issues Releases Activity
4,025 Commits 21 Branches 64 Tags 117 MiB
476c7c32dc
Commit Graph

1959 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
6a88604937 * fixed crash related to cammander's SPELL_AFTER_ATTACK spell id not initialized properly (text id was resolved on copy of bonus) 
* fixed duels, added no-GUI mode for automatic AI testing
* minor things
 2013-06-17 15:45:55 +00:00
Ivan Savenko
870399c7be - updated link to repo in readme 
- image loader will report last SDL error if loading failed
- fixed parsing of floats from H3 txt's
 2013-06-09 10:09:28 +00:00
Ivan Savenko
0c5a717e08 - fixed crash in town after loading #1291 + extra check just in case. 
- disabled intro menu animation for now - different position in different versions (WoG, SoD)
- removed no longer needed entry for Linux video from filesystem
 2013-06-02 18:57:58 +00:00
Michał W. Urbańczyk
1d46db6a57 Post-release version bump. 2013-06-01 20:19:03 +00:00
Michał W. Urbańczyk
f19e41d38c Fixed #1269. 
Version set to 0.93.
 2013-05-31 22:23:53 +00:00
Ivan Savenko
1c0ccd2b02 - fixed some bugs with artifacts icons 2013-05-31 11:46:19 +00:00
Ivan Savenko
4724ccbb45 - fixes #1276 
- minor fix to json arrays merging
- fixed update of growth icons on town screen
 2013-05-30 18:43:45 +00:00
Ivan Savenko
3943c10f1a fixes #1237 - if server savegame entry is missing it will be created in "update mode". 2013-05-30 16:25:00 +00:00
Michał W. Urbańczyk
1e8e932323 Logging around #1237. Typos. 2013-05-30 12:14:39 +00:00
Michał W. Urbańczyk
608a080971 Partial support for serializing std::shared_ptr. Should fix #1281. 2013-05-30 10:44:39 +00:00
Ivan Savenko
4cc28d5e91 compile fix 2013-05-29 08:14:01 +00:00
Michał W. Urbańczyk
11bcc48cc3 Version bump 0.92c. Fixed #1268. Split a few mehods from CGameState::init. 2013-05-28 22:47:15 +00:00
Michał W. Urbańczyk
9f5d1ba623 Fixed #1271. 2013-05-27 21:46:04 +00:00
Ivan Savenko
b01637840a - compile fixes 
- fixed building in towns after loading (partial #1272)
 2013-05-27 14:20:46 +00:00
Michał W. Urbańczyk
79026bdfde Introduced strongly typed QueryID. 
Exchange between heroes is now a proper first-class query. Fixes #1269. #66 should also be finally fully fixed.
VC projects: /Zm flag to fix compilation issues with recent Boost.
 2013-05-27 10:53:28 +00:00
DjWarmonger
c9e95f76df - Fixed Phoenix fire immunity. Again. 
- Cheat code with grant all artifacts, including the ones added by mods
- Some clean-up of Berserk effect, however it doesn't work at the moment.
 2013-05-25 07:06:00 +00:00
Ivan Savenko
dca8e9fa6f - removed access to one wog file 
- removed way to avoid dependency checking in identifiers resolution
- minor fixes
 2013-05-21 22:11:44 +00:00
beegee1
56534bc3fb - Bug fix to previous commit 2013-05-21 19:26:31 +00:00
beegee1
5328beb8e7 - Fixed some bugs when starting a RMG map - Checks if there is a template for the chosen options(rejects if not) - Added a few templates for development(2 to 4 players, medium maps are supported) - Refactoring 2013-05-21 19:08:06 +00:00
Michał W. Urbańczyk
c920f29c45 More missing serialization items. 2013-05-20 17:25:19 +00:00
Michał W. Urbańczyk
096e1230ce That needs to be serialized. 2013-05-20 08:37:31 +00:00
Michał W. Urbańczyk
c85829a00c * creature window prints morale/luck for actual stack in battle (CStack), not stack as seen in hero screen (CStackInstance), fixes #1264 
* creature abilities bonus properties are updated when the creature id is assigned
* removed decrease morale ability from config file (it was duplicating the one from ZCRTRAIT.TXT
 2013-05-19 19:53:03 +00:00
Michał W. Urbańczyk
fc6e72dc75 * Fixed enchantments (#1265). Their effects were not properly added when reading config. Battle interface will be little less likely to block itself after corrupted spell cast. 
* Fail gracefully when the file from which game is started is in invalid version.
* Bumped versions.
 2013-05-19 15:14:23 +00:00
Michał W. Urbańczyk
be7c2bd07f CGHeroInstance* can be serialized over network even when hero has been defeated. Strongly typed hero type ID introduced. 
Should fix #1260.
 2013-05-18 22:30:48 +00:00
Michał W. Urbańczyk
f95e6c233b It is possible to set on visit query that object is to be removed after visit is over. 
Fixes #1263.
 2013-05-14 13:42:52 +00:00
beegee1
42c2c29976 - Added support for RMG templates(subset of OH3) - Added template "Small Ring" for testing 2013-05-11 17:36:11 +00:00
Michał W. Urbańczyk
5c2473d436 Support for saving/loading in player interfaces, including VCAI. 
Minor changes.
 2013-05-09 11:09:23 +00:00
Michał W. Urbańczyk
5de00c752c VC project updated. 2013-05-05 12:21:50 +00:00
Ivan Savenko
b3bbe27089 - ignore wog maps if wog is not present 2013-05-04 19:20:32 +00:00
Ivan Savenko
8be801a6dc - CMappedFileLoader class to remap WoG files to h3 names 
- WoG should be optional, all remapped files are listed in WoG/config/wogFileOverrides.json
- fixed several cases of incorrect positioning of creatures in battles
- some missing sounds for battle effects
- negative luck support, disabled by default
- a bit hackish detection of WoG presence, VCMI should work on SoD-only installs
 2013-05-04 13:14:23 +00:00
beegee1
298f862d86 - Implemented updating additional terrain types fully(including 2 special cases) 2013-05-03 10:15:59 +00:00
beegee1
3358a8efec - Added terrain & object selection classes - Added CComposedOperation - Refactored clear terrain, it is now an operation - Added rough support for updating terrain type if required 2013-04-29 15:51:39 +00:00
Ivan Savenko
b20f8fd3d4 - fixed uninitialized access into modHander 
- fixed  #389
 2013-04-28 15:06:14 +00:00
DjWarmonger
a7ed3ee3d0 Fixed #987 2013-04-27 08:11:20 +00:00
DjWarmonger
32c87f532f - Added missing abilities for devil & ghost dragon 
- Stack affected by Berserk should not try to attack itself

Neither of these can be actually seen in game duo to more general engine bugs :/
 2013-04-27 06:39:59 +00:00
beegee1
0f7d175896 - Fixed all unit test failures and a few more bugs - Simplified view generation algorithm 2013-04-26 15:57:47 +00:00
Ivan Savenko
ecb644fce4 - fix to last commit 2013-04-26 07:40:46 +00:00
Ivan Savenko
8297102350 - some groundwork for wog optionality 
- moved wog artifacts to wog mod
 2013-04-25 21:50:55 +00:00
beegee1
23f7be2a54 - Fixed a few bugs related to the terrain view generation - Updated CMakeLists in /test(copy resources if no source files has been changed too) 2013-04-25 16:09:48 +00:00
Ivan Savenko
8273f323b1 - it is possible to edit data of another mod or H3 data via mods 
- mods can access only ID's from dependenies, virtual "core" mod and itself (optional for some mods compatibility)
- metadata field for JsonNode, used to track source mod
- moved wog creatures into wog mod
- (linux) convertMP3 option for vcmibuilder for systems where SDL_Mixer can't play mp3's
 2013-04-25 14:03:35 +00:00
Michał W. Urbańczyk
be6aff5173 VC11 compile fix. 2013-04-25 08:22:04 +00:00
DjWarmonger
57ea1ed1b8 Fixed crash at month of double population. 
doublingCreatures vector was never properly initialized.
 2013-04-23 17:29:16 +00:00
DjWarmonger
0dc5a13596 Fixed missing spell effects, root cause of #1257. 2013-04-23 09:54:57 +00:00
Ivan Savenko
e71bace8e3 - fixed crash on missing icons 
- proper ID resolution for secondary skills to avoid #1258
 2013-04-23 09:16:20 +00:00
Ivan Savenko
3285f1910b - finally, solution for imageIndex fields. All image lists will be generated in runtime 
- iconIndex fields from json are no longer used
- simple check for missing icons on startup
 2013-04-22 19:51:22 +00:00
beegee1
7a3f5dc23b - Replaced exceptions with assert for internal-API code 2013-04-22 16:04:17 +00:00
beegee1
8d82c49a99 - Compile fix - Renamed map operations 2013-04-22 15:08:04 +00:00
beegee1
dd78205ce8 -Added test subfolder and updated CMakeLists for unit testing - Added a test case for the DrawTerrainOperation class(does not pass all tests successfully, 6 failures left to fix) - Fixed a few bugs 2013-04-22 14:49:28 +00:00
DjWarmonger
a9cfb4bddb Refactoring, fixed #1255 2013-04-22 13:23:53 +00:00
Ivan Savenko
d88caec82c - fixes to previous commits 2013-04-21 17:06:24 +00:00
Ivan Savenko
4db13ba845 - proper destructors for handlers and lib objects 2013-04-21 16:38:31 +00:00
Ivan Savenko
2ea1051395 - fixed uninitialized pointer 2013-04-21 14:08:46 +00:00
Ivan Savenko
c6cc6e6301 Large changeset, first part of editing H3 objects via mods feature. Changes: 
- loading of all objects (including H3 objects) will be directed by mod handlers
- common base for all handlers accessible from mod system (IHanderBase)
- json format changes: use struct with string ID's instead of vector

- fixed some gcc/clang errors and warnings
- fixed several cases of memory leaks and invalid memory access (mostly related to usage of bonus system and/or identifiers resolution)

Note that right now loading is much slower than before due to excessive json validation (or not fast enough validator)
 2013-04-21 12:49:26 +00:00
Michał W. Urbańczyk
d30571aa4d AI won't access enemy heroes' objects that went under FoW. Fixes #1235. 2013-04-21 12:11:13 +00:00
Michał W. Urbańczyk
d1d67caa0b Get rid of some old serialization workaround code that is not needed because serializer was improved in the meantime. 
Fixing #1254.
Fixed possible race causing corruption of the server savegame.
 2013-04-20 18:44:55 +00:00
DjWarmonger
87988b0ae7 Compile fixes for MVS2010 2013-04-20 16:01:58 +00:00
Michał W. Urbańczyk
e8354908c3 Big change: Introduced new mechanism to handle queries. It should not cause any visible changes ATM apart from fixing several long-standing bugs realted to handling post-visit/battle/levelup callback, including infamous creature bank issues: #955, #1053, #1063, #1191. Needs testing. 
Minor changes:
* default log level set to trace
* LOG_TRACE raii guardian lifetime will last till the end of block
* compile fixes
* minor refactorings
 2013-04-20 11:34:01 +00:00
stopiccot
1fca335a2c Be careful with global var initialization order. All mutexes should be initialized before all CLoggers. Caused a crash on OS X when compiling with clang 2013-04-19 12:26:57 +00:00
beegee1
03c2aa9153 - Refactored CMapEditManager(added structure for undo functionality) - Refactored CMap(terrain pointer is private, safe access via getTile) 2013-04-19 11:43:11 +00:00
Ivan Savenko
857274a670 gcc compile fix 2013-04-18 07:55:57 +00:00
Michał W. Urbańczyk
850f47261d ID should be always outputted as number (not char). 2013-04-17 19:09:54 +00:00
beegee1
45fccfb1a6 - Added new trace macro LOG_TRACE which autom. appends leaving func message - Removed old trace macros - Small refactoring in CMapEditManager - Changed documentation comments to /// style for various mapping header files 2013-04-16 13:16:58 +00:00
beegee1
feea589648 - Bug-fixing for last commit - Moved CMapGenOptions to CMapGenerator 2013-04-15 17:18:04 +00:00
beegee1
44bde4a1d3 - Fixed indentation for various files, sorry... 2013-04-14 19:24:31 +00:00
beegee1
c10266ed97 - Reduced complexity to use the CMapGenerator(simpler interface) - Removed h3m.txt and tchar_amigaos4.h 2013-04-14 18:52:05 +00:00
beegee1
b1428bcd24 - Compile fix for editor - Renamed /Editor to /editor and Scripting/ERM to scripting/erm - Removed unused ipch folder and format file - Removed ancient lua folder 2013-04-13 11:07:32 +00:00
Ivan Savenko
2d89e643c6 - some optimizations to validator - should be a bit faster now 2013-04-12 20:49:02 +00:00
Ivan Savenko
0cf969d508 - console logger by default uses same format as previously (no extra data) 
- a lot of changes in configs;
- - update to creature format - abilities are now json structure
- - multiple bugfixes revealed by validation
- made schemas a bit more strict
- creatures data can be replaced via mods
- it is possible to validate vcmi configs using schemas (disabled)
 2013-04-11 19:24:14 +00:00
beegee1
f10ba48c77 - Fully integrated new logging API(ERM, Editor, missing parts) - Removed old logger 2013-04-11 15:58:01 +00:00
DjWarmonger
928dc23003 Compile fix. 2013-04-11 13:33:59 +00:00
Michał W. Urbańczyk
f42cfa6f43 MSVC compile fixes: 
1) Names of compile units need to be unique, renamed the new CLogget.cpp to CNewLogger.cpp. (at least till the old CLogger is gone)
2) Fixes for project files (a few includes were marked as compile items).
 2013-04-11 01:05:51 +00:00
beegee1
6827fcdb53 - Integrated the logging API into the server project - Simplified CBasicLogConfigurator usage(exception handling, logging, log file appending) 2013-04-10 17:18:01 +00:00
beegee1
abf96a5b66 - Integrated the logging API into the AI subprojects - Added macros for tracing the control flow - Added methods isDebug/TraceEnabled for performance-critical sections 2013-04-10 16:28:14 +00:00
beegee1
c7c2686379 - Integrated the logging API into the client and the lib - Remove some more comments and switched to /// style - Fixed recursive locks - Added Global.h to CMakeLists(now visible in qt-creator) - Removed usage of shared_mutex - Added unique_ptr to CLogger targets 2013-04-09 14:31:36 +00:00
beegee1
ee51c5beb5 - Renamed /lib subfolders to lowercase 2013-04-07 10:48:07 +00:00
beegee1
89ad007b44 - Renamed Logging to logging 2013-04-07 10:30:01 +00:00
beegee1
b82f232e50 - Moved the private part of the logging API to CLogger.h/.cpp 2013-04-07 10:17:55 +00:00
beegee1
1bb79ed187 - Removed some documentation comments 2013-04-06 18:34:06 +00:00
beegee1
de01ea54b0 - Added stream-like logging - Schema refactoring 2013-04-06 17:45:02 +00:00
Ivan Savenko
0d3ec3c6da clang compile\warning fixes 2013-04-05 21:27:24 +00:00
beegee1
0baa261dfc - Implemented the new logging API(not used currently) - Added lock typedefs to Global.h - Some layout updates to Global.h 2013-04-05 10:29:46 +00:00
Ivan Savenko
619a07da03 - projectile blitting should be closer to original H3. But still not perfect. 
- removed no longer needed field "projectile spins"
 2013-04-04 13:18:38 +00:00
Ivan Savenko
52e56693ea - fixed handling of incorrect configuration in settings.json 
- more compact schema for siege node
 2013-04-03 13:39:46 +00:00
Ivan Savenko
0307639c32 properly initialize settings when configuration was not found 2013-04-02 21:39:32 +00:00
Ivan Savenko
c927913f5f - Improved json validation. Now it support most of features from latest json schema draft 
- Set of schemas in config/schemas directory that are used to validate input from mods.
 2013-04-02 17:06:43 +00:00
DjWarmonger
c8bb363a45 Fixed Death Stare of Commanders, additional tweaks. 2013-03-30 20:09:50 +00:00
Ivan Savenko
a9fe9e9e8b - fixed #1229 and #1245 2013-03-29 19:15:52 +00:00
Ivan Savenko
8f998b009b - fixed 1247 2013-03-23 16:19:27 +00:00
Ivan Savenko
c4c592b773 - bugfixing: #1243, #1227, #1241, #1236, #1233 2013-03-14 20:44:00 +00:00
alexvins
ff1c224a97 Few more cleanup 2013-03-14 17:56:52 +00:00
alexvins
f686edc1b8 Cleanup 
* simplify JSON values getting
* ensure initialization of Bonus fields
 2013-03-14 17:21:16 +00:00
alexvins
9e7fe4d011 Fix duplication in zcrtraits load 2013-03-14 11:39:29 +00:00
Ivan Savenko
5082dafd62 - h3 hero classes and artifacts can be modified via json 
- commander artifacts are now merged into main artifacts.json, todo - split 2.5k file into something manageable
 2013-03-12 14:56:23 +00:00
alexvins
b5612624fb fix clone immunity handling for 8+ level creatures, part of issue #1234. 2013-03-10 16:16:43 +00:00
Ivan Savenko
b413d80ccc - better logging of some config files errors 
- restored lvl 10 for some dragons
 2013-03-09 13:16:35 +00:00
mateuszb
044b19269e * updated Visual Studio project file 2013-03-07 18:48:40 +00:00
stopiccot
277eb13cb4 Fixed OS X compilation 2013-03-06 22:03:57 +00:00
alexvins
2eb8263e51 Basic Configuration for bonus types 
* introduced new handler BonusTypeHandler
* config\bonusnames.json converted to common format and splitted info main and localizable parts
* hanlders initialization refactored
 2013-03-06 18:49:56 +00:00
DjWarmonger
ca8182f80f Fixed #1133. 2013-03-05 07:34:52 +00:00
DjWarmonger
ae7f3560a3 Moved phoenix immunity to .json. This fixes #978 2013-03-04 19:38:09 +00:00
DjWarmonger
5252e2aefe Added few more icons for creature abilities. 
Graphics here http://forum.vcmi.eu/viewtopic.php?p=8715#8715
 2013-03-04 18:33:58 +00:00
Ivan Savenko
b4e54f76ea - split heroes.json in manner similar to creatures\factions 
- string ID's for H3 heroes
- data in vcmi configs for heroes will replace data in h3 txt's
 2013-03-03 18:00:37 +00:00
mateuszb
dbec99ffc7 * PlayerColor and TeamID refactoring 2013-03-03 17:06:03 +00:00
Michał W. Urbańczyk
ac9a009516 VC project file update. 2013-03-03 14:08:39 +00:00
Ivan Savenko
b5fcefe455 - moved all system-specific handling of filesystem to VCMIDirs.cpp (new file) 
- fixed #1128, artifact constituents are now stored as pointers
 2013-03-02 18:41:25 +00:00
Ivan Savenko
f306d7bb70 some changes towards editing H3 objects via mods. Should be stable, report if not. 
- removed duplicated json loading code in handlers
- simpler and mod-friendly handling of combined artifacts
- reorganized CCreature to avoid huge number of fields in one structure
 2013-03-02 16:55:51 +00:00
DjWarmonger
5f4fb22f53 Several fixes to combined artifacts added via mods. 2013-03-02 09:11:52 +00:00
Michał W. Urbańczyk
e708dd5545 Version set to 0.92. Changelog updated. 2013-03-01 21:48:37 +00:00
Michał W. Urbańczyk
459e858756 One more fix for turrets — defender should also not be turned. 
Development build 0.91c.
 2013-02-27 07:40:21 +00:00
Michał W. Urbańczyk
a9fd7b806c Fixed crash on the new month when there are no creatures that can get double growth. (#1219, possibly #1217) 
The list of double growth creatures will be serialized.
Bumped format.
MSVC: silenced that stupid C4275 warning. (senseless when using STL)
 2013-02-27 03:11:45 +00:00
Michał W. Urbańczyk
9cc7a28222 Fixed unnecessary turret turning. 2013-02-27 03:06:49 +00:00
Ivan Savenko
b78c4c19ea - compile fix 2013-02-26 15:07:21 +00:00
DjWarmonger
928d1d2121 - Some work on bonus system, effect range can be ignored. TODO: usage of bonus with any subtype. 
- Fixed #1156
 2013-02-26 09:36:21 +00:00
DjWarmonger
28d3574b0b Compile fix - do it the old way. 2013-02-25 13:28:31 +00:00
alexvins
2cb86d84fa [refactor] 
+ crexp parser: parse mind immunity
 2013-02-25 12:18:45 +00:00
mateuszb
10fbe7b11e primary skill identifiers for bonuses 2013-02-25 09:48:26 +00:00
alexvins
856c7feeba [refactor] 
* creature config use string ids now
+ support string subtype id in short bonus format
* crexp parser: less magic nombers
 2013-02-23 22:48:22 +00:00
mateuszb
602827d1ae * MSVC compilation fixes 
* campaign epilogues and minor fixes
 2013-02-23 19:16:14 +00:00
alexvins
5a135b9f42 [c::b] update projects, fix compilation 2013-02-23 16:05:32 +00:00
Ivan Savenko
74ac44662c - a bit less memory usage during compilation with gcc, new file - RegisterTypes.cpp 
- fixed several issues related to visiting town by ally
- fixed #1215
 2013-02-23 12:22:23 +00:00
mateuszb
fbb1ae1bb8 * prologue videos (according to Randjan's list) 2013-02-22 21:03:56 +00:00
mateuszb
92995964f3 a bit more of prologue/epilogue screen 2013-02-20 21:01:18 +00:00
mateuszb
b776b93b0c * a bit of campaign prologue/epilogue screen 2013-02-19 20:39:09 +00:00
Michał W. Urbańczyk
9492592a8f Version bump. Fixed crash on desync saves. 2013-02-19 12:24:17 +00:00
Michał W. Urbańczyk
ca4a34df7b Development build 0.91b. 
Removed not necessary log.
 2013-02-18 23:35:25 +00:00
Michał W. Urbańczyk
d45a554fec Significant changes to saving system. Now both client and server store their lib part. 
Desync detection upon loading. Fixed many desyncs. (more remain)
Monsters won't have creature count 0 even if that is set as creature properties.
 2013-02-18 22:37:22 +00:00
DjWarmonger
111312636a Fixed #1207. Some tweaks. 2013-02-17 18:53:01 +00:00
Ivan Savenko
b22d8a007f - minor fixes 2013-02-17 18:25:42 +00:00
Ivan Savenko
a75d237e93 compile fix 2013-02-16 19:53:57 +00:00
mateuszb
776eb13663 * editor menus 2013-02-16 16:37:43 +00:00
mateuszb
560315bc48 * SlotID refactoring 2013-02-16 14:03:47 +00:00
Michał W. Urbańczyk
d23a5dcfdf Fixed #1208. 2013-02-14 15:19:35 +00:00
Michał W. Urbańczyk
12e627ec49 Fixed #1206. 2013-02-14 13:19:03 +00:00
Michał W. Urbańczyk
827d7b8681 Fixes for previous rev. 2013-02-14 02:17:46 +00:00
mateuszb
9e00090c42 * refactoring, a few intriguing problems remain 2013-02-13 23:55:42 +00:00
alexvins
ceea466f54 [refactor] spell handling 
* more config options for spells
  + mind immunity handled by config
  + direct damage immunity handled by config
  + immunity icon configurable
- removed mind_spell flag 
* more use of new spell identifacation
 2013-02-13 19:35:43 +00:00
mateuszb
6d06710684 * fixes for town building campaign bonus 2013-02-13 14:21:11 +00:00
mateuszb
9c1a117c1c * refactoring 2013-02-12 22:24:48 +00:00
Ivan Savenko
7e46d462b6 - compile fixes 
- fixed portrait initialization for random heroes
 2013-02-12 21:32:55 +00:00
mateuszb
bda766b697 * refactoring 2013-02-12 19:49:40 +00:00
Michał W. Urbańczyk
6ac70d6a0b Partially reverting r3191: DLL_LINKAGE on registerTypes def breaks compilation for MSVC. The function definition cannot be marked as dll import (and that happened, when it was included in CGameHandler.cpp) 
Partially reverting r3184: user-defined include/lib paths got uploaded
 2013-02-12 12:51:31 +00:00
Ivan Savenko
5a8787b74d - fixed some compiler warnings, gcc\clang work fine 
- better handling of innoextract in vcmibuilder.
 2013-02-11 22:36:12 +00:00
alexvins
8249e15f0f [c::b] update projects 2013-02-11 19:27:37 +00:00
mateuszb
8a8eecd063 * refactoring 2013-02-11 19:11:34 +00:00
DjWarmonger
b554af25d3 - Compile fix 
- Fixed Basilisk spawning at Hive
- Fixed double-shot of Marksman
 2013-02-11 17:23:55 +00:00
mateuszb
6ff7d61b91 * small fix 2013-02-11 16:07:29 +00:00
mateuszb
d540723739 * refactoring 2013-02-11 14:42:09 +00:00
mateuszb
86dc9386d6 * refactoring, including a generic solution for IDs 2013-02-10 23:24:57 +00:00
Michał W. Urbańczyk
2f39db2375 Hero portraits in campaign bonus selection. 2013-02-09 19:19:14 +00:00
Michał W. Urbańczyk
13b3d23b26 Finally working hero crossover in campaigns. 
Uncovered new secrets of h3m.
 2013-02-09 18:18:55 +00:00
Michał W. Urbańczyk
e31f5062f9 Fixed crashes when VCAI cannot find hero to recruit. 
Bumped format version.
 2013-02-09 17:37:38 +00:00
mateuszb
d03dbf64a6 * refactoring 2013-02-09 12:56:35 +00:00
mateuszb
0003d30991 * refactoring 2013-02-08 22:42:46 +00:00
mateuszb
9dd60b6dbe * refactoring 
* moat damage went to config file
 2013-02-08 21:17:39 +00:00
DjWarmonger
140786a04b - Drain Life now has % effect depending on bonus value 
- Stack can use more than 2 attacks. Additional attacks can now be seperated as "ONLY_MELEE_FIGHT and "ONLY_DISTANCE_FIGHT".
 2013-02-08 09:22:10 +00:00
mateuszb
043c7c52a3 * very important bugfix 2013-02-07 20:53:21 +00:00
mateuszb
f1c78e3260 * creature ID refactoring 
* double week creatures are configurable now
 2013-02-07 17:34:50 +00:00
alexvins
ed3d35554e [refactor] h3m reader 
* reduce code duplication
* use binary reader
 2013-02-07 17:02:15 +00:00
mateuszb
af5287c193 * fixed opening custom campaign selection window 
* artifact positions refactored
* vstd::advance allows moving between enum values
 2013-02-06 23:24:43 +00:00
mateuszb
169cf3558d * changes in campaign handling 2013-02-06 19:48:09 +00:00
mateuszb
3958364884 * a bit more work on campaigns; hero crossover still buggy 2013-02-06 10:16:44 +00:00
DjWarmonger
1ef205e5f1 Various tweaks / enchancements to bonus mechanics 
- Added CREATURE_SPELL_POWER for commanders
- Added spell modifiers to various spells: Hypnotize (Astral), Firewall (Luna), Landmine 
- Fixed ENEMY_DEFENCE_REDUCTION, GENERAL_ATTACK_REDUCTION
- Extended usefulness of ONLY_DISTANCE_FIGHT, ONLY_MELEE_FIGHT ranges
 2013-02-06 08:02:46 +00:00
mateuszb
dc091a1ce1 * some work on hero crossover; still buggy 2013-02-05 23:16:13 +00:00
Ivan Savenko
3f309f0c5e - removed support for ancient versions of ffmpeg 
- some cleanup in Linux video player
 2013-02-05 23:11:48 +00:00
Michał W. Urbańczyk
60c18f1bb8 More fixes for campaigns. 2013-02-05 21:19:08 +00:00
Ivan Savenko
8ffd482324 - gcc compile fix 
- mismatching enum (?) in HeroBonus
- probably fixed some cases of unaligned access
 2013-02-05 19:56:28 +00:00
mateuszb
bda92a4a73 * refactoring 
* fixed bug 1143
* some work on campaigns
 2013-02-05 18:48:46 +00:00
Michał W. Urbańczyk
f8d7473f9a * fixed vector<bool> serialization 
* fixed issue with loading castle event
 2013-02-05 14:32:59 +00:00
Michał W. Urbańczyk
937b316c11 Updated VC project file. 2013-02-05 01:25:56 +00:00
Michał W. Urbańczyk
59abcac7da A patch from stopiccot http://forum.vcmi.eu/viewtopic.php?p=8340#8340 2013-02-04 23:12:43 +00:00
alexvins
a9d458c8f4 few more refactorings 2013-02-04 21:58:42 +00:00
mateuszb
25663ce7af * fixed vector<bool> serialization 
* refactoring
 2013-02-04 19:43:16 +00:00
DjWarmonger
5b00d74e1a Fixed commanders starting with 2^32 experience. 2013-02-04 19:22:19 +00:00
mateuszb
3c5d6dd79a * vector<bool> serialization 2013-02-04 16:58:31 +00:00
DjWarmonger
e63747d2d2 Fixed #860 and #1169 
Imprisoned heroes as well as their commanders will get full level ups, with updated specialty, mana and movement.
 2013-02-04 12:32:53 +00:00
alexvins
d264f17b76 [refactor] separate h3m reader from rest of mapservice 2013-02-04 10:29:59 +00:00
mateuszb
8769f67c5d * JsonReader can convert to enums 
* refactoring
 2013-02-03 21:05:44 +00:00
mateuszb
ba3075317f * proper bool serialization 
* refactoring towards more enums/typedefs
 2013-02-02 19:28:39 +00:00
alexvins
b376ac8568 refactor map loading, few small tweaks 2013-02-02 17:20:31 +00:00
DjWarmonger
beb1ca1bf8 - getDate function now uses enum for different modes 
- Fixed Black Market (#1195)
- Fixed one-week bonuses removed eveyr day (#976)
 2013-02-02 08:29:57 +00:00
mateuszb
c4e03ef0de * enum serialization/deserialization (si32 as basetype ought to be enough for anybody) 
* some fields in classes refactored to use appropriate enums (not yet finished)
 2013-02-01 22:04:25 +00:00
DjWarmonger
096b0d6a36 Post-release version bump. 2013-02-01 09:37:39 +00:00
DjWarmonger
d325528aa5 For 0.91 release. 2013-02-01 08:44:20 +00:00
mateuszb
a1da195b85 * minor refactoring 2013-01-31 20:11:25 +00:00
mateuszb
5b0c6059e2 * bug 1193 should be fixed 
* minor refactoring
 2013-01-30 21:28:31 +00:00
DjWarmonger
5194569053 - Fixed #1190 
- Fixed incorrect shield effect
 2013-01-29 06:47:20 +00:00
Ivan Savenko
9caa21a51c - fix for #1189 (h3 text parsing fix) 
- fix for #1188 (replaced ffmpeg detection with module from KDE)
 2013-01-26 19:39:54 +00:00
DjWarmonger
ad9cfdcc1b Version 0.90c 2013-01-26 14:56:32 +00:00
beegee1
db2f468341 - Fixed some bugs when generating terrain view IDs (mock map seems to be OK) - Enabled RMG by default 2013-01-26 13:48:20 +00:00
Ivan Savenko
beac6b12d8 - loading fix 2013-01-24 21:03:01 +00:00
Ivan Savenko
080e037c54 - fix for starting towns (#1180) 
- fix for creature window (#1184)
 2013-01-23 22:09:58 +00:00
DjWarmonger
d71b11de81 Development version 0.90b 2013-01-23 20:33:34 +00:00
DjWarmonger
f6acc8c77b Added dummy message for artifacts that don't have pick-up texts. 2013-01-22 21:50:43 +00:00
Michał W. Urbańczyk
6232a1b369 Fixed #1181. Do not change that setProperty to setPropertyDer, it has to be as it is. 
Sketchy fix for BattleAIs colliding ith their callbacks.
 2013-01-21 21:34:30 +00:00
beegee1
a4129f43f2 - Correct handling of who manages which players(player count may differ from initial start options for a RMG map) - Fixed warning 2013-01-21 20:49:19 +00:00
alexvins
5b2f176c27 compile fix 2013-01-21 18:27:00 +00:00
DjWarmonger
cf7108f075 - Made sure that stack artifacts will not spawn when they are turned off 
- Description for "Spell-like attack"
 2013-01-21 15:11:37 +00:00
Ivan Savenko
46eb0b3daf - wrokaround/fix for #1177 
- removed assert in Fonts.cpp (can be triggered a lot by old pregame\battles code)
- fixed battle console text positioning
- fixed some new compiler warnings
 2013-01-20 22:49:34 +00:00
Michał W. Urbańczyk
a96f03e947 Crashes realted to illegal access to enemy hero data should be fixed, including #1178. 2013-01-20 20:29:35 +00:00
DjWarmonger
fff7909958 - Fix for hero specialties (creature type limiters) 
- Improved handling of new heroes / arts, check forum for fresh mod packages :)
 2013-01-20 16:31:18 +00:00
beegee1
1cab54b87a - Fixed bug when starting random map with 1 player - Refactoring - Fixed compile bug - Heroes can be selected in map selection screen(RMG map) - Main town gen 2013-01-20 14:43:58 +00:00
Michał W. Urbańczyk
5b919d88eb "More stable" opening AI. 2013-01-20 12:06:49 +00:00
Michał W. Urbańczyk
0e826915ed Fixed #1176. 2013-01-20 12:06:18 +00:00
DjWarmonger
1e90de3c9f Some more fixes for limiters and specialties. 2013-01-19 18:52:13 +00:00
DjWarmonger
79062eb15c - Parsing hero specialty is working (though complicated) 
- Some obvious fixed for limiters, more work needed
 2013-01-19 17:38:37 +00:00
DjWarmonger
97db289d3c Parsing for CREATURE_TYPE_LIMITER 2013-01-18 11:49:15 +00:00
DjWarmonger
ce15eb37c2 - Fixed serialization of limiters 
- Hero can now can have several separate specialty nodes
- Fixed typo (speciality->specialty)
- Fixed several crashes related to commanders
- Improvements to specialty handling, bugfixes and temporary solutions for upcoming hero specialties in mods
 2013-01-17 18:15:00 +00:00
alexvins
36469f406c Fix results of merge conflict with Warmonger. + more fixes to barseBonus. 
Bonus duration now can be array and parsed to bitmask as designed.
 2013-01-16 16:41:01 +00:00
Ivan Savenko
5deb499e7e Last breaking change into mod system (will explain on forum) 
- paths in "filesystem" node are now relative to mod directory
- "filesystem" entry in mod.json is now optional
- made "register object" log messages visible only in log
- minor fixes, including #1173
 2013-01-16 14:28:49 +00:00
DjWarmonger
d7c9377843 - Parsing propagators and limiters 
- Experimental support for chaining limiters
- Added missing abilities, propagators and limiters to artifacts
- Sketch of Calculator for bonuses, ignore it for now
 2013-01-16 13:02:01 +00:00
alexvins
53b684180d [refactor] 
* use spells configuration (all timed effects for battle spells)
* a few more cleanups
+register erm resource types (useful in future and less noise in log now)
 2013-01-16 11:19:04 +00:00
DjWarmonger
a86b5c1e2e Artifacts can now have multiple types of bearers. Fixed problems with Commander arts impossible to wear. 2013-01-16 07:37:51 +00:00
alexvins
0741639baf fix c++ standard violation. 2013-01-15 15:24:52 +00:00
alexvins
68e91ada1c [refactor] 
* spells are now more configurable (unused yet, WiP)
* a few more cleanups
 2013-01-15 14:20:48 +00:00
alexvins
264ce77ec9 [refactor] a few more cleanups 2013-01-13 12:40:24 +00:00
Ivan Savenko
2f83b211ca - fix for text on kingdom overview (#1172 + some other similar cases) 
- removed unused code from text handler
 2013-01-12 19:28:38 +00:00
alexvins
055e922e4d [refactor] a few more cleanups 2013-01-12 18:08:33 +00:00
alexvins
f4ee750d64 [refactor] a few more cleanups 2013-01-12 13:53:02 +00:00
alexvins
daf2c285e9 [refactor] reduce some code duplication, get rid of few magic nombers. 
*fix deletion of empty pandora box
 2013-01-12 10:32:03 +00:00
Ivan Savenko
7e7d12095b - basic support for dependencies\conflicts for mods 
- adventure map objects transparency should be more similar to h3
 2013-01-10 18:53:49 +00:00
DjWarmonger
d31277c3cc Minor compile fix, not sure why it's necessary. 2013-01-09 08:58:58 +00:00
beegee1
6d0221c0e7 - Compile fixes 2013-01-08 18:32:47 +00:00
alexvins
d8b068afd9 [c::b] update projects 2013-01-08 09:41:28 +00:00
beegee1
0311e5e6f5 - Added basic mock/test generation - Added stub for terrain editing 2013-01-06 19:30:12 +00:00
alexvins
4bc2fd5519 [c::b] renamed map subfolder to workaround dependency tracking bug 2013-01-03 12:19:20 +00:00
DjWarmonger
c0e09679f1 - Mod artifacts can have components 
- Mod artifacts can be for commander / stack
- Commander / stack artifacts will be automatically disabled from random spawning is related module is disabled
 2012-12-27 11:00:28 +00:00
DjWarmonger
1807a8a536 - Bonus subtype will now be resolved using string identifiers. 
- Registered secondary skills and resource names in identifier pool
 2012-12-26 09:46:09 +00:00
DjWarmonger
d50f9c8d34 Moved combo artifacts to config file, they are now handled by string id. 
TODO: use same solution for new mod artifacts.
 2012-12-25 19:04:15 +00:00
DjWarmonger
743a0fc3f4 Added string identifiers to artifacts. 
Some of them have lost some abilities, needs more work.
 2012-12-25 17:23:26 +00:00
alexvins
9051731755 [c::b] reorganize workspace 2012-12-24 15:55:19 +00:00
alexvins
616cedb2f2 get rid of few more magic numbers (obj types) 
+stub for wog objects
 2012-12-24 15:07:30 +00:00
alexvins
889031a95a get rid of few magic numbers (obj types) 2012-12-24 10:18:30 +00:00
Ivan Savenko
0b1c215882 - end of world, at least for autotools. Removed completely in favor of CMake 2012-12-23 19:44:37 +00:00
Ivan Savenko
da6cb0ae12 - trade windows work with new creatures\artifacts 
- removed some duplicated code in creature loading
 2012-12-23 10:23:41 +00:00
Ivan Savenko
8824f5e2d5 - H3 creatures use subset of mod creature format (todo - unify code) 
- creatures configs moved into confg/creatures files, similar to factions.
 - creatures ID's use same camelCase format as the rest of the game
 2012-12-22 16:47:12 +00:00
Michał W. Urbańczyk
bcf8cab19a Project files update/cleanup. 2012-12-19 18:23:21 +00:00
Ivan Savenko
b5ebf443fc - all fonts handling is now in new file, UIFramework/Fonts.cpp/h 
- common base class for H3 bmp and ttf fonts
- replaced fonts.txt with fonts.json
 2012-12-19 17:24:53 +00:00
DjWarmonger
0e06ac15ad - Commanders are now a part of faction config 
- Support for external dwellings for new towns
 2012-12-19 16:35:58 +00:00
alexvins
c0ce8712c1 add some missing licence headers 2012-12-19 14:54:10 +00:00
alexvins
66d9edf76e small refactor secskill limit check. 2012-12-18 11:24:13 +00:00
Ivan Savenko
94c55e2632 - string ID's for spells (not configurable due to hardcode) 
- spell chances in new towns guilds can be specified in config
 2012-12-18 10:32:11 +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
DjWarmonger
99e7177d57 Fixed unitialized ptrs in CArtifacts. 
Parsing for adventure map def for artifacts.
 2012-12-16 11:35:14 +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
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
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
ec8e078ef8 - fixed out of sync hero armies 
- one more crash in garrison
 2012-12-12 14:52:42 +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
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
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
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
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
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
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
mateuszb
a8524a2f95 * missing change from previous commit 2012-10-03 18:13:07 +00:00
mateuszb
652ea4036e * artifact bonuses are read from config file now 
* removed two commented-out methods
 2012-10-03 18:11:19 +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
DjWarmonger
1cf99f7be1 - Improved exploration algorithm. AI will avoid dead-end barriers and thus explore much faster. 
- Fixed crash when there are no heroes available to recruit in the map. TODO: make AI handle it
- Fixed crash when Chain Lightning has not enough targets
- Fixed crash at Hill Fort (?)
- AI will buy Spellbook for its heroes
- AI will try to use Cartographer and Observatory when exploring
- AI will not visit Prison when heroes are at max
- Experiment: AI will try to capture Mines and Dwellings when there are no enemies around (part of CONQUER goal)
 2012-10-01 18:25:43 +00:00
Michał W. Urbańczyk
3e82b92fce Version set to 0.9, updated changelog. 2012-09-30 21:51:23 +00:00
Michał W. Urbańczyk
49c5f70551 Fixed #1112/#1114. 2012-09-30 11:33:19 +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
Michał W. Urbańczyk
6934ec13e2 Post-release version bump. 
Minor correction for emptyAI VS project file.
 2012-09-29 21:10:39 +00:00
Michał W. Urbańczyk
dec3f9afd9 #1083 should be fixed. 
To be released as dev build 0.89d.
 2012-09-29 20:25:54 +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
2001aeac92 - typo fix 2012-09-29 17:16:07 +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
Michał W. Urbańczyk
f30ee8ff04 * fixed possible corruption of pack sent by server when player request is rejected 
* BattleAI will restore callback to its previous state, fixes freeze after battle #1104
* BattleAI won't lose turn when unable to correctly evaluate a spell
* VCAI will correctly recognize hero standing on town entrance
* War machines of defender will have correctly set side
* Faction 9 as neutral causes crashes, changing to -1 as used elsewhere in the code
 2012-09-29 14:44:06 +00:00
DjWarmonger
b6a20b6e99 Fixed teleporting animation (#818). Flying ability with subtype "1" will cause movement animation to skip (teleport). 2012-09-29 12:40:12 +00:00
Ivan Savenko
a602d7e9da - build system update 
- compile\warning fixes
 2012-09-29 12:02:46 +00:00
Michał W. Urbańczyk
f8a27a9fdb * Moved CConfigHandler from client to lib, CMake/Makefile need updating. I believe other projects besides client also need access to settings. (surprisingly there was a "server" category used only by client... and now VCAI.) 
* It is possible to set the battle ai that'll be used by neutrals by typing in VCMI console:
setBattleAI <AIName>
VCAI also respects that setting and uses given AI as its battle back-end.
 2012-09-29 10:59:43 +00:00
Ivan Savenko
74cd2e77fe - fixed (at least partially) #1100 2012-09-29 09:39:05 +00:00
Michał W. Urbańczyk
2ba0427432 * Fixed #1096 
* serializing icon index, otherwise creature portraits are gone after loading a game
* VCAI: fixed crash on attempting revisiting a boat (that is no longer present because it was boarded)
* Fixed strange crash with "neutral hero" (there should be no such thing... but somehow it appears, needs further investigation)
 2012-09-28 20:49:23 +00:00
Michał W. Urbańczyk
0750d46285 Fix #1095. 2012-09-28 19:11:09 +00:00
Michał W. Urbańczyk
8bb4abb75a * VCAI: fixed possible endless loop of realizing GATHERRESOURCE goal 
* an assertion failing when quest object cannot find its targeted monster ("crash early" policy), related to #1076
 2012-09-28 16:20:18 +00:00
DjWarmonger
0435d5a4f1 - Removed pointer usage for CQuest. may look rough, but works and fixes #1051. 
- Better autoSkip mode, now info windows are not displayed.
 2012-09-28 15:46:09 +00:00
Michał W. Urbańczyk
1fce4770fb Fixed crash when starting a game with new creatures on map using „Creature N” placeholders in armies. 2012-09-28 10:17:07 +00:00
DjWarmonger
ecda63683e Fixed Bonus parser crashing at unspecified value. Assigning empty objects is also not good solution. 2012-09-27 17:58:14 +00:00
mateuszb
af133ae758 * experimental support for bonus limiter/propagator loading from json (not turned on yet) 2012-09-27 16:48:46 +00:00
Ivan Savenko
1fdacc4085 - fixes #1086 
- removed outdated code from filesystem. Filesystem.json from 0.89b will no longer work.
 2012-09-27 13:23:33 +00:00
DjWarmonger
572cfa50e7 Bumping release version. 2012-09-27 05:45:38 +00:00
DjWarmonger
906fa04a60 Tweaks for creature bonuses. 2012-09-26 19:02:44 +00:00
mateuszb
8dca88c3c8 * start map in campaign button is properly disabled/enabled (I hope) 
* exported json for artifact bonuses; no limiters/propagators yet, so it's not used
* minor changes
 2012-09-26 18:10:29 +00:00
Ivan Savenko
15a7f43e11 - fixed #1075, #1080, #1081 
- fixed some warnings from cppcheck
 2012-09-26 13:13:39 +00:00
DjWarmonger
7759ed017e -Fixed abilities for new creatures not being displayed in creature window 
-Fixed crash with rank-range limiter used with stack experience disabled
 2012-09-26 05:13:47 +00:00
Michał W. Urbańczyk
ecd8947d8e Crashes on starting next campaign mission should be fixed. 2012-09-25 18:00:55 +00:00
mateuszb
f3f4a7633d * fixed 1085 
* fixed starting hero is granted in normal scenarios
* introduced TArtifactInstanceID
 2012-09-25 14:40:39 +00:00
DjWarmonger
8e78c86fe9 Parsing for stack experience and all other properties specified by creature format. Functionality untested due to other bugs in engine :( 2012-09-25 12:41:48 +00:00
mateuszb
f16a3a4527 * fixed bug 1084 2012-09-25 08:07:32 +00:00
mateuszb
7fe2692bf8 * support for campaign scenarios with no bonuses 2012-09-24 19:23:11 +00:00
mateuszb
59fcc15254 * last revision reverted, mysterious bug 2012-09-24 18:52:30 +00:00
mateuszb
55f1c47c16 * more TPlayerColor/TResource 2012-09-24 17:00:18 +00:00
mateuszb
18bd898cb1 * fixed bug when starting certain maps in campaigns 
* introduced TPlayerColor typedef
 2012-09-24 16:14:53 +00:00
Michał W. Urbańczyk
95b866c131 * Further work on Battle AI. Now it is able to cast a number of offensive spells. Battle callback exposes more spell-casting info. 
* Took down the one Boost.Assign usage offending VC11. I'm getting impatient I guess...
 2012-09-23 23:10:56 +00:00
mateuszb
6a81c8b1af * campaign against magic numbers 
* ArtifactID was misleading and wrongly used in one place -- renamed and fixed
* minor changes
 2012-09-23 18:01:04 +00:00
Ivan Savenko
3fcba4fb5c - fixed crash on start of some campaigns 
- allowed on map factions is now set instead of bit field
 2012-09-23 14:32:49 +00:00
mateuszb
9acfa0d136 * more or less working HERO campaign bonus 
* minor improvements
 2012-09-22 17:23:28 +00:00
mateuszb
82e21f8b6e * minor campaign related improvements 2012-09-22 15:16:45 +00:00
Ivan Savenko
8f936cd34d - added battleAI to CMake, compile fixes 
- icons config for towns and creatures
 2012-09-22 15:10:15 +00:00
DjWarmonger
e2bfd53c98 - Fixed some issues and crashes 
- Simplified projectile handling. New creatures can now shoot.
 2012-09-21 19:49:35 +00:00
mateuszb
8e3de98059 * restoring campaign features 
* minor improvements
 2012-09-21 17:59:54 +00:00
DjWarmonger
f38244bb5a Fixed adventure map defs for new creatures. 2012-09-21 08:08:18 +00:00
DjWarmonger
16adfa3aa7 - Fixed crash on creature window drawn for neutral faction 
- Fixed sound parsing. Check forum for updated mod.

It is now possible to attack & fight new creatures without crash.
 2012-09-21 07:22:23 +00:00
Ivan Savenko
99dcb73a72 - filesystem.json files for wog and vcmi data 
- merged puzzle map into town configuration (todo: sieges, adventure map, icons)
 2012-09-20 21:28:18 +00:00
DjWarmonger
656cf5ab6a - New creatures now work in game (more or less) 
- Parsing of def info for new creatures
- Fixed crash caused by neutral faction vs native terrain check
 2012-09-20 18:41:16 +00:00
Michał W. Urbańczyk
62e63d45b1 Work in progress on BattleAI. Related changes: 
* battle AIs receive ptr to CBattleCallback (not sure why it was CPlayerBattleCallback, likely mistake)
* reworked some battle callback methods to be more generic and able to handle some hypothetic scenarios
* for testing purposes in duel mode the first AI will be taken fro mconfig and the second will remain stupid ai
* minor changes
 2012-09-20 16:55:21 +00:00
Michał W. Urbańczyk
871f680ccc Fixed crash from unitialzied ptr. 2012-09-20 16:25:31 +00:00
Ivan Savenko
2c88845b9e - compile fix 2012-09-20 16:14:23 +00:00
mateuszb
4010978a91 * a bit of work on campaigns 2012-09-19 17:41:22 +00:00
DjWarmonger
3f95ba8ac8 Parsing & loading for new creatures. A lot of tweaks & improvements. Still needs some work. 2012-09-19 16:10:45 +00:00
mateuszb
fb2f19b4c5 * some work on campaigns 2012-09-18 17:47:52 +00:00
mateuszb
aa04a5bcd0 * removed unnecessary include in .h -- they should be avoided 
* fixed bug 1074
* fixed starting new custom campaign
* fixed building of ERM project
 2012-09-18 15:06:29 +00:00
DjWarmonger
20b54a39b6 Some tweaks for mod loading. Still doesn't work. 2012-09-18 14:22:15 +00:00
DjWarmonger
abd4a96bf1 Very simple loading and adding new creatures. Needs testing. 2012-09-18 07:36:07 +00:00
DjWarmonger
9438cfc7e2 Moved creature sounds to CCreature. Sound IDs are now stored as strings. 
Creature parser is complete (untested).
 2012-09-17 19:00:26 +00:00
Ivan Savenko
061ed69c63 - fixed seer hut issue (#1073) 
- separate archive types in filesystem for lod\vid\snd
 2012-09-17 17:25:54 +00:00
mateuszb
2d6f17f3fa * one of campaign-related bugs fixed 2012-09-16 18:43:55 +00:00
DjWarmonger
554a98dbd7 Quests will now be handled as object member instead of inheritance. Enabled quest objects for AI. 2012-09-16 13:34:01 +00:00
alexvins
369f0ae9c6 [PLATFORM] MinGW support added 
* disabled features unsupported by MinGW
* fixed issues with DLL_LINKAGE
! BOOST_THREAD_VERSION in now 3 workaround for existing code added, consider refactoring.
* some small tweaks ("-fpedantic" warnings)
 2012-09-15 19:16:16 +00:00
Michał W. Urbańczyk
74f9c19a7c Implemented spell countering. 2012-09-13 23:41:03 +00:00
Michał W. Urbańczyk
d961ec0507 * Fixed crash on casting spells. 
* version bump
 2012-09-09 23:51:20 +00:00
Ivan Savenko
a138db7c9e - removed lib headers from PCH 
- fixed #1062
- correct terrain penalty check
 2012-09-06 10:39:48 +00:00
Ivan Savenko
0ca9f64573 Next part of town configuration: 
- town screen is mostly implemented, has some minor issues
- factions are now separate from towns, neutrals have faction with id=9
- more constants to GameConstants: town-specific buildings, strings for terrains and resources
- replaced most access to builtBuildings with isBuilt() method
- replaced id's with enums for town subtype and buildings id's
 2012-09-05 12:49:23 +00:00
Ivan Savenko
44cc848edc first part of town configuration: 
- moved almost all loading to TownHandler
- CBuildings and CStructures are now part of CTown
- merged hall.json into buildings.json

Should not cause any crashes or glitches
 2012-09-02 10:33:41 +00:00
Michał W. Urbańczyk
3e346e737a Fixed type enum mismatch between Component and CComponent causing a crash when displaying w window with player flag. 
Campaign against magic numbers.
 2012-08-31 17:39:11 +00:00
Michał W. Urbańczyk
5a157290d9 Fixed crash occurring after casting Armageddon and killing all stacks. 
Removed some commented-out code.
 2012-08-31 16:33:30 +00:00
Michał W. Urbańczyk
6530e7a1e1 * servers will not allow using out-of-range slots ( #1061 ) 
* server won't crash on some scenarios when they're used
* fixed some minor discrepancies with creature placement in creature banks
 2012-08-30 16:01:19 +00:00
DjWarmonger
31f82cade0 - Removed integer parameters from CCreature, all stats are now handled by Bonus System Only 
- Parsing for creature format http://wiki.vcmi.eu/index.php?title=Creature_Format
Needs rearrangement of some info to work
 2012-08-30 14:57:24 +00:00
Michał W. Urbańczyk
38b6435ee4 Shackles of War implementation uses bonus system propagation instead of looking into enemy hero. Silences some warnings. 2012-08-29 15:27:24 +00:00
Ivan Savenko
c7789992c3 - fix for hero flags along with battlehero cleanup 
- removed unused code
 2012-08-29 14:55:31 +00:00
Michał W. Urbańczyk
48e6c3bcf9 Fix #1060. 2012-08-29 13:01:54 +00:00
DjWarmonger
4e726f0eb2 - Handling for Hill fort and (kinda) Magic Well 
- Improved hero exchange
- Fixed strange case when AI found allied town extremely dangerous, resulting in endless loop
 2012-08-29 09:19:20 +00:00
Michał W. Urbańczyk
0b85cfaf78 Fix for #1058. 2012-08-28 15:38:00 +00:00
Michał W. Urbańczyk
830d94064e Fixed #1056, #1057 and #1058. 
Should also fix #152.
 2012-08-28 12:28:13 +00:00
Michał W. Urbańczyk
a14f381d48 Fixed #1055 - hang when creature performed automatic (not controleld by player) action. 
Fixed possible crash on arrow turret turn.
 2012-08-27 12:34:43 +00:00
Ivan Savenko
7ce9e95525 - death stare works identically to H3 
- gcc warnings fix
 2012-08-27 10:47:02 +00:00
Michał W. Urbańczyk
7c09f73402 * INFINITE_DIST is now enum, it should cause least trouble that way. Uh, it's so hard to fight magic values these days. 
* Fixed crashes in battles after loading game
* Fixed crash in battle AI, when stack is blocked and stands next to an enemy
* Fixes problem when server's moveStack is called with dest==position
* Above should cover #1053.
 2012-08-26 19:13:57 +00:00
Ivan Savenko
d5f29d134f - create temporary when INFINITE_DIST passed by reference. Should work with MSVC as well :) 2012-08-26 13:16:57 +00:00
DjWarmonger
002844b376 Compile fix. Sorry, Ivan :P 2012-08-26 12:40:55 +00:00
Ivan Savenko
d69f4b7632 - build system update 
- fixed gcc\clang warnings
 2012-08-26 09:59:07 +00:00
Michał W. Urbańczyk
d390113c23 * New files for lib: CBattleCallback.cpp and CBattleCallback.h 
* Updated MSVC project files
* Filesystem: My version of .SND archive does not have \0 after WAV extension. Fixed (though hardcoded 3-char extension length).
* New bonus types: BLOCK_MAGIC_ABOVE for blocking casting spells above given level and BLOCK_ALL_MAGIC for blocking all magic.
* Heavy rewrite of battle callbacks. Fixed some minor bugs. Code reusage between lib/client/server (removed proxy calls). Better access control and support for various perspectives.
* Fixed #1031
* Fixed Orb of Inhibition and Recanter's Cloak (they were incorrectly implemented). Fixed #97.
* Fleeing hero won't lose artifacts. Spellbook won't be captured. Fixed #980.
* Fixed crash when attacking stack dies before counterattack (ie. because of Fire Shield)
* Server does some basic checks if action requests during battle are valid
* Minor stuff.
 2012-08-26 09:07:48 +00:00
Ivan Savenko
2dd9d943c9 - fix for missing grail 2012-08-25 13:29:46 +00:00
DjWarmonger
669c8a104a Compile fix. 2012-08-25 09:21:18 +00:00
Ivan Savenko
cf15ca1cf0 - replaced loadToIt with better H3 parser. 
- moved hero class to heroes.json
 2012-08-25 08:44:51 +00:00
DjWarmonger
39d433c1c7 Moved game Modules to config file. 2012-08-24 09:37:52 +00:00
DjWarmonger
d56e7c568a Added full parser for Bonus structure, as described in http://wiki.vcmi.eu/index.php?title=Bonus_Format 
Untested.
Limiters / propagators are not yet supported.
 2012-08-23 18:46:43 +00:00
Ivan Savenko
c1726be22c - fixed crash on loading last file from video archive 2012-08-22 10:31:20 +00:00
DjWarmonger
9e0c9b4f49 Fixed #1042. Tweaks for Commander bonuses. 2012-08-20 16:10:50 +00:00
DjWarmonger
10122f8153 Another tweak for Seer Hut serialization. 2012-08-11 19:00:52 +00:00
DjWarmonger
fa544384a7 Fixed double serialization, possible cause of #1051. 2012-08-11 17:01:39 +00:00
Ivan Savenko
eec4d3579d - fixed crash on missing videos 
- fixed savegames name selection
 2012-08-11 11:34:49 +00:00
DjWarmonger
edbc7f1223 - Some hardcoded settings will now be read from config/defaultMods.json 
- Fixed AI crash when it was placed in closed and safe area
 2012-08-11 09:06:23 +00:00
Ivan Savenko
aa326491a3 - compile fixes 
- build system update
 2012-08-10 15:16:42 +00:00
DjWarmonger
289b7b68d9 Mod Handler class. It is connected with engine, but doesn't do anything yet. 2012-08-10 13:07:53 +00:00
Ivan Savenko
7e778045b8 - removed no longer used CSndHandler. Transition to new fs is finished 
- moved TownHandler::requirements to CBuilding class
 2012-08-09 10:32:50 +00:00
Ivan Savenko
94cfc99d7b - fixes #1044 
- fixes to linux video player
 2012-08-08 20:58:06 +00:00
Ivan Savenko
cab8955d8f - sound player uses new FS 2012-08-08 12:03:32 +00:00
Ivan Savenko
28f0263298 - compile fixes 
- filesystem tweaks
 2012-08-08 10:17:46 +00:00
DjWarmonger
55f321f3f3 - Fixed AI crash at "gather resource" quest 
- AI will now understand threat of Abandoned Mine. For sure.
- Fixed incorrect creeps quantities info
 2012-08-08 08:27:52 +00:00
Michał W. Urbańczyk
cd63c177e2 * std::unordered_map implementation in MSVC 10 has terribly slow destructor. Since bug is fixed only in VC11, I replaced it with boost::unordered_map. 
* fixed crash with invalid .lod archive (some H3 installations have fake 1 byte .lod "archives"
* fixed crash when parsing invalid map file
* minor random optimizations (rv-refs, etc)
 2012-08-08 08:25:27 +00:00
Ivan Savenko
9cbc1f1058 - merged basicCreatures and upgradedCreatures into single array 
- missing fix for savegames
 2012-08-07 21:46:24 +00:00
Ivan Savenko
8040a81eec - fixed save games issues (#1044) 
- hopefully some speedup for filesystem loading (#1048)
 2012-08-07 11:28:52 +00:00
Ivan Savenko
708ad6ac7f - music player uses URI's instead of enum from music base 
- #1045 and #1046 should be fixed
- moved pregame backgrounds to config/mainmenu
- animation can be overriden with .json multiple times
 2012-08-06 07:34:37 +00:00
Ivan Savenko
63a757ac7d - removed debug 2012-08-02 11:05:40 +00:00
Ivan Savenko
e67f8afdd9 - removed multiple unused files 
- config folder with all json files is used via new FS API
- fixed campaigns loading. Replaced "detect h3m starts" heuristics with CCompessedStream::getNextBlock()
 2012-08-02 11:03:26 +00:00
Ivan Savenko
b3c17d2788 large filesystem update. Filesysytem is now fully functional, everything should work. 
- completely replaced CLodHandler, removed bitmaph and spriteh
- replaced CLodStream in favour of CCompressedStream (2 new files)
- renamed CResourceLoaderFactory and ResourceIndetifier to shorter names
NOTES:
- campaign loading is currently broken. Will fix.
- I am going to remove several unused files in several days (e.g. LodHandler)
 2012-08-01 12:02:54 +00:00
DjWarmonger
17a513c01b various fixes for #828 2012-07-30 09:27:19 +00:00
DjWarmonger
12e71e0dff Missing serialization for Border Gate fixes #1040. 2012-07-29 18:18:55 +00:00
Michał W. Urbańczyk
5981ad15d4 Fixed Duel mode. Integrated some changes from programmingChallenge branch - it's possible to define duel parameters using JSON. 2012-07-26 00:48:44 +00:00
Michał W. Urbańczyk
9327823355 Updated MSVC project file. 2012-07-23 11:33:25 +00:00
Ivan Savenko
a72a294a46 some work on new filesystem, not tested 
- one more new file
- removed duplicating code
- filesystem parser is now recursive
- decompression should be possible if decompressed size is unknown
- autotools and cmake update
 2012-07-23 10:23:43 +00:00
DjWarmonger
4bd8a5a15b Compile fix for last commit. 2012-07-22 15:40:44 +00:00
beegee1
1ed91077f7 * Implementation of the new filesystem API (msvc project files needs to be updated) 2012-07-22 15:02:13 +00:00
DjWarmonger
0665850d9d Fixed #1024 2012-07-21 09:58:42 +00:00
DjWarmonger
356e675a65 - VCAI can now complete all types of Seer Hut Mission. GATHERTROOP victory condition should also work. 
- Minor tweaks.
 2012-07-21 07:15:53 +00:00
Michał W. Urbańczyk
9207e4f4a4 Fixed a compile error on MSVC with abs(ui64). 
Fixed crash when quest object is removed.
 2012-07-20 21:42:25 +00:00
Ivan Savenko
e4c88d5088 - moved ParseBonus to JsonNode.cpp (linkage errors) 
- fixes to CMakeLists - vcmi can be compiled and started with cmake
- gcc\clang warnings fixes
 2012-07-19 18:52:44 +00:00
DjWarmonger
4c0537c420 - AI will now wander with all the heroes that have spare movement points. It should prevent stalling. 
- Fixed #1030
 2012-07-19 16:29:29 +00:00
DjWarmonger
d8cb3a34d3 -Fixed crash #1037 
-AI can now successfully complete several types of quests.
-Lots of tweaks for AI
TODO: fix bizarre crash when opening borderguard
 2012-07-19 09:10:55 +00:00
DjWarmonger
624908e403 - Fixed unserialized GrowingArtifact, causing crash 
- An attempt to teach AI completing quests
- Gathering army is now continuous, abstract goal
- Lots of fixes and tweaks in AI
 2012-07-18 10:10:14 +00:00
DjWarmonger
b86706d58c Commander can now die in a battle and will be automatically rised when visiting town. 2012-07-17 08:52:27 +00:00
DjWarmonger
9ebf56ff03 Quick fix for previous commit. 2012-07-16 16:31:41 +00:00
DjWarmonger
cf45239332 Fixed #1035. 
Support for commander artifacts that accumulate bonus after battle.
 2012-07-16 16:18:02 +00:00
ddaroo
69de38bf1d Tweaks for cmake build system: data dir definitions, flags for clang (not tested), missing CQuestLog.cpp file for the client, naming convention of few binaries same for autotools and cmake 2012-07-15 16:05:41 +00:00
Michał W. Urbańczyk
edccbd4809 Rewritten many parts of query handling. Fixed several scenarios leading to a hang (including #1012). Purged boost::function from player interface (handy but impossible to serialize). VCAI will keep description for each unanswered query, so the further debugging will be easier. 2012-07-15 15:34:00 +00:00
DjWarmonger
b28da1a5d3 - Quest log minimap now has clickable icons 
- Border guard & border gate inherit Quest interface
- Lots of tweaks
 2012-07-08 16:36:20 +00:00
DjWarmonger
32d1a08470 Pointer serialization for CQuest. 2012-07-08 08:42:03 +00:00
DjWarmonger
7fbf89ffc8 Rearragned Seer Huts & Quests. More work on Quest Log descriptions. 2012-07-08 06:33:41 +00:00
DjWarmonger
49d2ba1982 Quest Log is partially functional. TODO: update quest after completion. 2012-07-07 08:45:45 +00:00
Ivan Savenko
50e8bc1704 - build system update 
- compile fix for quests (vector can't be used to store const data)
- fixed several "unitialized" warnings
 2012-07-06 20:19:54 +00:00
DjWarmonger
12511d8fee First part of new Quest Log, including common quest interface. 2012-07-06 19:12:04 +00:00
DjWarmonger
ac997b8214 Partial interactive mode for Commander level-up dialog. It is possible to select secondary skill. 2012-07-03 08:07:34 +00:00
Michał W. Urbańczyk
54ca71d598 Update to Boost.Filesystem version 3, since Boost 1.50 drops support for version 2. 
Check http://forum.vcmi.eu/viewtopic.php?t=518
 2012-07-02 09:04:05 +00:00
ddaroo
758fb0679e Stub for a CMake build system. 2012-07-01 14:27:41 +00:00
Ivan Savenko
613172fa45 - fixed #582, #1019 and #1022 
- linux readme tweaks
 2012-06-27 20:44:01 +00:00
Ivan Savenko
47945383da gcc-4.5 compatibility 2012-06-23 17:19:50 +00:00
Ivan Savenko
770a6e077c - handling of incorrect or missing configuration files (settings.json\defaultSettings.json) 
- better code for recruitment window, fixes #1013
- minor tweak to adv.map classes
 2012-06-22 11:40:16 +00:00
Ivan Savenko
1b50082e43 - fixed crash with necromancy dialog #1009 (russian-only) 
- Client::run will catch only asio exceptions
- (linux) fixed typo that disabled debug mode
 2012-06-16 17:12:58 +00:00
DjWarmonger
4d62525ff7 - Restored missing code for BattleInfo::getAvaliableHex - Elementals will now be placed correctly 
- Fixes for BattleHex::getDistance returning 0 for adjacent hexes
- All stacks will now be placed after obstacles (fixes #1004)
- Removed unused code from ArtHandler
 2012-06-16 14:25:39 +00:00
Ivan Savenko
8c6965c5ee - shadows for CWindowObject-based windows 
- better error messages on read error
- fixed crash on level-up window
 2012-06-16 10:41:14 +00:00
Ivan Savenko
2d8a15f27c - all windows except for pregame\battles are now CWindowObject-based 
- added simple scaling algorithm that works with indexed surfaces
 2012-06-15 17:08:19 +00:00
Ivan Savenko
9d2711fb51 - rewrote most of classes from adventure map window 
-- new files: client/AdventureMapClasses.*
-- implemented all missing details from infobox
- textinput can handle numbers as input
- fixed several bugs caused by CIntObject changes
- fixed #988
 2012-06-13 13:04:06 +00:00
Michał W. Urbańczyk
84630a0984 Fixed #993, tent code cleanups. 2012-06-10 13:07:08 +00:00
Michał W. Urbańczyk
e6ebf42308 #994 should not crash anymore. 2012-06-09 19:58:17 +00:00
DjWarmonger
cdb55500f3 Fixed #979 2012-06-09 19:24:04 +00:00
Michał W. Urbańczyk
e7d82a9702 Rewritten CLoadFile::openNextFile to be cleaner and not leak. Desperate messing around for #989. 2012-06-08 00:12:31 +00:00
Frank Zago
9fc459b5c8 Fixed clang warnings. 2012-06-07 03:08:38 +00:00
Frank Zago
bc4f856bfc Put Warrior's Tomb into the switch statement and properly set the sound returned. 2012-06-07 03:02:30 +00:00
Ivan Savenko
d60f2d57a0 - first part of CIntObject API clean-up. 
- - mostly remove usage of (de)activateSomething functions
- - CIntObject's can be safely deleted in active state or without removing from parent first
- - Added CWindowObject to use as base of all windows (will be required for such features as shadows)

Report any crashes or glitches - it should not cause any issues apart from more console output. 

TODO:
- remove redundant (de)activate and show(All) calls
- decrease usage of blitAtLoc\printAtLoc methods
- switch all windows to new base
 2012-06-02 15:16:54 +00:00
Michał W. Urbańczyk
3df1ddbf86 Post-release version bump. 
Fixed #986.
 2012-06-01 21:31:41 +00:00
Michał W. Urbańczyk
b7c4da65b5 Integrated 1280x800 resolution from #972. 
Version set to 0.89.
Updated changelog.
 2012-06-01 17:11:30 +00:00
Michał W. Urbańczyk
4cd77a0192 Naive solution for endianess issues. Seems to allow loading a big-endian save on little-endian build. 
Fixed compile issues with CEmptyAI. Removed unnecessary methods from its.
 2012-06-01 15:59:26 +00:00
Ivan Savenko
828d9e70d2 - one more crash at map loading 2012-06-01 11:35:31 +00:00
Ivan Savenko
4e92859cee - fixed crash on loading of some maps 
- minor fixes
 2012-05-30 18:37:21 +00:00
Michał W. Urbańczyk
247fabc3a6 Seems to be actually a missing return and redundant check. 2012-05-29 23:22:28 +00:00
Ivan Savenko
faaf799d95 - fixed some extra warnings. Mostly harmless. 
NOTE: Please check changes in BattleState.cpp and GameHandler.cpp for possible bugs
 2012-05-28 19:29:32 +00:00
Michał W. Urbańczyk
77e7a25ed7 Fixed #970. 
Fixed issue where cursed ground obstacles were appearing on holy ground (and vice versa).
Fixed battle interface blocking itself up after clicking on owned stack to open creature window.
 2012-05-26 11:01:31 +00:00
DjWarmonger
e0135ab6a6 Fixed Commander artifacts management, including #968. 2012-05-25 15:10:38 +00:00
Michał W. Urbańczyk
41480a489e Win compile fix (#974) 2012-05-25 14:53:56 +00:00
Ivan Savenko
49495c9caf - possibly fixed #966 and #958 
- fixed crash on shutdown 
- fixed compile issue #973
 2012-05-25 11:49:56 +00:00
Michał W. Urbańczyk
ee6e9fcc7f Fixed #947. 2012-05-22 21:08:16 +00:00
DjWarmonger
18e53a1717 - Fixed a scenario when AI could visit the town without picking troops, resulting in a lock 
- Added ench0's patch for creature range tooltip (#948)
 2012-05-22 10:15:16 +00:00
Michał W. Urbańczyk
401d6816d1 Workaround for serializer allowing sending CStackInstance* pointing to commander. (and only CStackInstance*) 2012-05-21 23:39:35 +00:00
DjWarmonger
d34cf90bf7 Support for Chain Lightning. 
Fixed getClosestTile function.
 2012-05-20 11:40:23 +00:00
DjWarmonger
88639be91b Enabled commander artifacts. Don't work yet. 2012-05-20 08:39:19 +00:00
Michał W. Urbańczyk
a234b4c935 Fixed #956. 
Removed unused code left after tests.
Updated changelog.
 2012-05-19 22:57:24 +00:00
DjWarmonger
6419f953cb Some (disabled) work for commander artifacts. Hero artifacts window seems broken. 
Minor fixes.
 2012-05-19 18:27:23 +00:00
Ivan Savenko
665837d656 - hopefully better town development for AI 
- fixed minimap blitting
- fixed crash on attacking town without moat
 2012-05-19 16:22:34 +00:00
Ivan Savenko
6f6cd6814e - fixed wrong battlefield (#961) 
- minor tweaks
 2012-05-19 11:47:26 +00:00
Michał W. Urbańczyk
d2756e8c88 Partial fix for #961. 
Minor fixes for VS project files.
 2012-05-18 22:47:54 +00:00
Michał W. Urbańczyk
d168f3eac2 * Implemented Moat functionality during siege (stops movement and deals dmg) 
* Mostly implemented battle spells:
 - Fire Wall
 - Force Field
 - Land Mine
 - Quicksands
 2012-05-18 20:50:16 +00:00
DjWarmonger
5435101182 Lots of fixes and improvements for Commander interface. 2012-05-18 19:44:15 +00:00
Ivan Savenko
45c2809a40 - pregame will use same resolution as main game 
- disabled most of now unused code for changing resolution
- added missing spell effect sounds
- adventure map spells sounds
- remaining fixes for big endian systems
 2012-05-18 17:35:46 +00:00
DjWarmonger
d491bc1c3a Commanders can level up. It's non-interactive yet. 
Printing secondary skills for Commanders.
 2012-05-18 14:02:27 +00:00
Ivan Savenko
97aeaa9f28 - moved ColorPutter's to separate SDL_Pixels.h file 
- added Channels namespace for accessing subpixels in format-independent way
- fixed several big-endian issues
- re-generated buld system
 2012-05-17 10:44:48 +00:00
DjWarmonger
416c08260a - Basic Commander window 
- First part of unified quests interface

This graphics package is needed:
http://forum.vcmi.eu/viewtopic.php?p=6943#6943
 2012-05-16 17:29:05 +00:00
Ivan Savenko
9efe05c90b - removed usage of Graphics in several places (Components and hero window). 
minor:
- fixed several deprecation warnings in video player
- config file may have multiple upgrades for creatures
 2012-05-13 15:04:21 +00:00
Ivan Savenko
46f48f0676 - bugfixing: 
-- fixed #942 and #898
-- removed dublicated code in dwelling loading, #900 is fixed
-- fixed roads rendering for #895
 2012-05-11 19:03:40 +00:00
DjWarmonger
ee2768ab07 - Some work for commanders 
- New creature window - visit forum for package with necessary graphics: http://forum.vcmi.eu/viewtopic.php?p=6908#6908
- More AI optimizations - heroes will be processed starting from the fastest one.
- AI will check is GATHER_ARMY object is reachable
 2012-05-07 12:54:22 +00:00
Michał W. Urbańczyk
5449546447 Advanced work on support for Quicksand and Land Mine spells. 2012-05-04 21:16:39 +00:00
DjWarmonger
bd2a0c2a2b "You have captured enemy artifact" window. All arts from commander & stacks will also be looted. 2012-05-02 08:37:11 +00:00
DjWarmonger
6f108c41df Fix for previous commit. Now artifacts from defeated hero are passed to winner. 2012-05-01 14:38:53 +00:00
Ivan Savenko
f767216b2e - (autotools) libdl check for freebsd 2012-05-01 12:38:41 +00:00
DjWarmonger
2fbc57e140 1. Better way to disable stack / cursor glitches 
2. An attempt to handle looting artifacts after battle
 2012-05-01 08:52:22 +00:00
Ivan Savenko
d479341a5a - gcc compile and warning fixes 2012-04-30 12:13:36 +00:00
Michał W. Urbańczyk
13e6f00e18 Compile fix #945. 2012-04-30 10:40:19 +00:00
DjWarmonger
25bdcd3cab - Fixed wrong creature teleported 
- Support for Sacrifice
 2012-04-28 19:40:27 +00:00
DjWarmonger
192de453af - Fixed Remove Obstacle spell 
- Fixed freeze at Chain Lightning
 2012-04-28 15:18:21 +00:00
DjWarmonger
d6873d7570 - No battle actions will be available during tactics phase 
- Fixed moving stacks during tactics
- Fixed Genie spell targeting
- Fixed AI getting stuck at Tree of Knowledge when no resources
 2012-04-28 13:01:39 +00:00
DjWarmonger
82f3bc8135 - Commanders will now be properly intialized 
- Commanders show in the battle
 2012-04-28 11:41:20 +00:00
Michał W. Urbańczyk
482051eb17 Tweaks for obstacles. 2012-04-24 05:16:04 +00:00
Michał W. Urbańczyk
2ad89a29c4 Missed the file. 2012-04-23 20:20:43 +00:00
Michał W. Urbańczyk
7dc0d6878e Rewritten battle obstacles. New file for lib: CObstacleInstance.cpp. 
Now obstacles should be placed exactly like they were in OH3. 
All problems with displaying obstacles in battlefield should be gone. They should be now matched to the single pixel. 
If there are still some discrepancies, please report them.
 2012-04-23 19:56:37 +00:00
DjWarmonger
6d03e0bf23 One more thing. 2012-04-23 05:01:52 +00:00
DjWarmonger
9c9301a495 Various fixes. 2012-04-22 19:56:03 +00:00
DjWarmonger
96d198758c - More commanders 
- Improved finding closest tiles on battlefield
 2012-04-22 17:38:36 +00:00
DjWarmonger
81e74f8c33 - Config settings & parsing for Commanders. 
- Fix for Regeneration icon
 2012-04-22 13:28:46 +00:00
Michał W. Urbańczyk
017013a5a4 Throwing runtime_errors instead of string (or even char*) objects. 2012-04-22 07:32:45 +00:00
DjWarmonger
05311dd30c - Fixed and simplified Teleport casting 
- Stack artifacts will now not be wearable by hero (by default)
- Fixed crash involving clone
 2012-04-18 13:24:18 +00:00