games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity
8,097 Commits 20 Branches 62 Tags 110 MiB
0b56778e00
Commit Graph

2911 Commits

Author SHA1 Message Date
Ivan Savenko
617ea79d3c Button overlays are now more generic (not necessarily text), removed old version of creature window 2014-07-02 21:38:38 +03:00
Ivan Savenko
7a9547bb44 New creature window made without use of H3 graphics 
This is import of ancient unfinished branch from svn. As of now window is largely finished but commander-related elements are still TODO.

Note that I also uploading graphical content - this is intended and necessary for final goal - to make VCMI functional without any additional graphical pack.
 2014-07-02 21:38:38 +03:00
AlexVinS
638dac90af centralize key color management 2014-07-02 22:20:54 +04:00
AlexVinS
082c9a506e Fix battle absolute obstactes rendering 2014-07-02 21:38:15 +04:00
AlexVinS
7b75b19d1a Fix hero flags rendering 2014-07-02 21:09:49 +04:00
AlexVinS
9606aed4a3 Using int3 for color is weird 2014-07-02 20:12:15 +04:00
AlexVinS
e57dbbde15 Extract startTextInput & stopTextInput 
(*) these functions do nothing with SDL1 - this is by design - less ifdef`s
 2014-07-02 19:41:30 +04:00
AlexVinS
9797372dbe Implement Unicode support for ingame console 2014-07-02 19:16:05 +04:00
AlexVinS
195eae48ca Merge branch 'develop' into SDL2 
Conflicts:
	client/CPlayerInterface.cpp
 2014-07-02 17:15:12 +04:00
Ivan Savenko
c956b3f02a Fixed #1820, better detection of object below cursor that uses same logic as renderer 2014-07-01 17:19:08 +03:00
AlexVinS
50dfe05cd1 [C::B] Small projects fix 2014-06-30 11:19:55 +04:00
DjWarmonger
57fa905a2b Something that compiles. 2014-06-26 22:05:27 +02:00
DjWarmonger
e51e2190fd Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-26 20:12:37 +02:00
Ivan Savenko
32240da34e Reduced number of #include's in headers. May break compilation on Win 
since some net packs now need DLL_LINKAGE
 2014-06-25 17:11:07 +03:00
Ivan Savenko
a0689fa377 Refactoring of hoverText from objects: 
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
 2014-06-24 20:39:47 +03:00
Ivan Savenko
ad632d1e8a Moved FoW management from CGObjectInstance to callback 2014-06-24 20:39:47 +03:00
Ivan Savenko
5ebc0e8614 First part of object instance API cleanup 
- removed passability() method in favour of passableFor(PlayerColor)
- moved operator < code to map handler
- updated class documentation
 2014-06-24 20:39:47 +03:00
AlexVinS
4e4ba6654c fix Eye of magi, also fix #1608 
Conflicts:
	lib/CObjectHandler.cpp
 2014-06-24 18:20:28 +04:00
AlexVinS
3b8d0e44d4 Merge branch 'develop' into SDL2 2014-06-24 14:09:44 +04:00
DjWarmonger
79036484dd Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02:00
Ivan Savenko
47639832b1 Probably fixed bug with map border rendering in rectangular maps 2014-06-23 20:47:09 +03:00
DjWarmonger
3ac306f501 Merge pull request #19 from vcmi/feature/mapObjects 
Feature/map objects
 2014-06-22 14:49:42 +02:00
AlexVinS
2ec8c31558 Partial fix for hero flag rendering 
(-) blue & teal heroes are still gitchy. IDN why ...
 2014-06-21 14:54:41 +04:00
AlexVinS
ac7703ffb0 Fix hero movement rendering 2014-06-21 12:13:19 +04:00
AlexVinS
8cc5363882 fix warning, cleanup 2014-06-21 11:35:08 +04:00
AlexVinS
13bd4ddcb2 Now movement can be canceled 
(-) rendering still missing
 2014-06-21 10:49:27 +04:00
AlexVinS
5fa5ba622f Start preparation for moveHero threaded implementation 2014-06-18 14:31:11 +04:00
AlexVinS
c2dd696e96 simplify CGuiHandler::handleEvents() 
Threre is no need to allow (and I doubt is was in fact possible with old code) new events to arrive during processing events. Let them to be processed in next frame.
 2014-06-18 08:30:23 +04:00
Ivan Savenko
09d595e385 - Implemented "mapObject" entry for hero classes 
- Updated schemas
- Some bugfixing
 2014-06-16 19:27:26 +03:00
AlexVinS
5fdc63ab5b tiny fixes 2014-06-16 14:32:37 +04:00
Ivan Savenko
836c466f81 - Implementation of overrides for towns 
- Converted dwellings.json into new format
- Implemented "mapObject" entry in town format
- Removed capital/fort/village fields from town in favor of overrides
 2014-06-15 19:43:01 +03:00
DjWarmonger
e56f41b8be Fixed monster strength selection. 2014-06-15 12:00:34 +02:00
DjWarmonger
5c431da0f9 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-15 10:01:18 +02:00
AlexVinS
c7390316b7 small cleanup 2014-06-13 07:55:50 +04:00
AlexVinS
d707e55472 restore inGuiThread flag 2014-06-13 07:55:50 +04:00
AlexVinS
41a0319985 remove separate GUI thread 
+ this fixes OGL
- has some issues(f.e. hero movement)
 2014-06-13 07:55:49 +04:00
AlexVinS
15fe37133c Fix compilation with SDL1 
+ seems to be fully backward compatible (need more testing)
 2014-06-13 07:55:48 +04:00
AlexVinS
56c74bc46a +More build target to support both SDL1 and SDL2 builds 2014-06-13 07:55:48 +04:00
AlexVinS
bbd0312b45 Tweak configuration 2014-06-13 07:55:47 +04:00
Ivan Savenko
c424677736 - Hotfix: overlay was a pointer 2014-06-13 07:55:47 +04:00
Ivan Savenko
6205d07223 Re-enabled video player, should now work with SDL 2 2014-06-13 07:55:46 +04:00
AlexVinS
47979d28bb Remove broken assertion 
* this restores music support
 2014-06-13 07:55:46 +04:00
Ivan Savenko
8eb661461c - vcmi compiles with SDL2 on Linux, video player is disabled for now 2014-06-13 07:55:45 +04:00
AlexVinS
3db7fb4f63 Still try to fix opengl backend 
- no success
+ make backend selection configurable
 2014-06-13 07:55:45 +04:00
AlexVinS
d289c6a34a Prefere opengl rendering 
- broken ...
 2014-06-13 07:55:44 +04:00
AlexVinS
5bb3d859eb Nice fullscreen mode++ 2014-06-13 07:55:44 +04:00
AlexVinS
04aa76b842 Fix arrow keys moving on adventure map 2014-06-13 07:55:43 +04:00
AlexVinS
6474e37b76 try to fix hotkeys 2014-06-13 07:55:43 +04:00
AlexVinS
ac2896da42 Implemented SDL2 unicode input. Hotkeys are sill broken. 2014-06-13 07:55:42 +04:00
AlexVinS
d50976bf4a restore some SDL1 code in CMT.XXX 2014-06-13 07:55:41 +04:00
AlexVinS
0ef16feca9 Refactoring towards backward compatibility (WiP) 2014-06-13 07:55:41 +04:00
AlexVinS
1597254399 just a few tweaks and it works! 
* enable video again
* set default bpp to 32 - SDL2 dont like 24 bit resolution
* now almost everything looks as expected (some issues are present though)
 2014-06-13 07:55:40 +04:00
AlexVinS
6890c2650b fix keyboard state access 
* is somewhat playable already!
 2014-06-13 07:55:40 +04:00
AlexVinS
cd81e85a61 fix loading to pregame. Looks awful. More work to do. 
* video temprorary disabled
* multithread loading seems to be broken - disabled
 2014-06-13 07:55:39 +04:00
AlexVinS
e072b2664f fix pixel format 
* now it shows intro video (but then crash ...)
 2014-06-13 07:55:39 +04:00
AlexVinS
62d42465de fix compilation 
* may not even run
* text input disabled
 2014-06-13 07:55:38 +04:00
AlexVinS
796905ec42 change VCMI_client.cbp to new externals layout 
* it will not compile of course
 2014-06-13 07:55:38 +04:00
Haryaalcar
11955605b5 sorting by filename implemented for save and load screens 2014-06-11 00:03:08 +03:00
Ivan Savenko
44742814cd More cleanup: 
- moved SoundBase.h to lib since it contains shared data
- added RMG info to object format. Note that data is not yet imported in
configs
- slightly updated API of object handlers
 2014-06-05 23:51:24 +03:00
Ivan Savenko
b2e8c92383 Cleanup: 
- removed commented-out #includ'es
- renamed some files to match name of class
 2014-06-05 20:26:50 +03:00
Ivan Savenko
652ceb2bde Finally shattered CObjectHandler.cpp into tiny bits 
- This file is now split into multiple smaller files in mapObjects
directory
- CObjectHandler itself now contains only core classes (Handler itself,
CGObject and interfaces)
- Cleaned up excessive #include's through whole project
 2014-06-05 19:52:14 +03:00
Ivan Savenko
0afdfa529c Moved all object-related files to lib/mapObjects directory. 
Renamed some classes to more readable names
 2014-06-05 14:19:47 +03:00
DjWarmonger
62e9f13b08 - Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426 
- Some primitive way to randomize treasures
 2014-06-04 10:16:08 +02:00
Ivan Savenko
32b6568b65 Merged changes from upstream and fixed compilation caused by API changes 2014-06-03 22:45:18 +03:00
beegee1
a87363c0f1 - fixed mantis #783 - play sound when entering message in chat box 2014-06-01 18:48:40 +02:00
Ivan Savenko
1d17d60449 gcc update: 
- removed support for 4.6
- compilation fixes for 4.7
 2014-05-29 13:42:05 +03:00
karol57
dd33fd51a8 int3 dist2d microoptimization 2014-05-25 20:42:25 +02:00
Ivan Savenko
7f276185bd Moving files: 
- new config for objects (config/objects/generic.json)
- renamed lib/CDefObjectHandler to lib/CObjectClassesHandler
 2014-05-24 02:07:54 +03:00
Ivan Savenko
6bd6be0835 Object class handler is now a proper "handler" 
- Some changes in interfaces
- Fixed some missing fields in serialization
- Moved object names to new handler
 2014-05-24 01:56:51 +03:00
AlexVinS
8a3b997fa5 fix a few comments. No code changes. 2014-05-21 13:02:20 +04:00
DjWarmonger
1ea6723a32 Merge pull request #8 from xyzz/android-rolling 
Android port.
 2014-05-17 05:17:54 +02:00
Ivan Savenko
b5160acbac Finalization of object type handler interface 
- updated code to use new interface
- removed old DefObjHandler (todo - rename file)

Summary:
- most code but loading is now in place
- type names may deserve improvements (some of them are too similar)
- still barely compiles and not tested
 2014-05-16 23:50:02 +03:00
Ilya Zhuravlev
db7cd79cf7 Android port. 
Conflicts:
	lib/vcmi_endian.h
 2014-05-16 23:24:29 +04:00
beegee1
80765eb0a3 - fixed clang compiler warnings (detects now unused constant vars) 2014-05-16 19:22:21 +02:00
DjWarmonger
1dbc0c7177 Compilation fix. This will be released as VCMI 0.95b. 2014-05-02 12:19:50 +02:00
DjWarmonger
fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup 
Conflicts:
	client/CKingdomInterface.cpp
 2014-05-02 12:03:02 +02:00
Macron1Robot
9976fcc671 Update GUIClasses.cpp 
spaces change
 2014-04-29 22:25:30 +04:00
Macron1Robot
fd1640f931 Update GUIClasses.cpp 
Removed excessive check for tavernVideo string
 2014-04-29 13:06:55 +04:00
DjWarmonger
4a71442c80 Missing changes. 2014-04-27 14:38:20 +02:00
DjWarmonger
f418b468c4 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-04-27 12:49:29 +02:00
Macron1Robot
8ec7a9b919 Moved "max heroes on map per player", "max heroes available for player" to "defaultMods.json" 2014-04-27 10:43:46 +04:00
Macron1Robot
907caedb13 Added "produce" section in "building" structure. Changed dailyIncome. 2014-04-26 18:23:35 +04:00
Michał Janiszewski
bece1e5b1f fixed possible nullptr dereference 
* Fixed a switch() statement in InfoBoxHeroData::getValueText that
  could result in nullptr dereference. If 'type' was HERO_MANA and
  'hero' was nullptr, a fallthrough would occur to HERO_EXPERIENCE,
  where 'hero' would we be dereferenced.
* Fixed line endings.
 2014-04-25 14:31:11 +02:00
Macron1Robot
9123c7a787 Fix for map tavern (video set to standard) 2014-04-25 01:06:14 +04:00
Macron1Robot
b7b890acff Added "tavernVideo","guildBackground" to "faction" JSON config and schema. If "primaryResource" is set to "gold", silo will generate 500 gold per day 2014-04-24 23:36:18 +04:00
DjWarmonger
9e7013de77 Backup for my own MVS project configuration 2014-04-24 21:07:43 +02:00
beegee1
1d57b75bc5 - random number generation refactoring 
- fixed mantis #1743
 2014-04-10 19:22:32 +02:00
Ivan Savenko
43ba3d30ea Breaking things - first commit towards configurable object(s). 
- New files: lib/CObjectWithReward.h/cpp
- Classes that will be replaced by configurable object are now in this
fil

Status: far from functional, currently at "it compiles" point, some
essential pieces are still missing.
 2014-04-06 23:14:26 +03:00
DjWarmonger
30b79588db - Moved gameState::guardingCreaturePosition() to CMap so it doesn't need to be recalculated many times for every player. 
- Some optimizations with local cb pinter in VCAI.
 2014-04-01 11:53:28 +00:00
Ivan Savenko
771c1ce255 - some effords to get rid of bottlenecks in AI code 
- fixes, probably partially #1577
- enabled code for reading map object templates from json, still not
used
- disabled PCH for launcher due to speed issues.
 2014-03-23 16:36:16 +00:00
Ivan Savenko
9c0df68cb8 Fixing spelling mistakes. Patch from josch, fixes #1759 2014-03-23 12:59:03 +00:00
Ivan Savenko
760ae7d44a Changes related to Debian packaging, based on josch patch 
- AUTHORS file is now in UTF-8
- tags for desktop files
- fixed some typos
- better reaction on --help and --version commands
- vcmibuilder should work with both avconf and ffmpeg
 2014-03-20 18:17:40 +00:00
beegee1
fe1b16a7ec Some preparation towards mantis #1743: 
- refactored CRandomGenerator (added util methods, improved method names)
- usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced)
- refactored getArtSync method of CArtHandler -> now named pickRandomArtifact
- fixed some compiler warnings
- updated source code URL in VCMI spec
 2014-03-17 19:51:07 +00:00
alexvins
9cac0af7be [Spells] More spell related refactoring 
+ smart target modifier
- CREATURE_EXPERT_MASSIVE target type
* save format changed

spell format changes already documented in http://wiki.vcmi.eu/index.php?title=Spell_Format
 2014-03-17 13:11:10 +00:00
alexvins
065b8366fb [Spells] Added basic support for icons and sounds 
* few changes in spell format
* save format changed
 2014-03-10 16:00:58 +00:00
Ivan Savenko
d2ae847ecf - files in local directories (saves & configs) now always have higher 
priority than mods. Fixes #1685 and #1733
- fixed possible crash on exit in dispose() function
- (vcmibuilder) fixes problem with partial mp3 -> ogg conversion
 2014-03-08 16:05:23 +00:00
alexvins
4203d69525 Part 2 of new spell configuration 
1) spell handler refactored to support modding in general way
2) imunnity icons moved to WoG as they depends on wog`s graphics
3) introduced new class template for handlers (todo: use this in other handlers)
4) save format changed
5) introduced "absolute immunity" - unaffected by "the Orb" etc. (todo: use it in config)
6) new format documented on wiki, added json schema.

* more split of registertypes - fixes 32 mingw build
 2014-03-07 13:21:09 +00:00
Ivan Savenko
5cbec833c2 - (linux) XDG filesystem support 
BIG NOTE TO LINUX USERS
All user data has been moved according to XDG specs:
- Game data (H3 files and mods) and saves: from ~/.vcmi to ~/.local/
- Temporary files, including logs: from ~/.vcmi to ~/.cache/vcmi
- Config files: from ~/.vcmi/config to ~/.config/vcmi

For compatibility VCMI will read game data from ~/.vcmi as well but this
is temporary behavior and will be removed
 2014-03-04 14:51:10 +00:00
stopiccot
7356145c3a updated LD_RUNPATH_SEARCH_PATHS 2014-03-04 03:51:17 +00:00
Michał W. Urbańczyk
2c52617c1d Fixed video flickering in the campaign intro screen. 2014-03-01 18:50:50 +00:00
Michał W. Urbańczyk
f6c2c96cdc Copyright update. 2014-03-01 18:46:54 +00:00
Michał W. Urbańczyk
03fbd4e8a7 Fixed tracking autosaves. 2014-03-01 17:35:56 +00:00
Michał W. Urbańczyk
a6f68d6870 Fixed #1726. 2014-03-01 13:42:23 +00:00
DjWarmonger
b8b809bd50 Fixed #1667, #1669 2014-02-28 17:49:56 +00:00
Michał W. Urbańczyk
93856dbe98 Quick solution for #1688. 2014-02-27 20:44:20 +00:00
Ivan Savenko
e101caa997 Fixed possible buffer overflow on visiting tavern 
Introduction of unicode made fixed-length buffers too short in some
cases
 2014-02-26 21:20:36 +00:00
Ivan Savenko
78609871ae bugfixing: 
- fixed parsing of campaign bonuses (conversion to building ID)
- CONTROL event condition can be also fulfilled by allies
- fix for crash on opening exchange window in Russian version
 2014-02-26 17:32:42 +00:00
Ivan Savenko
8d36bcabce Split registerTypes into multiple files, now in lib/registerTypes 
directory in order to reduce huge memory usage by gcc
 2014-02-24 19:57:33 +00:00
Michał W. Urbańczyk
1e555a8ee3 Improved serializer. See: http://forum.vcmi.eu/viewtopic.php?p=11562#11562 
Save format changed, removed compatibility workarounds.
 2014-02-19 01:04:27 +00:00
alexvins
d01b84b460 [mechanics] fix copy-paste errors in magic skill arrays 
[c::b] few tweaks to configuration
 2014-02-15 09:40:33 +00:00
Ivan Savenko
48d6e2cd59 - move campaigns description into new config file, campaignSets.json 
- campaigns parser uses binary reader, fixes #1711
- fixed description of change resolution button
 2014-02-14 22:46:06 +00:00
Ivan Savenko
e6f433795b - fixed some crashes on staring a map/campaign 2014-02-08 21:05:24 +00:00
Ivan Savenko
562dc02b3b - fixed crash on decompressing some files from gzip stream (reported on 
forums)
 2014-02-08 10:30:10 +00:00
beegee1
95034b9fa0 - Updated PCH to use our StdInc.h as the prefix header (not generated one from cotire) -> no exclude headers from ffmpeg/etc... statements required 
- Fixed compilation error (VCAI ResourceSet logging)
 2014-02-05 20:25:36 +00:00
Michał W. Urbańczyk
55271e621b Possibility to switch autoskip in the runtime. 2014-02-02 14:39:32 +00:00
Michał W. Urbańczyk
55165a8535 Fixed #1686. Compatibility measures to be removed later, when format changes become to big. 2014-02-02 14:31:56 +00:00
Ivan Savenko
14535c1c7b - fixed crash on finishing a campaign. 2014-02-01 14:32:09 +00:00
beegee1
df0a28d9cb - added PCH compilation for CMake using cotire module (PCH is OFF per default, can be enabled with ENABLE_PCH=ON) 2014-02-01 13:37:26 +00:00
Michał W. Urbańczyk
be3bd35b95 Hopefully fixes #1677 and its duplciates. 2014-02-01 13:35:03 +00:00
beegee1
d4fd361d4b - fixed #1643 -> hero placeholder handling 
- fixed bug when loading victory/loss conditions of the 3rd scenario in the first ROE campaign
- fixed bug when loading artifacts to hero of the 3rd scenario in the first ROE campaign (due to corrupt H3M map)
- implemented function object to quickly find a object by it's sub ID in a list
- added netbackbase.h to header list in CMake
- removed false message which said that the server loaded the map successfully
 2014-01-30 18:56:31 +00:00
Ivan Savenko
3779a54ddd - probably fixed 1671 
- fixed missing loss condition in Birth of Barbarian
- fixed some bugs found by cppcheck
 2014-01-30 11:08:37 +00:00
alexvins
16d6292be9 [refactor] extract often used classes from lib\NetPacks.h to separate header - less dependecies on whole packets class tree 
[mingw build] fix linking issues with netpacks. 
Mingw build is finally fixed! 

[c::b] update projects

[config] fix and cleanup spell_info.json
 2014-01-16 20:24:06 +00:00
Ivan Savenko
47c91e03b5 - fix to last commit 
- workaround to crash on disabling auto-battle (somehow client
"remembers" one command given during auto-battle)
 2014-01-14 14:34:08 +00:00
Ivan Savenko
c5b74a2dce Miscellaneous fixes: 
- proper block of "back" button in campaign menu.
- proper block of AI switch in battles
- vertical garrisons can now be attacked from top
- better UI logging, vcmi will print to log file all pressed buttons
- server will not try to build already existing building
 2014-01-13 17:44:21 +00:00
Ivan Savenko
fb5c9fc972 - creatures availability tests no longer check for built buildings. 
Fixes #1650
- do not crash if town has 0 creatures on some dwelling level
- do not crash if dwelling for some level is not present in town at all
 2014-01-11 18:12:09 +00:00
Michał W. Urbańczyk
0b2ca4416a It is possible to use ffmpeg with Visual Studio 2013 build by definining USE_FFMPEG macro. 2014-01-06 19:12:21 +00:00
alexvins
a740f7989c [c::b] update projects, disable PHC for now, +few fixes (still wip) 2014-01-05 17:48:50 +00:00
Ivan Savenko
1f325bafb3 fixes #1619 and #1647 
- removed some no longer needed code from map handler
- blocked "back" button on campaign map screen if some of scenarios are
already completed
 2014-01-05 13:45:44 +00:00
alexvins
339e1cd98b [c::b] project file for minizip, lib & client update (wip) 2014-01-03 15:43:54 +00:00
Ivan Savenko
2c4c964a45 Large rewrite of adventure map objects: 
- replaced CDefObjInfo with ObjectTemplate class
- ObjectTempate is a direct member of objects instead of pointer with
shared ownership across CMap, handler and game objects
- simplified handling of objects that can change appearance (e.g. towns)
- all object queries regarding object appearance/blockmaps use h3m pos
instead of relative positions
- removed need of modhandler::reload
- cleanup of some old code
 2014-01-02 23:48:38 +00:00
Ivan Savenko
7e02f6b670 Support for overriding victory/defeat conditions from h3m map or 
campaign:
- new file MapFormatJson that implements small subset of Json map
format, as described on wiki
- vcmi will read overrides from file config/mapOverrides.json (currently
empty)
- Json writer for logical expressions

TODO: write data for map overrides
 2013-12-30 23:09:58 +00:00
DjWarmonger
51e6961d08 Compile fix for MVS. 2013-12-29 15:48:56 +00:00
Ivan Savenko
96cc1b0e75 fixed slow loading of map selection window 2013-12-29 12:18:02 +00:00
Ivan Savenko
0c5be52a42 Win/loss conditions based on logical expressions, yet another large 
changeset:
- victory/defeat will be detected using triggered events
- vcmi will convert h3 conditions into set of triggered events
- it is possible to either change number of days without towns or even
remove this loss condition completely
- possibility of custom win/loss text and icons in pregame (no longer
connected to win/loss conditions)

Still missing:
- No interface to pass custom events/victory conditions into the game 
- AI would benefit from improvemets (handle all victory conditions,
select best one to fulfill)
- You have X days till defeat message still hardcoded to 7 days
 2013-12-29 11:27:38 +00:00
Ivan Savenko
f6c1dace6c Minors: 
- By default, cmake will keep debug info
- removed warnings from adventure map infobox (part of #1636)
- adventure map infobox will refresh on artifact changes (part of #1636)
- moved terrain music files to terrains.json file
- player should act before AI in all games, not only campaigns
 2013-12-28 18:57:08 +00:00
beegee1
11ca1ec1f8 - Fixed custom main hero handling (map options) 
- Refactoring
 2013-12-23 15:59:37 +00:00
Ivan Savenko
41cb1603e1 Fix for #1624 : 
- recreate adventure map interface on each scenario (to make sure that
there is no garbage data from prev. game)
- added check to avoid such situations in future
 2013-12-20 15:00:48 +00:00
beegee1
68bdf71db6 - Fixed GCC compiler warnings 
- Implemented move heroes to next scenario partially
 2013-12-20 13:07:58 +00:00
Ivan Savenko
29f4a12814 - fixed some evil memory leaks 
- fixed recursive dependency of castles
 2013-12-19 19:43:16 +00:00
Ivan Savenko
881a7cf862 - added check to avoid recursion in AI town building code 
- restored previously missing AI shield during AI turn
 2013-12-19 17:29:35 +00:00
beegee1
f0cbbbdb70 - Refactored method CGameState::init 2013-12-18 18:18:12 +00:00
beegee1
61fc216a6f - Fixed mantis #1421 
- Fixed initial map selection in campaign bonus screen
 2013-12-17 17:14:55 +00:00
beegee1
d1002f7e8f - Fixed starting another map from campaign bonus selection screen while playing a campaign mission 2013-12-17 12:12:25 +00:00
beegee1
b9b25ef552 - Fixed mantis #1422 (starting another scenario crashes VCMI for now) 
- Refactoring
 2013-12-16 18:39:56 +00:00
stopiccot
c5e0e48d98 Some OS X related fixes 2013-12-13 11:51:15 +00:00
beegee1
69eee05ccc - Partially fixed mantis #1065 (Gate with hex 95 can't be attacked) 
- Fixed 'catapult tried to attack non-catapultable hex!' problem, now catapult attacks attackable wall parts only
- Fixed problem that the server performed applying damage on a wall part twice
- Added methods for checking what wall parts are attackable and if a wall part is potentially attackable
- Added functionality to trace net packages
- Added functionality to trace std::vectors
- Added tracing for CatapultAttack(CPack)
- Updated various toString methods to use {} instead of []
- Refactoring
 2013-12-08 17:54:13 +00:00
Ivan Savenko
5de70ba235 Minor fixes: 
- properly re-enable necessary mods during update
- do not crash if building border is fully-colored
 2013-12-08 10:07:06 +00:00
beegee1
f2cc630e2c - Show confirmation dialog when pressing Alt + F4 to quit the game 2013-12-07 18:26:15 +00:00
beegee1
6caac8e82b - Fixed mantis #1613 2013-12-07 10:04:17 +00:00
beegee1
2d095cf20a - Fixed days without castle counter 
- Fixed 'you have only 0 days...' message
- Checks victory/loss conditions every player turn instead of every day
- Fixed mantis #1463
 2013-12-06 19:44:11 +00:00
Ivan Savenko
b1e638d1af More fixes: 
- logical expressions should compile without cpp include
- fixed #1608 and #1610
 2013-12-04 03:54:02 +00:00
DjWarmonger
b3b523b768 Compile fixes for MVS. 2013-12-03 15:24:13 +00:00
Ivan Savenko
ee1b0459e6 Extended building dependencies: 
- buiding/structure lists must use object format. This may break some
outdated mods.
- generic support for logical expressions that consist from and/or/not
operators.
- string ID's for buidings are now actually used.
 2013-12-02 11:58:02 +00:00
DjWarmonger
21c18e44a0 Components of combined artifacts will now display info about entire set. 2013-12-01 13:08:35 +00:00
beegee1
36a69aaa2f - Fixed VS project files (added missing .cpp files) 
- Structured VS project files (added a filter for every subfolder)
 2013-11-30 14:22:03 +00:00
beegee1
41e274b4aa - Moved FunctionList from /client to /lib -> used in client and server 
- Updated project files
 2013-11-30 10:08:38 +00:00
beegee1
c786a3076a - Refactored victory loss condition checks 
- Added toString() method to EVictoryLossCheckResult enum class to improve debugging
- Removed mostly unused CFunctionList2
- Added missing header files for vcmiclient project to CMakeLists
- Tweaked SDL suggests bpp message a bit
- Added showInfoDialogAndWait (info dialog and waits, used from client thread) and showOkDialog (callback to ok click, used from GUI thread) to player interface
- Added showOkDialog method to CInfoWindow (unused for now, but may be used later)
 2013-11-30 09:43:31 +00:00
Ivan Savenko
27a30b5ff9 - compile fix 
- fixed crash if json defines only one creature horde
 2013-11-24 11:36:51 +00:00
beegee1
3e4407593f - Refactoring for checking victory/loss conditions (use enum class instead of magic numbers) 
- Improved showing player lost message for one special case
 2013-11-17 17:57:04 +00:00
Ivan Savenko
2b6cdd5f41 - (linux) launcher will be available in OS start menu/launchers as 
"VCMI" and client will be present as "VCMI Client"
 2013-11-16 18:13:30 +00:00
Ivan Savenko
3560bbb7f3 two patches/pull requests from janisozaur 
- replace our custom bmap with std::map::at()
- compile fixes for editor
 2013-11-12 10:45:42 +00:00
beegee1
237e4272da Fixed mantis #1485 2013-11-10 15:04:29 +00:00
beegee1
e01ef8e36a - Fixed mantis #1576 (doesn't hang game) 
- Implemented output stream operator<< for various classes(BattleAction, BattleHex,...) to improve debugging and logging
 2013-11-09 16:25:20 +00:00
Ivan Savenko
55577d0ac4 - fixed missing DLL_LINKAGE 
- use precalculated checksum for zip files
- UNUSED macro to silence some warnings
 2013-11-09 13:49:36 +00:00
Ivan Savenko
ee6cdbeffe went through the rest of cppcheck warnings, mostly harmless 2013-11-07 12:48:41 +00:00
Ivan Savenko
71d6b0fea9 - Fixed some warnings from cppcheck 
- Minor improvements to JSON validation
- Cleanup in SDL_Extensions.cpp
- Implemented new propery for creature format: idle animation duration
- Disabled idle animation of some of conflux creatures (was clearly
broken)
 2013-11-06 13:42:58 +00:00
beegee1
86b7feeab3 - Fixed mantis #1248 
- Fixed spellbook page save positions for hotseat mode
 2013-11-03 18:16:25 +00:00
beegee1
94bee3fd1b - Changed visibility of curInt member of BattleInterface from public to private and provided a getter method 2013-11-03 16:44:47 +00:00
Ivan Savenko
0e3eae3095 patch from KroArtem 2013-11-03 12:51:25 +00:00
Ivan Savenko
c4716d0a9a - reordered files in cmake so files with long compile times will be 
compiled first.
- changed format of modSettings.json, VCMI should properly update file
on the first run.
- implemented property "defaultTavern" that acts as default value for
"tavern" entry in hero class and town formats.
 2013-11-03 12:07:23 +00:00
beegee1
aa1c193b88 Fixed mantis #1582 2013-11-02 20:07:45 +00:00
Ivan Savenko
6cb3cb006d Several minor fixes/features 
- moved all traslatable strings into one json file, removed threats.txt file
- implemented "spellbook animation" option
- fixed missing central tower when attacking fort
 2013-10-27 13:05:01 +00:00
Ivan Savenko
9237e6d97d Improved json validation 
- split JsonNode.cpp into JsonNode and JsonDetail files
- validation should be notably faster (at least 10% faster loading)
- support for "format" field, allows checking existance of files.
- minor fixes in schemas
- msk/msg files are now optional
 2013-10-26 19:33:34 +00:00
Ivan Savenko
e2c037402c Unicode support. 
- boost-locale library is now required (boost 1.48 or higher)
- Unicode namespace that contains UTF-8 handling
- All non-ASCII strings from H3 data will be converted to UTF-8 during loading
- All JSON files MUST use UTF-8. 
- H3 data encoding can be selected via launcher or directly in config file
 2013-10-25 21:45:14 +00:00
Ivan Savenko
f6a3d6770f - chinese fonts now use fallback to H3 fonts for ASCII characters 
- proper messages for not implemented main menu entries
- some cleanup of CMessage::breakText()
 2013-10-20 21:53:27 +00:00
Ivan Savenko
f838cceddd - fixes Inferno Castle Gate 2013-10-17 13:54:12 +00:00
Michał W. Urbańczyk
d5263d75f8 Fixed #1490. 2013-10-13 17:37:59 +00:00
stopiccot
cbc8cde10a some OS X fixes 2013-10-07 01:19:02 +00:00
Ivan Savenko
d09294e40a compile fix, fixes blit order of heroes in siege 2013-09-30 08:45:26 +00:00
Ivan Savenko
84dea676f2 compile fix, fixes missing end-of-line #1483 2013-09-28 13:32:49 +00:00
Michał W. Urbańczyk
0abbe71b25 Merged fixes from the branch. 2013-09-28 00:58:33 +00:00
Michał W. Urbańczyk
c6c53a5b1e Few more freeze-related fixes. 2013-09-28 00:30:12 +00:00
Michał W. Urbańczyk
d1807585ad Fixed at least two #1428 freezes, likely more. 
They were occurring when AI hero visited bank that was also guarded by neutral creature nearby,
 2013-09-27 23:46:58 +00:00
Michał W. Urbańczyk
4f29b526ca The battle callback method battleGetAllStacks will by default omit the arrow turrets. Fixes #1453, #1455 and related. 2013-09-27 19:42:17 +00:00
Ivan Savenko
eb6ff6b114 fixes #1482, add one pixel spacing for Chinese fonts 2013-09-25 21:15:15 +00:00
DjWarmonger
1ea9dab30d Creature abilities without any name (but with graphics) will display in creature window. 2013-09-25 10:41:32 +00:00
Ivan Savenko
208df34fc2 bigfixing & new file: launcher/jsonutils.cpp 
- launcher uses json parser from vcmi lib instead of one from Qt #1469
- fixed abilities overrides for some creatures #1476
- fixed hero portraits in seer huts #1402
- ttf fonts will render text in utf-8 mode. Not really useful at this point
- new settings entry, available in launcher: encoding. Unused for now.
 2013-09-21 18:29:26 +00:00
DjWarmonger
d06b02638b Partially implemented #481 2013-09-17 12:02:33 +00:00
Michał W. Urbańczyk
d4a8e90460 Fixed #1448, #1470 2013-09-14 19:09:35 +00:00
Michał W. Urbańczyk
291da5e893 Fixed #1442, likely a few others as well. 2013-09-12 22:33:08 +00:00
Michał W. Urbańczyk
b62bb096a7 Fixed #1430, work-around to make #1435 non-crashing. 
Fixed at least one of the #1428 infinite turns cases.
 2013-09-11 21:57:08 +00:00
Ivan Savenko
6331995afd minors: 
- fixes missing line of pixels with Chinese fonts
- disabling a mod won't disable all its requirements as well
 2013-09-08 18:35:09 +00:00
Ivan Savenko
e13dc872e0 - support for Chinese fonts (GBK 2-byte encoding) 
- fixes #1446
 2013-09-08 16:49:23 +00:00
Ivan Savenko
42879225f0 minor fixes: 
- don't crash if image can't be player-colored (no palette)
- fixes #1447
- compile fix
 2013-09-08 13:02:34 +00:00
Ivan Savenko
76c77d58f6 const-ified CTown. May fix #1444 2013-09-06 21:57:16 +00:00
Michał W. Urbańczyk
385f4ab7f5 #1153 and #1395 should be fixed. Terrible, terrible, terrible. 
Fixed crash in battles, when attempted to access <0 screen coordinates.
 2013-09-01 22:55:57 +00:00
Ivan Savenko
708b0c6f47 - fixes #1424 - added missing override and CLabel::visibleText() 2013-09-01 17:34:46 +00:00
Ivan Savenko
7f43150bb9 - fixes #1423 - convert values to int before using 2013-08-31 00:21:29 +00:00
Ivan Savenko
fba4c2cf9e - fixes #874 2013-08-30 13:19:08 +00:00
Ivan Savenko
8ac6a1fcf4 - fixes 1394 2013-08-29 20:35:24 +00:00
Ivan Savenko
83440f1149 A bit more text-related work: 
- credits screen will use multi-line label instead of hackish usage of text box
- campaign intro movie player now plays voiced intro
- minor fixes to last commit
 2013-08-29 16:41:14 +00:00
Ivan Savenko
6bee105d7d Some refactoring of text display widgets: 
- renamed some methods/classes with better names + some consistency (no more print, setTxt and setText that do exactly same thing)
- TextBox now contains label widget instead of inheriting it
- smooth scrolling support (up/down buttons still scroll one line)
 2013-08-29 13:46:27 +00:00
Ivan Savenko
db1dc1dcc6 - fixed terrain music restarting every tile 
- field "contact" for mod.json schema
 2013-08-20 10:47:40 +00:00
Michał W. Urbańczyk
3b42cff3ec #1409 should not crash anymore. 
Fixed crash on serializing empty path. [How did it got there...?]
operator<< for boost::optional.
 2013-08-18 15:46:28 +00:00
Ivan Savenko
45c2bd7511 hopefully fixes #1397. Still too much magic in this code :( 2013-08-09 17:37:41 +00:00
Ivan Savenko
8beee29482 - corrected "isToReverse" check, partially fixes 1397 
- ballistics fix
- minor
 2013-08-06 15:25:51 +00:00
Ivan Savenko
c81a31c74a - catapult attacks should be identical to H3 
- catapult may miss and attack another part of wall instead (this is how it works in H3)
- minor fixes
 2013-08-06 11:20:28 +00:00
Michał W. Urbańczyk
58ccaa2e93 The cmath "fix" was not needed after all, the includes order decides. 2013-08-02 08:28:52 +00:00
Michał W. Urbańczyk
c57b159fc9 Missed one call. 2013-08-01 22:36:49 +00:00
Michał W. Urbańczyk
f897333b2c Don't crash when music file cannot be found. 2013-08-01 13:52:01 +00:00
Michał W. Urbańczyk
7a90ead051 VS-2013 issue. 2013-08-01 11:58:30 +00:00
Ivan Savenko
b57b14b752 - fixed several bugs with siege graphics, including #1389 
- removed "shooterHeight" property - seems to be same in all towns.
 2013-07-31 22:24:44 +00:00
Ivan Savenko
ee09c5301e minor fixes: 
- vcmi can play music files from archives
- converted resource_reward fields in bank_config into json object, fixes 3000 gems reward in shipwreck
- some compile fixes for minizip
 2013-07-31 11:36:42 +00:00
Ivan Savenko
1d9139303a introduced zip support into vcmi 
- minizip library is now part of sources, located at lib/minizip
- cmakefiles will compile minizip as dynamic library (Note: only 2 files used by vcmi are included in minizip.so)
- zip files can be loaded similar to other archives via filesystem.json
- mods can use Content.zip instead of Content/ directory. Files in directory will replace files in archive.
 2013-07-30 15:02:55 +00:00
DjWarmonger
d8594576e2 One more compile fix, works now fine on Windows. 2013-07-29 12:15:50 +00:00
Ivan Savenko
77496bcea9 - fixed several cases of accessing full path to files in archives 2013-07-29 11:38:18 +00:00
DjWarmonger
a314a81fd5 Compile fixes. Game doesn't even launch, however. 2013-07-28 18:57:07 +00:00
Ivan Savenko
b87897096c Filesystem handling is now more flexible 
- removed CResourceLoader class in favor of one that implements resource loader interface
- removed global pool of files, in favour of more dynamic approach
- renamed some files to match current situation
All these changes are needed mostly for future mod manager + .zip support
 2013-07-28 14:49:50 +00:00
DjWarmonger
5f310aa20f Fixed all issues with Resurrection: #123, #1358 2013-07-27 19:01:31 +00:00
DjWarmonger
b36be10e30 2013-07-25 11:53:36 +00:00
DjWarmonger
66d6aebe32 Fixed all the issues with Quests, #828 and #1223. 
Upgrade cost will never be negative.
 2013-07-23 15:03:01 +00:00
Ivan Savenko
a719e03b30 - fixed #1375 
- damage done by turrets is properly increased by built buldings
 2013-07-22 16:23:23 +00:00
DjWarmonger
4fd9bcfedc Fixed #1345 2013-07-22 10:39:11 +00:00
Michał W. Urbańczyk
d8a27d8f3c Refactored player-specific data into single struct BattleState. 2013-07-21 22:01:29 +00:00
Ivan Savenko
491bd557ef fixed several bugs reported on forum: 
- necromancy issues
- fix for lookout tower
- Sir Mullich is unavailable
- first hero is awakened on next turn
- give 500 XP on defeating hero
 2013-07-21 18:27:33 +00:00
Ivan Savenko
a148c39e0a more battles animations: 
- UI will be correctly greyed-out during opponent turn
- fixed remaining issues with blit order
- a bit better handling of catapult attack
- fixes #1362
 2013-07-21 10:10:38 +00:00
Michał W. Urbańczyk
e9d51a2670 Fixed issue that allowed to build multiple boats in town. Renamed state() to sth more sensible. 2013-07-21 10:08:32 +00:00
Michał W. Urbańczyk
e45d174ba5 Fixed crashes on Land Mines / Fire Wall casting. 2013-07-20 21:35:12 +00:00
Ivan Savenko
096d6ebf9c refactoring of CBattleInterface::show() and all related code 
fixes most of blit order-related bugs in battles (#1200, #1238, #226)

known issues, will fix soon:
- there are still some minor blitting issues during movement
- destruction of walls in siege is out of sync with catapult projectile movement
 2013-07-19 16:35:16 +00:00
DjWarmonger
b925a75ecc Tweaked Frenzy spell which now ends at the beginning of stacks turn, not at the end of turn (#1332). 2013-07-17 10:54:07 +00:00
Ivan Savenko
43db5587a1 - minor fixes to battle animations 
- fixes crash on siege start
 2013-07-16 22:59:39 +00:00
Ivan Savenko
1a77fee7f7 more improvements for battle animations 
- synchronized attack/defence animation
- spell animation speed uses game settings
- added logging domain for battle animations

- fixed disrupting ray duration
 2013-07-16 18:12:47 +00:00
DjWarmonger
4f7c6b8d34 Fixed #688 2013-07-15 08:51:48 +00:00
Ivan Savenko
91cd88ba97 - compile fix for OSX 2013-07-11 20:10:17 +00:00
Michał W. Urbańczyk
d4ce091d2b A patch from Gernsworth related to #1204 — spell effects will be layered along with the creatures. 2013-07-10 10:45:51 +00:00
Ivan Savenko
4ac2a6e8b6 minor refactoring of VCMIDirs, bugfixing 
- VCMIDirs represent XDG specification more closely (partial #1310)
- Minor bugfixing, including #1327 #1328 and #1306
 2013-07-08 20:55:22 +00:00
Ivan Savenko
410ec92668 Minor fixes: 
- removed unused functionality from CCreatureAnimation
- simplified postioning of units in battle, should fix remaining issues with unit positioning
- fixed unit tests compilation
 2013-07-07 19:44:08 +00:00
Michał W. Urbańczyk
516684aaab Visual 2012 compile fixes. 
Unfortunately no C99 math nor uniform initialization till VS 2013.
 2013-07-07 08:27:27 +00:00
Ivan Savenko
146a5e5ef8 Made speed of most of battle animations time-based 
- speed of creature-related animation no longer depends on framerate
- most of values from cranim.txt are now used correctly
- removed BMPPalette struct in favor of SDL_Color
- animation group "DEAD" that is used to display dead stacks, by default consists from last frame of "DEATH" group

Notes:
- animation speed may still need some adjustments
- range of config property "battle/animationSpeed" has been changed. This may result in extremely fast animation. To fix - change animation speed via options.
 2013-07-06 16:10:20 +00:00
Michał W. Urbańczyk
a1f545792b Compile fixes specific for VS 2012" 
* Reverted std::bind to boost::bind. std::bind on Visual 2012 doesn't work in some cases (especially with std::ref), not sure why [but it seems to be a bug, since 2013 preview compiles the same code fine]. 
 * Move assignment operator for VS 2012.
 2013-07-02 15:23:32 +00:00
Michał W. Urbańczyk
4576719abe Visual Studio 2013 Preview compile fixes: 
* 0 is not convertible to std::function, nullptr should be used
* std::ref(rand) is not convertible to function<int()>, used lambdas (why we dont just pass "rand" ? )
* CFunctionList needs to be constructible from nullptr
* move constructor for CMapInfo (Visual cannot generate them :( )
* #ifdefed some stuff that is not needed anymore since cmath is updated with C99 stuff
* using std::make_unique instead of our vstd implementation

CSelector: 
* introduced a class in place of typedef
* Having an overloaded && || operators over sth that is convertible to bool… Wasn't a good idea after all. Purged the operators, replaced  with And/Or methods (chaining-style).
* constructor that is present only when constructing from class or function (SFINAE). std::function has an implicit converting constructor from T causing ambiguities (even if the overload would cause compile error in the body)
 2013-07-02 12:08:30 +00:00
Ivan Savenko
f82122d9be second part of c++11 update. gcc 4.5 and VS 2010 are no longer supported 
- BOOST_FOREACH -> for
- replaced several boost classes with std (e.g. unordered)
- removed gcc-4.5 workarounds
- ran clang c++11 migration tool to detect some cases:
- - pointer initialized with "0" to nullptr
- - replace for with iterators with range-based for
- - use auto in some situations (type name specified twice, avoid long iterators type names)
 2013-06-29 13:05:48 +00:00
Ivan Savenko
2b45e13c5c c++03 -> c++11 switch: 
- use std versions of function, bind and ref
- OVERRIDE -> override
- NULL -> nullptr
- use std versions of random distributions

NOTE: this may be last revision that supports gcc-4.5
 2013-06-26 11:18:27 +00:00
Michał W. Urbańczyk
1a2c8de6ad Minor improvements. 2013-06-24 14:35:27 +00:00
Ivan Savenko
dd808ef5cc bugfixing: 
- support for one more Russian localisation, fixes #1321
 - fixed icon for level 1 town hall, #1294
 - correct portraits for first heroes from mods, #1297 and probably #1298
And a lot of gcc compile fixes
 2013-06-23 19:35:54 +00:00
Michał W. Urbańczyk
17403b544c Various fixes for quick combat. 
Replaced several boost::bind usages with lambdas.
 2013-06-23 16:09:15 +00:00
Michał W. Urbańczyk
06f0a29b31 Compile fixes for gcc, as per http://forum.vcmi.eu/viewtopic.php?p=9638#9638 2013-06-23 12:36:18 +00:00
Michał W. Urbańczyk
04d11519ef Quick Combat system setting works… if user doesn't click in the meantime. 2013-06-23 11:25:48 +00:00
Michał W. Urbańczyk
2a471eeb1a Addec quick combat to system options window. 
Compile fixes [I don't know why it has compiled for me before].
 2013-06-23 07:54:33 +00:00
Michał W. Urbańczyk
4a0587d500 More work on auto-fight. 
Dynamic libraries return smart-pointers to what they create.
 2013-06-22 21:47:51 +00:00
Michał W. Urbańczyk
2be2143844 Game interfaces can register another interfaces to receive info on game events. 2013-06-22 18:22:44 +00:00
Michał W. Urbańczyk
254f194220 Some very early work towards autofight feature. 
Added EmptyAI to the solution.
Passing callbacks by shared_ptr.
 2013-06-22 14:47:20 +00:00
Michał W. Urbańczyk
06dbdd234f Further changes for duel mode. It is possible to pass names of AIs to be used by command line. Moved things in battle AI. 2013-06-21 20:59:32 +00:00
Ivan Savenko
6737c270c9 gcc 4.5 compatibility fixes. Mostly due to lack of fully finctional nullptr class 2013-06-19 21:26:27 +00:00
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
Michał W. Urbańczyk
30fb552fb4 Patch from Gernsworth fixing #1283. 2013-06-15 22:09:15 +00:00
Ivan Savenko
08b2af3ccb - fixed "get txt" console command 
- command "extract" to extract file by name
- command "def2bmp" to convert def into set of frames.
 2013-06-10 17:02:37 +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
Michał W. Urbańczyk
8bfc6a1116 A patch from O01eg: http://forum.vcmi.eu/viewtopic.php?p=9313#9313 2013-06-02 19:53:13 +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
Ivan Savenko
1c0ccd2b02 - fixed some bugs with artifacts icons 2013-05-31 11:46:19 +00:00
Ivan Savenko
3fbcf86dec - fixed broken again palette in some battle backgrounds 2013-05-31 10:25:23 +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
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
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
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
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
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
stopiccot
da659a4924 tiny fix in OS X cmake files 2013-05-01 12:30:46 +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
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
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
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
8a4f81b981 Tribool - part II. 2013-04-21 12:28:26 +00:00
Michał W. Urbańczyk
6e1464b568 Tribool - I used it wrong. 2013-04-21 12:24:54 +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
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
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
beegee1
feea589648 - Bug-fixing for last commit - Moved CMapGenOptions to CMapGenerator 2013-04-15 17:18:04 +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
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
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
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
30bcec42c6 - Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui 2013-04-07 11:52:07 +00:00
beegee1
ee51c5beb5 - Renamed /lib subfolders to lowercase 2013-04-07 10:48:07 +00:00
DjWarmonger
f39ad093b9 Compile fix. 2013-04-04 19:54:58 +00:00
Ivan Savenko
2a469d4ffc - removed hardcoded set of catapult trajectories 
- some more improvements into projectile blitting

Remaining issues:
- timing is off when catapult hits walls/tower
- catapult trajectory may need tweaking
 2013-04-04 18:20:25 +00:00
stopiccot
f2309d70dd replaced extern SDL_Surface* X; all over the code with single header 2013-04-04 14:58:54 +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
655ade9a00 - vcmi will not crash if building selection area is smaller than def 
- detection of transparency on selection area is closer to H3
 2013-04-03 16:28:50 +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
Ivan Savenko
c4c592b773 - bugfixing: #1243, #1227, #1241, #1236, #1233 2013-03-14 20:44:00 +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
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
2ee5c4b745 Fixed stack artifact (and related buttons) not displaying in creature window. 2013-03-05 08:01:14 +00:00
mateuszb
dbec99ffc7 * PlayerColor and TeamID refactoring 2013-03-03 17:06:03 +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
Michał W. Urbańczyk
8c7c4789ca Attempt to apply patch from stopiccot. 2013-03-01 21:32:26 +00:00
Michał W. Urbańczyk
01d1029b1f Fixed #1221. 2013-02-28 05:09:08 +00:00
Ivan Savenko
9c1c337a3d - fixed #1220 and #1218 
- vcmibuilder will correctly install campaign video
 2013-02-27 15:46:14 +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
Ivan Savenko
57d23c74ee patches from qdii 2013-02-25 19:17:36 +00:00
Ivan Savenko
e8c35bdb24 fixed extremely slow musicHandler compilation. Removed usage of boost bimap. 2013-02-24 10:05:56 +00:00
mateuszb
602827d1ae * MSVC compilation fixes 
* campaign epilogues and minor fixes
 2013-02-23 19:16:14 +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
Ivan Savenko
9fa59276c9 - OSX patch from stoppicot 2013-02-21 17:32:50 +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
6fdf64c2b1 Little more logging. 2013-02-18 23:10:46 +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
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
mateuszb
9e00090c42 * refactoring, a few intriguing problems remain 2013-02-13 23:55:42 +00:00
mateuszb
6d06710684 * fixes for town building campaign bonus 2013-02-13 14:21:11 +00:00
DjWarmonger
ac742affe5 Compile fix 2013-02-13 07:22:55 +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
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
DjWarmonger
4f75e47c47 Fixed crash with Firewall / Forcefield cast when there is dead stack. 2013-02-11 20:08:53 +00:00
mateuszb
8a8eecd063 * refactoring 2013-02-11 19:11:34 +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
mateuszb
d03dbf64a6 * refactoring 2013-02-09 12:56:35 +00:00
Ivan Savenko
a269b22741 - fixed incorrect appearence of hero in battle 
- vcmibuilder works with spaces in filenames
- by default output directory for vcmibuilder is ~/.vcmi
 2013-02-09 12:34:49 +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
mateuszb
f1c78e3260 * creature ID refactoring 
* double week creatures are configurable now
 2013-02-07 17:34:50 +00:00
Michał W. Urbańczyk
124d732171 * fixed race condition crash 
* no crash when there is no creature in dwelling (that should not happen at all... but)
* removed paths from vcxproj, use property sheets
 2013-02-07 15:27:22 +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
Ivan Savenko
56ffd05648 patch from stoppicot: 
1. vcmiclient now usese custom Info.plist 
 2. Original H3 game data is now also stored in Application Support folder
 2013-02-06 15:39:34 +00:00
mateuszb
3958364884 * a bit more work on campaigns; hero crossover still buggy 2013-02-06 10:16:44 +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
Michał W. Urbańczyk
17755caa10 * fixed #1199 
* fixed advancing between misisons in campaigns
 2013-02-05 20:06:13 +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
898228fd54 * minor fix for bonus selection screen 2013-02-05 19:33:09 +00:00
mateuszb
bda92a4a73 * refactoring 
* fixed bug 1143
* some work on campaigns
 2013-02-05 18:48:46 +00:00
mateuszb
25663ce7af * fixed vector<bool> serialization 
* refactoring
 2013-02-04 19:43:16 +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
mateuszb
8769f67c5d * JsonReader can convert to enums 
* refactoring
 2013-02-03 21:05:44 +00:00
Michał W. Urbańczyk
1fca96257d Fixed #1197. 2013-02-03 15:05:30 +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
Ivan Savenko
6a5af58aed (linux) version bump to 0.91 2013-02-01 08:58:14 +00:00
mateuszb
a1da195b85 * minor refactoring 2013-01-31 20:11:25 +00:00
mateuszb
4ae4b998a3 * bug 1165 fixed 2013-01-31 17:52:10 +00:00
mateuszb
5b0c6059e2 * bug 1193 should be fixed 
* minor refactoring
 2013-01-30 21:28:31 +00:00
Ivan Savenko
a82601db72 - playing a bit with ttf fonts: bugfix + shadow rendering 2013-01-29 22:43:39 +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
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
DjWarmonger
dcedfb05d2 Fix for #1187 2013-01-25 14:39:28 +00:00
DjWarmonger
dad5771a09 Workaround for new artifacts r-click descriptions, they will be displayed in same way as OH3 artifacts. 2013-01-24 08:01:43 +00:00
Ivan Savenko
080e037c54 - fix for starting towns (#1180) 
- fix for creature window (#1184)
 2013-01-23 22:09:58 +00:00
Ivan Savenko
6b3debc5ed - fixes for market window (#1182) 
- aligment issues on level-up window
 2013-01-22 23:28:10 +00:00
DjWarmonger
e5783801af Fixed #1183 2013-01-22 09:47:25 +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
DjWarmonger
a0e72785a6 Fixed doubled descriptions in creature window. 2013-01-21 09:32:51 +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
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
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
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
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
f4ee750d64 [refactor] a few more cleanups 2013-01-12 13:53:02 +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
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
mateuszb
2848fb6fef Gernsworth's patch for bug #1118 2012-12-30 18:29:15 +00:00
Ivan Savenko
e023b7d6bc another OS X patch from stopiccot 2012-12-27 09:21:30 +00:00
Ivan Savenko
96cc88ba91 - removed autotools files from ERM 
- fixed misplaced town label
 2012-12-25 15:39:06 +00:00
alexvins
9051731755 [c::b] reorganize workspace 2012-12-24 15:55:19 +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
Michał W. Urbańczyk
fa3d32925e A patch from Gernsworth that fixes #166. CGStatusBar is extended to support alignment, old CStatusBar class is removed. 2012-12-22 20:05:08 +00:00
Ivan Savenko
4e0881f689 - fixed #1167 
- CLabel will print text in "{}" using title color
 2012-12-20 13:57:29 +00:00
Michał W. Urbańczyk
bcf8cab19a Project files update/cleanup. 2012-12-19 18:23:21 +00:00
Michał W. Urbańczyk
27f8408c52 Compile fix for MSVC. 
Fixed crash when no maps are present.
Fixed crash on opening the loading screen.
Fixed crash on starting the turn when Games/ subfolder is not present.
 2012-12-19 18:19:09 +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
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
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
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
b0f669a764 - moved Sprites and Data directory to vcmi "mod' 
- some bugfixing:
- - teleporting animation fixed #1087, partially - #818
- - gui adjustments for #1093 and #1090
 2012-09-29 08:35:31 +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
7e6128b653 Assurance that #1016 won't happen again. 2012-09-28 19:18:08 +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
6c017a0fdf Fixed #1088. 2012-09-28 09:11:18 +00:00
mateuszb
0b15a634f9 * bug 1082 fixed 2012-09-27 17:16:41 +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
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
4ceb6cd272 - better fix for button borders 2012-09-26 13:50:15 +00:00
Ivan Savenko
15a7f43e11 - fixed #1075, #1080, #1081 
- fixed some warnings from cppcheck
 2012-09-26 13:13:39 +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
7fe2692bf8 * support for campaign scenarios with no bonuses 2012-09-24 19:23:11 +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
00c079f7dc * improvements for HERO campaign bonus 2012-09-23 11:26:26 +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
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
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
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
mateuszb
fb2f19b4c5 * some work on campaigns 2012-09-18 17:47:52 +00:00
mateuszb
2cf4905d9c * hopefully fixed 790 2012-09-18 15:17:32 +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
alexvins
2b2b02cccc [static analysis] [WIP] fix few possible bugs 
CBattleAnimations.cpp,CBitmapHandler.cpp,CGameHandler.cpp Possible null pointer dereference
 2012-09-16 14:36:31 +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
96a92d0f45 * fixed remaining part of #1071 — the screen surface has always to be created in the main thread 
* hold events in the queue by value (less ptr jugglery)
 2012-09-11 14:25:19 +00:00
Michał W. Urbańczyk
d935e87dd8 #1071 should be fixed. 2012-09-09 23:57:22 +00:00
Michał W. Urbańczyk
529394a4e7 Development build 0.89b 
* Updated changelog
* Some logging I did for #1066
 2012-09-07 22:43:41 +00:00
Ivan Savenko
a138db7c9e - removed lib headers from PCH 
- fixed #1062
- correct terrain penalty check
 2012-09-06 10:39:48 +00:00
Michał W. Urbańczyk
ea4841045f Fixed #1064. 2012-09-06 10:26:18 +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
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
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
d0e2f25cfe * No explosion when catapult fails to damage the wall 
* Missing abilities for Azure Dragon (tons of others are still missing...)
 2012-08-29 13:44:39 +00:00
Ivan Savenko
8fac276922 - a bit nicer stack queue. Check forum for graphics. 
- warning fix
 2012-08-28 16:28:21 +00:00
Michał W. Urbańczyk
0b85cfaf78 Fix for #1058. 2012-08-28 15:38:00 +00:00
Ivan Savenko
4d4f72292e - fixed crash on hovering indestructible walls 
- fix for music player (no music after end of battle)
 2012-08-27 20:45:58 +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
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
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
DjWarmonger
39d433c1c7 Moved game Modules to config file. 2012-08-24 09:37:52 +00:00
Ivan Savenko
e79ac5f1d7 - removed deprecated ffmpeg functions. Fixes #779 
- removed hardcoded video name constants
 2012-08-21 17:37:06 +00:00
DjWarmonger
9e0c9b4f49 Fixed #1042. Tweaks for Commander bonuses. 2012-08-20 16:10:50 +00:00
Ivan Savenko
deb22b3674 - (linux) use empty video player if av_register_protocol function was not found 2012-08-18 10:29:54 +00:00
DjWarmonger
037d4811a1 Fixed #1047 2012-08-14 06:31:14 +00:00
Ivan Savenko
eec4d3579d - fixed crash on missing videos 
- fixed savegames name selection
 2012-08-11 11:34:49 +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
d72c44e4c3 - fixed modifiers keys behaviour in TextInput 
- erm compilation is optional in cmake (too memory-consuming for old systems)
-  minor fixes
 2012-08-10 08:49:18 +00:00
DjWarmonger
d3d24d0737 Compile fix for windows. 2012-08-09 13:52:40 +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
Michał W. Urbańczyk
08bcfd1285 * windows video player uses the new FS 
* don't crash on missing sounds
 2012-08-09 07:40:47 +00:00
Ivan Savenko
94cfc99d7b - fixes #1044 
- fixes to linux video player
 2012-08-08 20:58:06 +00:00
Ivan Savenko
127600311f - linux video player uses new FS 2012-08-08 12:17:25 +00:00
Ivan Savenko
cab8955d8f - sound player uses new FS 2012-08-08 12:03:32 +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
DjWarmonger
385be09248 Foxed #943 2012-08-06 06:01:02 +00:00
DjWarmonger
75283bf0fd Fixed TextBox line breaking & slider. 2012-08-04 17:51:02 +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
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
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
Ivan Savenko
13de841e10 - minor tweaks to quest window 
- fixed #531
- fixed query crash (empty funciton)
 2012-07-21 20:16:54 +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
Michał W. Urbańczyk
79f8e0ea3c Fail gracefully when file pointed by --start path doesn't exist. 2012-07-20 20:57:18 +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
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
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
Michał W. Urbańczyk
ab0a384d31 Updated MSVC project files. 2012-07-15 15:26:12 +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
Ivan Savenko
846474af66 - fixed (partially) #1028 
- fix to last commit
 2012-07-07 14:10:47 +00:00
Ivan Savenko
55c78e9f16 - ComponentBox usage in 2 windows: levelup and build screen 
- Components have selectable image size
- fixed #794
 2012-07-07 13:32:37 +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
e3e4bc4c9c Second part of interactive Commander level-up. Quite messy. 2012-07-04 14:41:53 +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
DjWarmonger
406346a6ab Compile fix. Please do not use undefined default (?) constructors. 2012-07-03 06:28:11 +00:00
Ivan Savenko
235cf458d7 - fixed text duplication in choice windows 
- fixed compile issues
- added unused and untested for now CComponentBox
 2012-07-02 21:51:48 +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
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
Michał W. Urbańczyk
933049ee91 Updated MSVC project files. 2012-06-20 21:20:07 +00:00
DjWarmonger
a15ad329b4 Fixed #1015. 2012-06-20 13:03:05 +00:00
Ivan Savenko
7a6133a824 - some bugfixing 
- removed redundant or unused code in GUI
 2012-06-16 22:40:28 +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
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
DjWarmonger
ef250fcb8f Compile fixes for previous commit. 2012-06-13 14:11:18 +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
d0816a7924 Fixed crash when artifact casts spell ( #991 ) 2012-06-10 12:01:56 +00:00
Michał W. Urbańczyk
e6ebf42308 #994 should not crash anymore. 2012-06-09 19:58:17 +00:00
Michał W. Urbańczyk
f378e5be31 MSVC compile fix #997. 
CClickableHex apparently can't be held by value in vector anymore.
 2012-06-09 16:45:45 +00:00
Frank Zago
5dff7d64f6 Allows to load campaigns from the user directory too. 2012-06-09 14:26:41 +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
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
Ivan Savenko
c3eead45d4 (linux-only) 
- version set to 0.89
- added icon and desktop file for client
- updated compilers warning settings
 2012-06-01 17:28:05 +00:00
Michał W. Urbańczyk
dc4d30df0e Ench0's patch from #948. 2012-06-01 17:23:26 +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
Ivan Savenko
61ccabde53 - vcmi can be compiled with clang-3.1 2012-05-27 19:06:35 +00:00
Ivan Savenko
c512069177 - fixed #982: 
-- replaced 8to24 bilt with sdl blit
-- fixed alpha values for images loaded via SDL
 2012-05-27 14:07:12 +00:00
Ivan Savenko
7ddf76a081 - fixed #967 
- removed unused settings.txt
- fixed player flags on info windows.
 2012-05-26 17:59:00 +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
Michał W. Urbańczyk
470885d719 Fixed #969. 
Minor changes.
 2012-05-26 10:02:55 +00:00
DjWarmonger
e0135ab6a6 Fixed Commander artifacts management, including #968. 2012-05-25 15:10:38 +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
3e4d0e73e8 Fixed #964. 
Basic scrolling for commander artifacts. Needs tuning.
 2012-05-22 17:16:37 +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
DjWarmonger
d34cf90bf7 Support for Chain Lightning. 
Fixed getClosestTile function.
 2012-05-20 11:40:23 +00:00
Ivan Savenko
59255a4cad - background for main menu can be scaled. Won't work as default due to non-scalable video 2012-05-20 11:03:21 +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
Ivan Savenko
a13a62537b - fixed crash in hero window (#963) 
- added unused for now image scaling algorithm
 2012-05-19 21:38:01 +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
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
ed634a5f06 - minor fix to last commit 2012-05-17 11:15:11 +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
99439e1ed6 - fixed creature sounds (#802, #113) 
- added missing sounds for commanders and sharpshooters (#524)
- minor fixes
 2012-05-15 16:29:40 +00:00
DjWarmonger
fb34a48eec Compile fix for previous commit. 2012-05-15 09:21:32 +00:00
Ivan Savenko
8de71c2b39 - fixed #711, #862, #321 
- moved PutPixel templates into header to allow inlining
 2012-05-15 08:47:11 +00:00
Ivan Savenko
90ff99d4eb - fixed ancient #31 
- fixed #603
 2012-05-14 16:29:06 +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
9cbbfcf258 - Fixed all bugs with battle interface. It's now more consistent. 
- Minor cleaning.
 2012-05-07 16:04:43 +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
Ivan Savenko
82b60c00a2 - fixed compile issues. Renamed several "battleobstacleSplaced" to "battleobstacleplaced" 
- implemented --disable-video command line switch
 2012-05-05 08:32:55 +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
5d311fb3ed - Hopefully fixed possibleActions for every case 
- better algorithm for looting artifacts, yet buggy
 2012-05-01 13:56:32 +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
DjWarmonger
25bdcd3cab - Fixed wrong creature teleported 
- Support for Sacrifice
 2012-04-28 19:40:27 +00:00
DjWarmonger
f5e47474c5 - Fixed random crashes after creature spellcasting 
- Added dummy projectiles to Commanders
 2012-04-28 15:38:34 +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
Michał W. Urbańczyk
b0371597cd A better tweak. 2012-04-24 19:11:23 +00:00
Michał W. Urbańczyk
482051eb17 Tweaks for obstacles. 2012-04-24 05:16:04 +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
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
Ivan Savenko
fef876e1ec - fixed #934 (batte screen after changing resolution) 2012-04-19 21:21:11 +00:00
DjWarmonger
cd1a9414ac - Restored Genie random spell 
- Fixed crashes in many strange creature-spellcasting scenarios, including stack with multiple cast abilities and Enchanter with non-stadard spell
 2012-04-18 15:57:49 +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
DjWarmonger
f9dff013eb Fixes for battle interface, including #932. Basic funtionality is restored. 2012-04-18 09:01:08 +00:00
DjWarmonger
f720038ca5 - Battle interface fixes. It's possible to move stacks & attack 
- Creature window allows to pass stack artifact to hero
- Fixes for Mana Drain, including #916
 2012-04-17 14:50:23 +00:00
DjWarmonger
294276ea13 - Second part of battle interface. 
- Testing for Stack Artifacts feature.
 2012-04-17 08:46:09 +00:00
DjWarmonger
aeb9cf9460 - First part of battle interface rewrite. Untested. May work or not work randomly. 
- Tweaks for AI logging.
 2012-04-16 17:12:39 +00:00
Ivan Savenko
66f5b5e2d7 - gcc compile fixes 2012-04-14 16:28:36 +00:00
Michał W. Urbańczyk
6ec3501909 Fixed #927. 2012-04-14 07:39:32 +00:00
Michał W. Urbańczyk
722ec55384 Redid stack artifacts. Broken save compatibility. Added serializer support for boost::variant and sending CStackInstace* over network by implicitly passing IDs. Moved seeds and checksum to StartInfo. Various minor changes. 2012-04-14 02:20:22 +00:00
Michał W. Urbańczyk
8baec8b093 Implemented #715 (load game from sys options). Fixed #224. Minor improvements. 2012-04-09 02:53:50 +00:00
Michał W. Urbańczyk
f9f0fe9d97 Likely fixed #920. 2012-04-08 20:49:16 +00:00
Ivan Savenko
f426a48d09 - fixes for gcc-4.7 
- added missing virtual destructors (new warning from gcc)
 2012-04-08 10:34:23 +00:00
Michał W. Urbańczyk
d9064f4f7d Implemented #714 — restart functionality, including quick restart tweak (bound to CTRL+R). 2012-04-08 03:06:27 +00:00
Michał W. Urbańczyk
d6223dd137 Fixed #686. 
Minor changes.
 2012-04-08 02:29:11 +00:00
Michał W. Urbańczyk
9f6270a1f7 Fxied #306 and #856. 2012-04-08 02:14:20 +00:00
Michał W. Urbańczyk
b874295b3a Really fixed #918. 2012-04-08 01:43:40 +00:00
Michał W. Urbańczyk
3bf76cb719 Fixed #216 and #907. 
* CTRL+T will open marketplace window
* T in adventure map will switch to next town
* T in castle window will open a tavern window (if available)
* G will open thieves guild window if player owns at least one town with tavern
* various minor changes
 2012-04-08 01:15:18 +00:00
Michał W. Urbańczyk
7317e803db Locking pim mutex in client pack handling method, instead of dozens playerint call-ins. GUI won't try updating in between gamestate change and call-ins about it. Should fix #912. 
Minor changes.
 2012-04-06 15:02:15 +00:00
DjWarmonger
038d105bcc - first sketch of Commanders 
- accumulateBonus should make mechanics simpler
 2012-04-04 17:41:55 +00:00
DjWarmonger
2193f8912e - Framework of new battle interface 
- Minor fixes for AI
 2012-04-04 08:03:52 +00:00
Michał W. Urbańczyk
c61f536d8b * fixed remaining parts of #760 
* it's possible to switch active creature during tacts phase by clicking on stack
* a few minor fixes after handleHex rewrite
 2012-04-02 23:23:14 +00:00
Michał W. Urbańczyk
584b761d37 Fixed #917. 2012-04-02 11:38:59 +00:00
Michał W. Urbańczyk
7ccc78c757 Fized crash on attacking walls with Cyclop Kings. 2012-04-01 13:40:14 +00:00
Michał W. Urbańczyk
414a896dbd Fixed #890. 2012-03-30 23:39:44 +00:00
Michał W. Urbańczyk
a9af0da0ab Rewritten handling mouse movement over hex and l-clicking hex into one procedure. That way the tooltip and cursor are always accurate, because they're set by the same routing that selects action. Having that logic duplicated in two methods was unmaintainable. [though the new one is still monstrous...] By the way fixed numerous issues, including: 
* #785 and parts of #760
* first aid tent can heal only creatures that suffered damage
* war machines can't be healed by tent
* creatures casting spells won't try to cast them during tactic phase
* console tooltips for first aid tent
* console tooltips for teleport spell
* cursor is reset to pointer when action is requested
* fixed a few other missing or wrong tooltips/cursors

Implemented opening creature window by l-clicking on stack. Master Genie's spell is picked by server, not client.
Minor changes.
 2012-03-30 21:36:07 +00:00
Michał W. Urbańczyk
c698181c4c * simple mechanism for detecting desync after init 
* moving stacks in tactics phase won't affect stack queue  (part of #760)
* moved all boost headers in server to PCH
 2012-03-27 20:08:54 +00:00
Michał W. Urbańczyk
7b7ddf987a Fixed #909. 
Minor fix in using requestActionASAP (capture by val).
 2012-03-26 11:38:51 +00:00
Michał W. Urbańczyk
13f26fc3cb * Client is able to await for answers for multiple queries at the same time 
* Hackish solution allowing AI undertaking actions from event-handling thread
* Fixed crash when death stare or acid breath activated on stack that was just killed
* minor fixes
 2012-03-25 22:46:14 +00:00
DjWarmonger
7e4855c271 Quick fix for #910. 2012-03-12 15:00:32 +00:00
Michał W. Urbańczyk
6db3c5bc7e * VCAI: can't request actions from action handling thread 
* Save game screen and returning to main menu will work if game was started with --start option
* GUI controls can selectively capture keyboard events. CTextInput won't capture Enter. Fixes #654.
 2012-03-11 16:29:01 +00:00
DjWarmonger
88e9dec974 Fixed Thieves Guild window showing for all players. 
It needed 11 files modified... :/
 2012-03-07 14:05:54 +00:00
Michał W. Urbańczyk
d0e259864e * Replaced boost::shared_ptr with std::shared_ptr. 
* Brought shared_ptr and unique_ptr and their factories (make_shared, make_unique) to the global scope. 
* Removed excessive usage of shared_ptr in bonus system interface. 
* Fixed bonus system limiters/caching interactions. That covers #823, #859 and a number of rare edge-cases. 
* Implemented multiple-step limiters applying, fixing hasAnotherBonusLimiter  and allowing transitional dependencies between bonuses. 
* Bonus system should be slightly faster, since we cache limited bonuses. Some rare usages (limiting query against a foreign node) however can't use caching.
 2012-03-06 16:59:55 +00:00
Michał W. Urbańczyk
77b13404c0 Fixed #888. 2012-03-01 13:36:58 +00:00
Michał W. Urbańczyk
a833cbd308 Fxied #887. 2012-03-01 11:57:38 +00:00
DjWarmonger
18b1b83c8a Fixed creatures casting aimed spells at dead stacks. 2012-02-29 13:47:57 +00:00
Michał W. Urbańczyk
f2642cb62c Added VCAI and EmptyAI to the VS solution. Removed from it GeniusAI. 
Fixed #329, #884, #885.
 2012-02-29 01:31:48 +00:00
Ivan Savenko
9ce3c78387 - fix for compilation with gcc-4.5 
- fix for #881
 2012-02-28 11:26:08 +00:00
Ivan Savenko
2018fc09a4 - fullscreen config option will take effect immediately 
- fixed bug with highlightable buttons
- added several missing spells sounds
 2012-02-24 20:41:14 +00:00
Michał W. Urbańczyk
4f182744e7 * Fixed in game scenario info and save game screens 
* AI will now use tlog6 (teal color) for logs
 2012-02-22 19:22:11 +00:00
Michał W. Urbańczyk
3546c7841a * Possibly fixed #870 
* Fixed crash after catapult successfully destroyed one of turrets (stack queue wasn't properly updated)
 2012-02-22 17:43:59 +00:00
Michał W. Urbańczyk
37d3bea0a9 Missing part of fix for #871. 2012-02-22 14:38:40 +00:00
Michał W. Urbańczyk
d9a78ff1ce * fixed #871 
* dead stacks won't be also shaded as possible targets
 2012-02-22 14:31:53 +00:00
Michał W. Urbańczyk
e18419f5d2 * adventure map GUI should be properly blocked during AI turn 
* battle window will wait till all dialogs are closed
* fixed problems with AI working after the game ended
* fixed problems with overzealous redrawing of infobar
 2012-02-22 13:41:27 +00:00
Ivan Savenko
354b9e7fb3 - fixed #793 and #865 
- fixed #866 but may result in performance decrease
- (deb) removed vcmi-doc package
 2012-02-21 14:08:42 +00:00
Michał W. Urbańczyk
5afa5cfb54 * fixed #863 — all members of team will receive notification about FoW change 
* fixed #486 
* removed reference to a deleted file from lib VC project file
 2012-02-20 21:01:54 +00:00
DjWarmonger
5e14d17ed3 Fixes for r2543. 2012-02-20 09:50:49 +00:00
DjWarmonger
444b59d478 1. Fixed #843 
2. Refactoring for battle console hoover texts
3. Clone should work only for creatures of certain tier. However, ALL creature immunities stopped working in the meantime. Looking for an earlier bug.
 2012-02-20 08:19:03 +00:00
Michał W. Urbańczyk
e4dc00abac * new file lib/UnlockGuard.h — unlock_guard is for unlocking a mutex for the scope time (RAII) 
* all lock/unlock and unlock/lock pairs are done by RAII guards now
* fixed two possible crashes at the end of battle when last stack was killed by spell. That should fix #749 and #752.
* fixed a very nasty race condition, eliminating possible deadlock at the start of battle when human hero has tactics
* fixed #422
 2012-02-19 21:03:43 +00:00
DjWarmonger
5c86d32903 Cloned stack dissapear when killed. 
Fixed #864
 2012-02-18 17:39:47 +00:00
Michał W. Urbańczyk
0867451f26 Fixed path issues: #491, #834, #845. 
Fixed AI crash when enemy hero was teleported onto tile not visible for AI.
 2012-02-18 14:59:37 +00:00
Ivan Savenko
d1d21b16dc - replaced auto_ptr with c++11 unique_ptr 2012-02-17 20:34:34 +00:00
Michał W. Urbańczyk
1abf089bc7 Missed fixed for #858 (TortoiseSVN tricked me...) 
Fixed #852.
 2012-02-16 21:46:28 +00:00
Michał W. Urbańczyk
4baf4e13ed * fixed #857 and #858 
* fixed crash when AI attacked player before his first turn
* fixed various crashes when mass-effect spells affected town turrets in sieges
* some refactoring around spell positiveness
 2012-02-16 21:19:07 +00:00
Ivan Savenko
0c3e88226f - (linux) replaced Genius with VCAI 
- gcc set to c++0x mode
- most of gcc warnings fixed
- replaced boost::assign with initialization lists (if available in compiler)
- new cheat code: vcmiarmenelos - build everything
- updated linux readme
- minor fixes, applied patch for #98
 2012-02-16 17:10:58 +00:00
Michał W. Urbańczyk
7a66c1bf2b * added an initial version of adventure AI: VCAI, more details here: http://forum.vcmi.eu/viewtopic.php?p=6508#6508 
* VCAI set as default adventure AI
* several adjustments in GUI (hourglass during AI turn), minor changes
 2012-02-14 18:04:45 +00:00
DjWarmonger
c724092028 Partial support for Clone spell. 2012-02-10 13:13:24 +00:00
DjWarmonger
9e5fcc3152 Stack artifact backup. 
Still doesn't serialize properly, though.
 2012-02-10 10:32:21 +00:00
DjWarmonger
2bddf29cbf Stack artifacts part 2, not working yet. 2012-02-04 16:34:29 +00:00
DjWarmonger
b8a5d0d430 Stack artifacts - part 1 2012-01-30 16:07:52 +00:00
DjWarmonger
56c56f81e3 Fixed #849. Fixed buying artifacts for free. 
Minor tweaks.
 2012-01-28 11:42:15 +00:00
DjWarmonger
1cbd7e94e4 - Extended cap or removed sign for some values that may potentially overflow 
- Fixed #851
 2012-01-26 16:48:53 +00:00
Ivan Savenko
dbc603b7d7 - fixed crash on opening spellbook during enemy turn 
- fixed last known localization issue (bank configs)
- diplomacy and new weeks\month mechanics should be identical to H3
- minor fixes
 2012-01-19 14:33:22 +00:00
DjWarmonger
ba646b1d41 Compile fix for #847 2012-01-12 20:41:32 +00:00
Ivan Savenko
86e7d96b39 - setting system: replaced settings.txt + sysopt.bin with json-based system (defaultSetting.json + settings.json) 
- some work on system settings window
- new menu for selecting resolution (reused town portal graphics), can be opened from system settings
 2012-01-12 15:23:00 +00:00
Michał W. Urbańczyk
046e54563c * fixed project files for RD configuration 
* fixed crash when creature is casting Hypnosis (ie. exped Vampire Lords)
* fixed crash when creature is casting Cure before attack (ie. exped Unicorns)
* fixed crash when creature is summoning elemental (TODO fix it)
* fixed crash when doing a bonus system operation with a hero liberated from prison (ie. entering town or battle)
* fixed deadlock when StupidAI tried to assault the turrets
* fixed never ending siege when StupidAI has to use catapult (no more deadlocks on AI-AI siege)
* fixed deadlock when a hero received a level during another player's turn (ie. when he successfully defended)
* AI can win the game by defeating all enemies if there is a specific victory condition applying only to human players
* added options to help testing adventure map AI (--onlyAI, --autoSkip and --oneGoodAI).
* many minor changes
 2012-01-03 01:55:26 +00:00
Ivan Savenko
91c0ce33f4 - re-generated build system 
- fixed several gcc issues
 2011-12-31 10:03:29 +00:00
beegee1
156aa6e4d9 * Updated class - file - handling 
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
 2011-12-22 13:05:19 +00:00
beegee1
2f5d6f2684 * CHexField renamed to CBattleHex 
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
 2011-12-17 18:59:59 +00:00
beegee1
cce814c41b * Final commit 2011-12-13 21:35:28 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
Ivan Savenko
2eca314e92 - fixed #841 and #840 
- fixed several crashes
 2011-11-27 18:55:11 +00:00
DjWarmonger
dfea7db6e8 Compile fixes. May be suboptimal. 2011-11-27 15:39:44 +00:00
Ivan Savenko
064466998a - made main menu configurable (mainmenu.json) 
- added credits screen (using NWC credits for now)
- campaigns can be started
 2011-11-27 13:14:20 +00:00
Ivan Savenko
29f42aa873 - fixed #834 
- fixed crash at campaigns loading
- minor fixes
 2011-11-25 19:41:23 +00:00
Frank Zago
a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
DjWarmonger
2e0ca6d162 Cleaned some code. 2011-11-13 09:29:22 +00:00
Ivan Savenko
0f2e00c780 -(linux) Moved all (I hope) files created by VCMI to ~/.vcmi to prevents crash on launch from read-only directory 
- minor fixes for #362 #835 #836
 2011-11-01 12:58:01 +00:00
Ivan Savenko
ede7fd5a7a - (linux) Fixed gcc linking issues 2011-10-31 18:00:44 +00:00
DjWarmonger
448a3a6604 Fix for attacks of casting creatures. 
Version set to release build 0.86c.
 2011-10-23 06:15:41 +00:00
DjWarmonger
57216eea44 Console texts for creature casting spells. 
Fixes related to war machines in battle.
 2011-10-22 07:05:57 +00:00
DjWarmonger
bdb6db2ab7 Support for Aura of Magic Resistance. 2011-10-20 11:03:04 +00:00
DjWarmonger
95f23cf20f Support for Bind ability. 2011-10-17 08:24:51 +00:00
Frank Zago
e43ac3fa06 Fixed alignment issue on sparc. Minor optimization of CCreatureAnimation::nextFrameT. 2011-10-13 04:33:19 +00:00
yupsi
7ed83864e7 Fixing #222 (hero/town order saving). 2011-10-10 20:37:11 +00:00
DjWarmonger
e0baffd0d0 Fix for Dispell Beneficial Spells. 
It should be marked as supported now.
 2011-10-10 06:18:38 +00:00
DjWarmonger
b4d0ebf9ab Support for Mana Channeling ability. 2011-10-09 11:23:24 +00:00
DjWarmonger
d607d90a91 Support for Fear & Fearless ability. 
Ogre Magi can now cast too.
 2011-10-08 17:10:43 +00:00
Ivan Savenko
89bd7e273d - fixed #808 
- Implemented Json validator and schema for buildings.json
- several fixes for Json writing
- fixed several gcc warnings
 2011-10-08 16:58:25 +00:00
Frank Zago
7b1ede449d Removed last instances of readNormalNr. Made readChar an inline. 2011-10-08 16:06:11 +00:00
DjWarmonger
0903d6037c New pack - BattleEffectTrigger for various one-shot effects with animation 2011-10-08 13:02:58 +00:00
DjWarmonger
f4fc77ccb8 Creature spells are now functional. 
It includes Master Genie, Archangel, Faerie Dragon & Elementals
 2011-10-08 09:11:36 +00:00
DjWarmonger
47740cd683 Minor fix. 2011-10-08 07:19:29 +00:00
DjWarmonger
9a1460c2e0 Handling of cursor for creatures casting spells. 
Lots of refactoring.
 2011-10-08 06:59:36 +00:00
Frank Zago
c8f837b51b Cleaned-up pcx loader. 2011-10-08 05:44:37 +00:00
Frank Zago
8403d177aa Added endian aware macros read_le_u16 and read_le_u32 to replace readNormalNR(). Fixes a couple of issues on big endian machines. 2011-10-08 01:23:46 +00:00
Frank Zago
28231fee98 Newest GCC linker requires that every necessary library must be explicitly mentioned - no implicit linking allowed. 
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 2011-10-06 01:11:23 +00:00
yupsi
583aca8912 Move hero/Next hero buttons being blocked when they should (#204) 2011-10-04 19:43:49 +00:00
DjWarmonger
8c2dd9fdce More mechanics for creature spells. 2011-10-04 13:12:29 +00:00
DjWarmonger
fa6bddcad5 A bunch of mechanics & refactorings. 2011-10-03 19:29:36 +00:00
DjWarmonger
27a82af24c Proper handling of cursor. 2011-10-02 15:29:12 +00:00
DjWarmonger
f1f416c890 Fixed (unnecessary?) deadlock in BattleStacksRemoved. Daemon summoning is pretty functional. 2011-10-02 13:59:12 +00:00
DjWarmonger
6fdb984799 Lots of refactoring & work for creature spells. 
No new features yet, but summon elementals now work properly again.
 2011-10-01 19:56:54 +00:00
Frank Zago
5d4cfc0d0f Fixed #382. 2011-09-26 00:01:47 +00:00
Frank Zago
14261d6be9 Removed debug trace. 2011-09-25 18:59:59 +00:00
Frank Zago
4a3d1a22d6 Only draw the necessary borders for a message window. Fixes #388. 2011-09-25 18:44:13 +00:00
Frank Zago
1f9e97005f When changing resolution, both screen? and res? must be set. Fixes #813. 2011-09-25 16:39:13 +00:00
Frank Zago
ddd3d166b1 Let user add maps in his home directory. Linux only. 2011-09-25 15:41:03 +00:00
Frank Zago
01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +00:00
Frank Zago
6dd9d416b4 Fixed #812. 2011-09-24 01:24:11 +00:00
Frank Zago
c4b8039c1e Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos. 2011-09-24 01:15:36 +00:00
Ivan Savenko
d113517db4 - fixed #108, #798, #810 
- fixed several gcc warnings
- some work on JSON (const char* as input, no crash on missing value)
 2011-09-23 15:58:18 +00:00
Michał W. Urbańczyk
750995f7f9 A patch from Gesh fixing and #819 and removing reduntant #ifdefs (DLLHandler is win-only anyway). 2011-09-22 14:21:53 +00:00
Michał W. Urbańczyk
6ef44bde5a Work on pathfinder: torn the code out from CGameState into a separate class. It can use Subterranean Gates and Boats. Removed code for handling Fly spell effect. It didn't work as supposed anyway. 2011-09-19 20:50:25 +00:00
ori.bar
74fafbedbf Fix #807 2011-09-17 18:15:10 +00:00
DjWarmonger
1e4a08529c Path for #773 from Yupsi 
+ some refactorings
 2011-09-15 05:41:47 +00:00
Frank Zago
0cfb2deeaf Reverted r2382; add zvs to the game data (linux); simplified BitmapHandler::loadBitmap(). 2011-09-14 05:27:49 +00:00
DjWarmonger
e9991f7932 Fixed #797. Minor tweaks. 2011-09-10 15:06:48 +00:00
DjWarmonger
899aeeb748 New feature: All tiles affected by multi-hex attack will be highlighted when attack is possible. 2011-09-10 13:04:20 +00:00
ori.bar
ebacb433fe auto_ptr -> shared_ptr see http://gcc.gnu.org/onlinedocs/libstdc++/manual/auto_ptr.html 2011-09-10 09:42:09 +00:00
Michał W. Urbańczyk
9621cbcaa7 * fixed crash on calculating dmg dealt by stack under Curse 
* fixed crash on sea battles (obstacles data got corrupted during conversion)
* fixed crash when StupidAI had a catapult
* minor fixes and refactorings (typename for bonus list under shared ptr)
 2011-09-06 13:59:26 +00:00
Michał W. Urbańczyk
bb1bdcb0a7 * fixed crash on visiting Sirens 
* fixed race condition on the new turn,  #729 should be gone
* fixed crashes in AI-only game mode
 2011-09-06 09:59:06 +00:00
Michał W. Urbańczyk
8b7a2f179c * Server will strictly require answering the queries before taking any actions. Let me know, if this causes any freezes. 
* Fixed crash on new week after we lost battle with neutral monster but killed the top stack (merging failed then).
* minor changes
 2011-09-06 06:00:32 +00:00
DjWarmonger
e3a8a41063 Fixed #804. 
Phoenix won't upgrade to Centaur Captain ;)

Minor tweaks.
 2011-09-05 06:37:24 +00:00
Frank Zago
2ae53395d7 Removed duplicate function initVillagesCapitols(), and simplified its clone loadTownDInfos(). 2011-09-04 18:07:26 +00:00
ori.bar
5b836f428a Partial fix for 37. Full fix for 27, 64, 600. Fix for bug where code tried to reload non existent file. 2011-09-04 00:04:48 +00:00
Frank Zago
eff17aa850 Created campaign_regions.json from campaign_regions.txt. 2011-09-03 19:51:45 +00:00
Frank Zago
04995938dc Fixed bad battle backgrounds (introduced in r2334). 2011-09-03 03:53:08 +00:00
Michał W. Urbańczyk
d71ed76a0f Fixed villages/capitols not appearing. 2011-09-03 03:04:06 +00:00
Michał W. Urbańczyk
6b9e64de91 Lazy updates of hero paths. 2011-09-03 02:54:33 +00:00
Frank Zago
d8249d007f Replaced a few iterators with BOOST_FOREACH. 2011-09-01 04:01:54 +00:00
Michał W. Urbańczyk
c5452f26fc Fixed #791. Don't like it. Rogues do not have TURN_R sequence. I if-ed out that in reverse animation but I believe more general solution should be devised, possibly on the side of CCreatureAnimation. 2011-09-01 03:12:54 +00:00
Michał W. Urbańczyk
20a53b04fd Removed object recycling that was causing #796. Fixed text nr typo. 
Corrected json include in client/Client.cpp.
 2011-09-01 01:40:46 +00:00
Frank Zago
d49058049e Created towns_defs.json from townsDefs.txt. 2011-09-01 00:11:34 +00:00
Frank Zago
35622913f9 Convert ERMU_to_picture.txt into ERMU_to_picture.json. 2011-08-31 23:27:33 +00:00
Ivan Savenko
3fc42134b7 - fixed #586, #757, #758 
- fixed spinning projectiles for some creatures
 2011-08-31 12:11:34 +00:00
Frank Zago
e5349c58cd Created wall_pos.json from wall_pos.txt. 2011-08-31 04:11:44 +00:00
Frank Zago
71b1eef6b6 Merged AC_desc.txt into battles_graphics.json. 2011-08-31 03:27:18 +00:00
Frank Zago
68090a4ec6 Created battles_graphics.json from battleBack.txt and battleHeroes.txt. 2011-08-31 01:11:41 +00:00
Frank Zago
0a58d1f2cf Created town_pictures.json from townPics.txt. 2011-08-31 00:35:04 +00:00
Frank Zago
21f72c61b1 Created creature_backgrounds.json from cr_bgs.txt. 2011-08-31 00:12:02 +00:00
Michał W. Urbańczyk
1bd543ad0c Ouch. #37 is not so easy. :> 2011-08-30 07:08:11 +00:00
Michał W. Urbańczyk
b217768d0a A patch from ori.bar fixing #37 and #64. 
http://forum.vcmi.eu/viewtopic.php?p=5993#5993
 2011-08-30 06:36:57 +00:00
Michał W. Urbańczyk
835bd1fbeb Reverting r2327 
http://forum.vcmi.eu/viewtopic.php?t=410
 2011-08-30 06:19:07 +00:00
Ivan Savenko
33719696d8 - added default values to JsonNode 
- small cleanup to heroes.json
 2011-08-27 21:17:45 +00:00
Michał W. Urbańczyk
33020cf953 Fixed fix for #771. 2011-08-26 23:45:00 +00:00
Michał W. Urbańczyk
a8a437ccb0 Don't behave so dramatically when Heroes3-cd2.snd is missing. 
Fixed a few typos in buildings.json.
 2011-08-26 22:52:02 +00:00
Michał W. Urbańczyk
18444fc72f Rewritten code handling growth to eliminate duplication and make it conformant to OH3 mechanics. Proper support for Statue of Legion. 
Displaying shield over minimap during AI turn.
 2011-08-26 20:32:05 +00:00
Frank Zago
06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +00:00
Michał W. Urbańczyk
4f20c5a376 Fixed #731. 2011-08-25 21:08:53 +00:00
Michał W. Urbańczyk
4c3ed24fe1 Fixed #768. More logging for #774. 
Fixed crash on town time event (-1 and -2 "structures" present on buildings list).
 2011-08-25 20:02:38 +00:00
Michał W. Urbańczyk
3152e6d540 Fixed #771, #772 and #787. 
Some minor changes and fixes.
 2011-08-25 15:24:37 +00:00
Frank Zago
4cad2f4587 Cache the selected graphic resolution instead of looking it up many times. 2011-08-24 04:13:45 +00:00
Frank Zago
839c437fbc Moved the resolution configurations in their own json files. Lots of C++ voodoo going away. Yay! 2011-08-24 02:19:53 +00:00
Frank Zago
81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +00:00
Ivan Savenko
7eb82278d9 - minor fixes to JSON 
- music will resume correctly after battles
 2011-08-20 11:27:09 +00:00
Frank Zago
3519cca2c9 Moved the spell sounds into a json file. 2011-08-20 01:57:03 +00:00
Frank Zago
cf1d179acf Store battle fields sounds in a json file instead of a text file. 2011-08-20 01:15:37 +00:00
Ivan Savenko
8054c85091 - some work on sound and music players: 
-- Adventure map music will update with hero movement
-- implemented battle intro sounds
-- battle music tracks will  be selected randomly each time
- fixed #781
 2011-08-19 19:50:24 +00:00
Michał W. Urbańczyk
583f37bf1f * Playing terrain music 
* Fixed crash on l-clicking advmap during AI turn
 2011-08-17 21:48:12 +00:00
Michał W. Urbańczyk
a043bfa44a * Reinstated music player. Added terrain music. To MSVC users: you need the recently uploaded libraries pack for this to work! [ http://download.vcmi.eu/msvc-pack.7z ] 
* Not crash on empty (or 1-byte) lod file. (Case in SoD+WoG installations, where h3ab*.lod are dummies.
 2011-08-17 20:44:14 +00:00
Michał W. Urbańczyk
26a83d7680 http://forum.vcmi.eu/viewtopic.php?p=5956#5956 
Significant changes in project files:
* new library package required! URL: http://download.vcmi.eu/msvc-pack.7z
* created VCMI_global.props property sheet for settings common to all VCMI projects
* added configuration for x64 builds
 2011-08-15 21:53:03 +00:00
DjWarmonger
287761a93d Fixed #229 & #332 2011-08-12 19:38:30 +00:00
DjWarmonger
4895540f80 Compile fixes. 2011-08-08 14:37:18 +00:00
Ivan Savenko
c63df4f07a - compile fixes for linux player 2011-08-08 14:20:22 +00:00
Michał W. Urbańczyk
05f166f751 Portability fix for „Win64”. 32-bit DLLs (bink, smack) cannot be loaded, so an empty player-placeholder is used to capture calls we can't properly handle. 
Probably some fixes for Linux will be needed. (I guess the whole thing could use some refactoring to unify more code)
 2011-08-08 07:12:18 +00:00
Michał W. Urbańczyk
b05a0c7c83 The add_file method throws an exception where there is no file with a given name. 
Catch it and leave NULL, so the silent return can be used.
 2011-08-08 06:28:18 +00:00
Frank Zago
c1ffe738f0 Load sound file from 2nd CD. 2011-08-07 21:37:07 +00:00
DjWarmonger
de0d6b8c17 Compile fix. 2011-08-07 19:30:30 +00:00
Frank Zago
2cc80e1267 Modified CMediaHandler to handle more than one file. 2011-08-07 19:14:46 +00:00
DjWarmonger
d3a014ee94 Smarter implementation of last change. 2011-08-06 07:15:21 +00:00
DjWarmonger
e67b7b9da4 Some fixes for shooting vs Creature Window. 2011-08-06 07:05:04 +00:00
DjWarmonger
d29850a2fa Fixed #740 2011-08-05 07:59:15 +00:00
Frank Zago
18a376696d Support for newwer libavformat API. Patch from exine, bug #779. 2011-08-04 22:12:53 +00:00
beegee1
f609c4ad9a * Fixed #33 -> Creatures tend to stop at every hex during movement 2011-08-01 17:36:18 +00:00
Ivan Savenko
0893ed816f - fix for #775 
- fix for crash in battle options window
 2011-07-27 09:35:27 +00:00
DjWarmonger
2047862eb1 Compile fix for Kingdom Overview 
Fixed common crash with gained exp, fixed necromancy.
 2011-07-23 06:14:05 +00:00
Ivan Savenko
5d2f5c2e33 - fixed #762 
- (linux) fixed video in campaigns menu
 2011-07-22 23:34:15 +00:00
Ivan Savenko
35a528e062 - Rewrote Kingdom Overview window - all should be stable now 
- New classes for GUI - lists and tabs
- finishing work on Json config in animations
 2011-07-22 16:22:22 +00:00
Ivan Savenko
98d32acf1b - new files JsonNode.cpp/.h 
- CAnimation can use JSON configs from Sprites folder instead of .def files
 2011-07-21 18:29:22 +00:00
Frank Zago
20574dea3d Added missing initializations. 2011-07-21 02:39:37 +00:00
Ivan Savenko
0693312a8e - fixed several crashes with joining creatures 
- support for loading *.tga images
- minor fixes
 2011-07-18 15:21:16 +00:00
Michał W. Urbańczyk
79f5b29196 Various player/AI interface related fixes and improvements. 2011-07-17 18:49:05 +00:00
DjWarmonger
16e7241fbd Support for WoG's Defense bonus. 2011-07-16 16:40:38 +00:00
beegee1
62c43451ef * Updated bonus caching -> faster in particular cases, operations by limiter objects aren't cached 2011-07-16 13:57:25 +00:00
Ivan Savenko
706510f12f - gcc compile fixes 2011-07-13 23:36:37 +00:00
beegee1
55e7959fd9 * Bonus system caching updated, partially rewritten, much more robust, thread-safe 
* Adjusted projectile speed, trebuchet canon speed
 2011-07-13 18:39:02 +00:00
DjWarmonger
a7577ccb6b More details for Rebirth ability. 2011-07-10 09:03:46 +00:00
DjWarmonger
036ad1233f fixes for Phoenix. Its animation will now be restored to Alive. 2011-07-10 08:22:20 +00:00
Frank Zago
9c3a10b2c7 Fixed a bug in phoenix code. Fixed a couple warnings. 2011-07-09 22:42:39 +00:00
DjWarmonger
5269e845fd handling of Rebirth ability for Phoenix. 
However, I've got no idea how to restore its animation to alive state.
 2011-07-08 14:54:20 +00:00
DjWarmonger
f33fbdc43b Support for Thunderbolt (Thunderbirds). 
General framework for handling creatures casting spells with arbitrary spell power.
 2011-07-08 07:00:11 +00:00
DjWarmonger
8102fd4cf0 Support for Death Blow ability. 2011-07-06 17:00:45 +00:00
DjWarmonger
c53c226820 Support for Titan's Thunder (creating Spellbook) & Titan's Lightning Bolt. 2011-07-06 14:25:12 +00:00
Ivan Savenko
75d068bc03 - compilation fix for #765 2011-07-05 19:06:47 +00:00
Ivan Savenko
b8448e4c3b - (linux) build system update 
- gcc errors/warnings fixes
 2011-07-05 11:31:26 +00:00
Michał W. Urbańczyk
b3234e8bfa * CGameInterface.h/.cpp moved from client project to lib (and, appropriately, to lib subfolder). 
* New files in lib: ResourceSet.h/.cpp -> containing new structure for managing resources logic
* Minor changes and fixes
 2011-07-05 06:14:07 +00:00
Ivan Savenko
39feb24d64 - possibly fixed #763 2011-07-03 10:04:06 +00:00
DjWarmonger
57a36e77f3 Improvement for multiple-hex effects. 
TODO: Attacker must know exact attacked tile, not only the stack.
 2011-07-03 05:55:57 +00:00
Michał W. Urbańczyk
4592ddb74e Fixing several issues with artifacts in hero window described in note http://bugs.vcmi.eu/view.php?id=761#c1828 . Also resolving #741. 2011-07-03 01:03:46 +00:00
DjWarmonger
81180de8be Handling of area attack animation & effect 2011-07-02 17:40:33 +00:00
DjWarmonger
51943e5f1e Partial support for Death Cloud & Magog's Fire Ball. 
Lots of refactoring is needed to handle this and multiple-target attacks.
 2011-07-02 16:49:22 +00:00
Ivan Savenko
11fade5e67 - fixed crash in #761 2011-07-02 15:12:35 +00:00
Ivan Savenko
48e79b163c - missed file from previous commit 
- minor fixes
 2011-07-01 16:26:36 +00:00
Ivan Savenko
a89895452a - (linux) fixed searching/loading of scripting libraries 
- (linux) moved AI libraries to /lib/vcmi/AI/lib*, ERM lib to /lib/vcmi/Scripting/*
- gcc compile and warnings fixes
 2011-06-28 14:19:16 +00:00
beegee1
cef16ccc74 * Fixed battle positions bugs: #174, #172, #400 
* Turret creatures have no longer a standing animation
* Turret creatures get cut at a certain y position(lower part of shooters are hidden)
 2011-06-27 17:11:17 +00:00
beegee1
2efcdae80f * Fixed #750 2011-06-26 10:22:48 +00:00
DjWarmonger
9ca5d9048a Fixed total spell immunity granted by 2212. 
Improvements for Life Drain.
 2011-06-25 15:05:01 +00:00
Michał W. Urbańczyk
212bc13ad6 Fixed #755 and #759. 2011-06-25 14:22:19 +00:00
beegee1
5fdb5aa494 * Improved battle and bonus system performance (significantly faster in debug build, tip: use vs 2008, turn of hex field presentation) 
* Implemented caching for the bonus system
 2011-06-25 13:53:15 +00:00
DjWarmonger
e5c11385cd Fixed #293 
Support for damage spell immunities.
 2011-06-25 06:55:35 +00:00
DjWarmonger
7dce558e28 More fixes. Estates skill is now handled as a Bonus. 2011-06-24 18:16:28 +00:00
DjWarmonger
bdce46ab60 Minor refactorings, fixes & improvements. 
Moved CArtifactSet to ArtHandler. ObjectHandler is already too messed.
 2011-06-24 17:43:02 +00:00
Michał W. Urbańczyk
d88b6b1bb3 Interactive mode for ERM interpreter. 2011-06-23 21:42:30 +00:00
Michał W. Urbańczyk
d9a9477cb4 Likely fixing #754. 2011-06-22 22:35:26 +00:00
DjWarmonger
5eef9551de Fixed #607 
Support for Admiral's Hat
 2011-06-21 16:00:19 +00:00
DjWarmonger
af8d8cbfc7 Implemented #479 2011-06-21 12:45:57 +00:00
Michał W. Urbańczyk
580c4e4c9b ERM is now a separate project, linking to ./Scripting/ERM.dll and consisting all ERM* files from ./lib. 
Little changes around handling ERM. New class in lib: CFileUtility, so the code for scanning files with given extension is not duplicated.
 2011-06-20 11:41:04 +00:00
DjWarmonger
c850ee6fe0 Fixed #180. Minor tweaks. 2011-06-18 15:43:28 +00:00
DjWarmonger
d4465ec929 Smarter handling of Magic Resistance & Resistance hero skill. 2011-06-18 10:58:46 +00:00
DjWarmonger
361e58eddb Applied patch from #749 2011-06-18 04:56:32 +00:00
Frank Zago
4b7d0f3092 Partial integration of Android patches, from Pelya. 2011-06-15 02:15:05 +00:00
Frank Zago
eecb470e74 Fixed all warnings "take address of temporary". 2011-06-11 04:54:41 +00:00
Michał W. Urbańczyk
9775f88045 Version bump. 
Initial support for IF:M elements and string formatting.
Various minor changes related to ERM interpreter.

The following script should be functional now:
ZVSE
!?PI;
!!DO1/0/6/1&v2777<>1:P0;

!?FU1;
!!IF:M^Hello world number %X16!^;
 2011-06-10 23:50:32 +00:00
Frank Zago
aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
Michał W. Urbańczyk
0dbd7ee3c8 Fixed #739 and #742. 
Version set to 0.85.
 2011-06-01 18:26:44 +00:00
Frank Zago
ff49b852df Silenced several "warning: suggest parentheses around ‘&&’ within ‘||’": added some parenthesis, optimized a couple statments and fix a bug in another. 2011-05-30 19:20:14 +00:00
beegee1
2d3caec79b * Implemented parabolic trajectory of the trebuchet 
* Improved shooting animation
 2011-05-30 14:16:34 +00:00
Michał W. Urbańczyk
2d61fab7e9 * Probably fixed #655. 
* Fixed #736, #737.
* Fixed crash on loss/victory.
* Fixed crash on loading some AB maps.
* Fixed crash on loading map where victory/loss condition objective hero was placed inside the town.
* Fixed crash on loading map when neutral Dungeon has built Portal of Summoning.
* Mutex protecting GS will be used to prevent changes in GS when GUI might read it.
* Little more securities around moving hero and ending turn, still needed more.
 2011-05-29 23:49:25 +00:00
DjWarmonger
936005aa1c Correct, yet ugly handling of Magic Resistance. 2011-05-29 18:28:50 +00:00
Michał W. Urbańczyk
47e4c8d6e6 Probably fixed #732, one more fix for spawning wandering monsters. 2011-05-29 14:06:52 +00:00
Michał W. Urbańczyk
b07e8fbfa4 For 0.84c dev build. 2011-05-29 01:44:47 +00:00
Ivan Savenko
19f0836211 Fixed #712 and #713 2011-05-28 10:05:25 +00:00
Michał W. Urbańczyk
3ca95ef5ed Fixed #730: 
* crash on +5 growth week 
* crash on spawning wandering creatures on double growth months
(how come that has not been found in previous build?)

More logging for #729-like issues.
 2011-05-28 01:02:28 +00:00
Frank Zago
4af4f0a707 Compile and warning fixes. 2011-05-27 22:34:58 +00:00
Frank Zago
abc0d3537e Some compile fixes. 2011-05-27 13:49:18 +00:00
beegee1
7962a9bc47 * Fixed #30 
* Fixed several shooting animation bugs
* Improved XY position of double wide creatures
 2011-05-26 14:47:45 +00:00
Michał W. Urbańczyk
953a3bf165 Final changes for 0.84b: 
* no hard crash on startup when AB videos are not installed (1 byte file)
* moved some DLL_EXPORTs to resolve incomprehensible (to me) linker error occurring only with release builds.
 2011-05-26 01:03:35 +00:00
Michał W. Urbańczyk
c32242b4e9 For 0.84b dev build. 2011-05-25 23:52:27 +00:00
Michał W. Urbańczyk
df062614d7 Fixed #260, improvement for #250. 2011-05-25 22:44:02 +00:00
Michał W. Urbańczyk
8e57dba850 Fixed #658 and #699. 
Checking for water availability won't cause spurious warnings. New creature window enabled for testing.
 2011-05-25 14:48:49 +00:00
Michał W. Urbańczyk
601bee9c0f Fixed unitialized ptr from previous commit. Added classicCreatureWindow option to the config, deciding whether classic or the new creature window will be used. Added switchCreWin console command for switching this option run-time. Garrison slots now shouldn't redraw themselves on top of creature window. 2011-05-25 13:11:03 +00:00
Michał W. Urbańczyk
072bb5884b Fixed #728. 
Fixed issue with game loading.
Minor fixes.
 2011-05-24 23:17:57 +00:00
mateuszb
94166b83aa * some changes 2011-05-22 18:46:52 +00:00
DjWarmonger
b97988477e Optimization for terrain path. 2011-05-21 08:44:02 +00:00
DjWarmonger
3a6b5cbfbb Various fixes related to spell effects and Creature Window. 2011-05-21 07:07:07 +00:00
Michał W. Urbańczyk
2845123a0a A patch from zjarek ( #727 ) — refactoring of CTerrainRect::showPath. 2011-05-21 01:10:41 +00:00
beegee1
431064cbf9 * Fixed #532 -> Catapult shoots now after keep/upper/lower tower 
* Fixed turret projectile bug
 2011-05-18 17:51:10 +00:00
beegee1
ef66982bbd * Fixed #173 -> Heroes are now placed at the correct position during battles 2011-05-17 15:52:44 +00:00
beegee1
17290d4f0d * Fixed 171 Update: Defending hero gets now drawn at the end of the first hex row. Hero is in front of the background wall but behind the keep/keep turret. 2011-05-15 17:36:39 +00:00
beegee1
7ad6ca7482 * Fixed #171: The overlapping order of walls-creatures-hero is now correct during sieges 2011-05-15 17:18:36 +00:00
DjWarmonger
d4c2e55a00 Fixed #421 & #480. Some work on animations & sounds. Minor changes. 
TODO: Interface should check game state before it's changed by triggered abilities of creatures.
 2011-05-15 06:37:57 +00:00
DjWarmonger
db386915d1 Spell_levels are not necessary in the end. 
Fixes. Game won't crash when displaying info for war machines. However, they should be handled as regular stacks during battle.
 2011-05-13 14:33:48 +00:00
DjWarmonger
b02527566c Fixed some battle logs. 2011-05-13 10:45:36 +00:00
DjWarmonger
515ab7e7c1 Support for Acid Breath (both effects are now separate). 
Minor fixes.
 2011-05-13 09:02:16 +00:00
beegee1
7c771e5c56 * Fixed: The Creatures inside the walls in the 1st row of hexes should have priority over the wall 2011-05-11 17:43:19 +00:00
beegee1
f3b5ede486 * Fixed the jumping creature animation bug when a unit isn't fully display at the battle screen. The upper creature turret moved (randomly) from left to right during battle and wasn't displayed at the correct x position. 2011-05-11 16:08:37 +00:00
Frank Zago
c165593896 (linux) added new files into the makefiles and compile fixes. 2011-05-10 01:15:10 +00:00
Michał W. Urbańczyk
617e1f962e New files for lib: 
* lib/ERMScriptModule.cpp
* lib/ERMScriptModule.h
* lib/CObstacleInstance.h

More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts.
Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).
 2011-05-09 22:20:47 +00:00
Frank Zago
98577e402f av_free_packet is a library call. Don't reproduce its code here. 2011-05-04 03:42:09 +00:00
Frank Zago
f7a4bb906c Several minor cleanups. 2011-05-04 02:38:58 +00:00
Frank Zago
c46f3da9ab Fixed potential NULL dereference. 2011-05-04 02:35:44 +00:00
Michał W. Urbańczyk
b4144dc616 Callback jugglery, part 1. 
Fixed #252.
 2011-05-03 03:14:18 +00:00
beegee1
36d29424f0 * Turrets, keep and turret covers can be now be placed by altering wall_pos.txt 
* Fixed recruitment slider bug
* Fixed #271
* Improved color management
 2011-04-30 19:52:35 +00:00
Ivan Savenko
e494171de3 - several changes to get reusable code 
- possibly fixed #725
- bug in random seed initializing?
 2011-04-30 18:16:58 +00:00
Michał W. Urbańczyk
ec76876bda drawBorder should not crash when attempted drawing outside the surface. 2011-04-29 00:50:54 +00:00
beegee1
45fba15511 * Reverted previously changed PreGame code 
* Added the missing AB video resource file in linux code, AB campaign selection videos should now play BUT they don't => it seems that ffmpeg can't handle older BINK videos
* Fixed a visual glitch which could be seen at the WOG animation in the main menu on a linux machine
* Fixed the random crashes bug on mouse centering at startup on linux
* Fixed a visual bug at the bonus selection screen when starting a campaign-map
* Changed some positions in the bonus selection screen, no bonus pre selection, you cannot start the campaign when no bonus is selected (like in h3)
* Added a border functionality to the AdventureMapButton
* InfoWindow buttons and some other buttons have now the border which heroes 3 buttons have
* Fixed a app crash when you start a campaign two times in one session
 2011-04-26 13:30:29 +00:00
DjWarmonger
a73a1c2724 Battle log messages for new abilities. 
Lots of fixes.
 2011-04-26 07:57:26 +00:00
DjWarmonger
a4d845688a Support for Poison, Age, Disease 
Partial support for Stone Gaze, Paralyze, Mana drain
Partial fix for #134 - animation triggers only for our own stacks, not enemy's
Lots of tweaks & fixes.
 2011-04-25 09:03:13 +00:00
Michał W. Urbańczyk
362f413b4d Fixing #127 and #702. 2011-04-24 02:02:41 +00:00
DjWarmonger
7591d06b05 Support for Death Stare. 
Some tweaks are still needed. Level 0 spell-like abilities won't work correctly.
 2011-04-23 17:10:54 +00:00
Ivan Savenko
61af4c745e - recursive directory parser for LodHandler - for creature abilities and new main menu images 
- fixed screen updating on closing window
- minor fixes
 2011-04-23 10:27:44 +00:00
Michał W. Urbańczyk
d092eaf9d1 Artifact Merchant: selling artifacts. Messy, but completes H3 town structures functionalities. 
BTW updating screen after closing marketplace is broken.
 2011-04-22 21:51:10 +00:00
beegee1
66b708c168 * PreGame interface gets now redrawn every frame. 
* Changed PreGame event handling and update/draw order.
* Changed mouse cursor drawing in PreGame
* Fixed linux bug where main menu WOG animation gets played only once, windows/linux video handling is now more similar
* Minor code improvements
 2011-04-17 18:02:13 +00:00
DjWarmonger
3241e7c8f8 Applied patch for #721 from Plush. 2011-04-15 18:43:46 +00:00
beegee1
d6bd8514e7 Fixed bug #722. GuiBase::Run is now mostly in its old state. (before rev 2062) One disadvantage is now that the FPS Counter doesn't work in battle. 2011-04-13 19:52:56 +00:00
DjWarmonger
3c5a0fd4ce Creatures now use SHOTS Bonus to express their total ammo count. Support for "additional shots" exp premy. 2011-04-12 08:59:18 +00:00
DjWarmonger
f12aeb7fa4 More tweaks. 2011-04-10 10:31:42 +00:00
DjWarmonger
4bcf4926c9 Various fixes. 2011-04-10 05:41:24 +00:00
DjWarmonger
0f60ceb414 Impemented scrollbar for Creature Window. Call it finished. 2011-04-09 19:34:48 +00:00
Frank Zago
ecb3508690 (linux) Added configure test for the icc and clang compilers, and set some extra parameters for them. 2011-04-09 17:28:51 +00:00
Frank Zago
b0cecac5c9 (linux) Use avcodec_decode_video when avcodec_decode_video2 is not present. Updated vcmi version number. 2011-04-08 04:21:41 +00:00
Ivan Savenko
0f605256e9 - added new files to build system 
- minor gcc fixes
- updated castle interface code, added missing parts including #380
- buildings enum in global.h
 2011-04-07 17:54:08 +00:00
Frank Zago
69364b5b60 Various gcc compile fixes, and updates to linux code. 2011-04-07 02:16:32 +00:00
mateuszb
7874d84c4e * basic structure of ERM interpreter 
* SHOW_FPS moved to settings.txt
* minor changes
 2011-04-06 20:30:59 +00:00
beegee1
157002fe68 Better implementation of the framerate manager, FPS timer added, minor improvements 2011-04-05 17:38:24 +00:00
Michał W. Urbańczyk
b5a546349b Moved framerate keeper from CPlayerInterface to CGuiHandler, thing should be running smoother. 2011-04-03 10:45:39 +00:00
mateuszb
ccecc6637f * partially done support for VERM 
* MSVC compilation fix (using boost::ref is an error)
 2011-04-01 19:09:05 +00:00
Ivan Savenko
407acce4c6 - gcc 4.5 / boost 1.46 compilation fixes 
- configure will accept CXXFLAGS parameter correctly
- boost version check in ERMParser - to skip compilation with old boost
 2011-03-29 17:16:10 +00:00
mateuszb
3c393843e6 * ERM parsing mostly done, some strange cases of body syntax, undocumented expressions and encoding issues still remain. 2011-03-27 17:24:30 +00:00
Ivan Savenko
c6f1d87ede - fix for #95 and #602 
- implemented animation for new town buildings
 2011-03-22 13:19:07 +00:00
beegee1
b6c385f158 Better implementation of campaign selection screen 2011-03-21 19:32:48 +00:00
DjWarmonger
70b21fc9eb Quick implementation of stack experience details. Minor fixes. 
Man, it's ugly.
 2011-03-21 08:14:23 +00:00
DjWarmonger
bc51c0006f Support for creature skill icons. Several fixes for creature abilities. 2011-03-20 08:45:05 +00:00
Ivan Savenko
7209f158a1 - gcc/Linux fixes 
- added --nointro parameter to skip intro videos
- minor fixes to scenario selection menu
 2011-03-19 22:27:05 +00:00
Michał W. Urbańczyk
5e4140762f Fixed #687. 2011-03-19 14:35:29 +00:00
beegee1
fb929fa9b0 AB campaign selection screen added 2011-03-19 14:27:51 +00:00
Michał W. Urbańczyk
95efcc7cb5 Fixed #305, #707, #708. 2011-03-19 00:06:54 +00:00
Michał W. Urbańczyk
4d3776058d My project files for VC10. 2011-03-17 23:06:48 +00:00
Frank Zago
66c05ddcff Some gcc/linux fixes. 2011-03-17 03:56:36 +00:00
mateuszb
406b3e3f1c * unnecessary code removed 2011-03-15 17:25:51 +00:00
beegee1
38837ebfc9 Implementation of WOG and ROE campaign selection screen 2011-03-15 14:35:36 +00:00
Frank Zago
9bd484a6de gcc compile fix. 2011-03-13 16:06:20 +00:00
Michał W. Urbańczyk
a382b641b7 Removing old, VC9 project files. 2011-03-12 22:53:52 +00:00
Michał W. Urbańczyk
a461326380 Fixed #634 and #703. 2011-03-12 22:29:19 +00:00
Michał W. Urbańczyk
39120fe4a5 Spell scroll improvements, fixing #689, #690, #691. 
CArtPlace now uses common CInfoWindow for r-click popup (with or without a custom component), old CMessage::genWindow no longer needed.
 2011-03-12 21:55:31 +00:00
DjWarmonger
2fc2fa539d Fixed #706. 2011-03-08 09:09:57 +00:00
DjWarmonger
d0e9049161 Fixed #704. 
Magic Resistance tweak.
 2011-03-08 07:53:09 +00:00
DjWarmonger
b9f301b600 Better implementation of creature window, minor fixes. 
Check forum for new graphics.
 2011-03-06 12:12:22 +00:00
Michał W. Urbańczyk
7dbf105f6e Surrendering and related artifacts (Statesman's Medal, 
Diplomat's Ring, Ambassador's Sash).
 2011-03-05 16:38:22 +00:00
Ivan Savenko
7908a1a61d Makefiles update - new files 2011-03-04 17:18:45 +00:00
DjWarmonger
dc0eb37da6 New creature window works in general, covering old functionalities and displaying new info. It's far from finished though. 2011-03-03 18:25:48 +00:00
Michał W. Urbańczyk
222bf004b9 Fixed #679 and #681. 2011-03-01 13:54:48 +00:00
Michał W. Urbańczyk
207e573001 Fixed #645 by reverting support for screen scrolling [there are still some remains in settings file] 
Removed some unused code.
 2011-03-01 09:57:18 +00:00
Ivan Savenko
a2f512813f - gcc compile fixes 
- fixed locale issue
- Makefiles for StupidAI
- fix for #671 (not tested)
- linux readme update, including #598
 2011-02-28 15:14:26 +00:00
Michał W. Urbańczyk
03fdd22b1a Version set to 0.83c, to be released as development build. 
Code reorganizations in bonus system, allowing defining bonusNode-like classes.
Fixed some issues with artifact handling (proper updating of GUI when moving, minor fixes). 
Restoring battle AI for neutrals after loading game.
 2011-02-27 19:58:14 +00:00
mateuszb
1dd05788c9 * fixed #53 2011-02-26 17:32:56 +00:00
Michał W. Urbańczyk
236345e61d Fixed #674, #675, #676, #677. 2011-02-25 17:57:30 +00:00
DjWarmonger
2f4aabca52 Compile issue fixed - it's temporary solution. 2011-02-24 18:27:44 +00:00
mateuszb
ba7eb6ce49 * bug 492 fixed 
* boost::filesystem version set to 2 (should work with all relatively new versions of boost)
 2011-02-24 15:05:21 +00:00
Michał W. Urbańczyk
e505328fcd Reverted r1992 for now [boost < 1.46 won't work with it] 2011-02-24 14:01:58 +00:00
Michał W. Urbańczyk
1afcaf2817 * CThreadHelper.cpp now belongs to VCMI_lib project 
* fixed console on Windows (restored old code)
 * GeniusAI won't get blocked when it has a hero with tactics in battle
 * fixed an issue with switching turns in hot-seat mode when there is Cover of Darkness active
 * suppressed bonus system console output: it goes only to the logfile
 * [win32] setting thread names (debug purposes)
 * minor fixes
 2011-02-24 13:57:47 +00:00
mateuszb
0482195489 * bug 652 fixed 2011-02-24 13:14:52 +00:00
mateuszb
4647d4af2c boost 1.46 compile fixes. 2011-02-24 12:21:48 +00:00
mateuszb
5e0b0e49b2 * bug 392 fixed 2011-02-23 18:21:51 +00:00
mateuszb
6d6a1af9ed * fixed crash on after attack spell casting 
* more aggressive stack direction normalization after action
* artillery support
 2011-02-23 17:10:35 +00:00
mateuszb
e979802012 * fix for bug 672 2011-02-23 15:51:33 +00:00
mateuszb
a6b4cfdde7 * spell scroll campaign bonus 
* minor fix (gratuitous call to giveCampaignBonusToHero)
 2011-02-23 11:21:40 +00:00
Michał W. Urbańczyk
cab8f9e11d AI for neutral creatures and battles and player AIs can be different. StupidAI will handle neutrals by default. 
Fixes for issues with deserialization and handling Tactics secondary skill.
 2011-02-23 03:57:45 +00:00
mateuszb
b4edd10e6c * beegee's comments patch 
* very minor changes
 2011-02-22 11:52:36 +00:00
Michał W. Urbańczyk
a46ad0b7ef Next set of fixes, mostly for deserialization. 2011-02-22 09:47:25 +00:00
mateuszb
1458cf64c2 * fixed bug 298 
* fixed INDEPENDENT_MIN bonus value type
* minor changes
 2011-02-21 16:53:23 +00:00
mateuszb
43468e16e1 * bug 97 fixed 
* better handling of BLOCK_SPELLS_ABOVE_LEVEL bonus
 2011-02-21 13:27:31 +00:00
Michał W. Urbańczyk
4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +00:00
mateuszb
519a4186de * fixed bugs 470 and 523 
* minor improvements
 2011-02-20 18:32:39 +00:00
Ivan Savenko
450ae1772c - Buttons optimization - less memory and CPU usage 
- gcc compilation fixes
 2011-02-20 09:24:53 +00:00
mateuszb
4e631fc530 * fix for bug 573 
* minor changes
 2011-02-15 19:54:55 +00:00
Michał W. Urbańczyk
44619757e8 Fixed opening spellbook via hero screen. 2011-02-15 18:40:06 +00:00
Michał W. Urbańczyk
2f9ed138f6 Tactics more or less working (some improvements still needed, as proper updating battle GUI). 2011-02-14 20:31:53 +00:00
Michał W. Urbańczyk
99a7320e99 Fixes for Altar of Sacrifice (got broken after artifact rewrite) 2011-02-14 10:38:33 +00:00
Michał W. Urbańczyk
0c700f97cd A little progress with Eagle Eye and Tactics. 2011-02-13 22:46:04 +00:00
mateuszb
fcdc3f0bdd Various changes, including exprank limiter and development towards Tactics secondary skill support. 2011-02-12 16:12:48 +00:00
Michał W. Urbańczyk
ab20e024c0 Various fixes and improvements around kill hero and kill monster quests. A few minor unrelated fixes. 2011-02-11 12:27:38 +00:00
mateuszb
d630d88ac1 * some work towards fix of 537 
* 338 seems to be fixed
 2011-02-10 14:44:21 +00:00
mateuszb
8b8d06ac64 * fixed bug 257 
* minor changes
 2011-02-09 15:19:53 +00:00
mateuszb
8a4187df16 * fixed displaying animation of creature starting moving 2011-02-09 13:56:30 +00:00
Michał W. Urbańczyk
9f21e4b46f Minor compile fix, std::copy used that way overwrites original bonuses [but the code won't be needed anyway] 2011-02-09 12:33:58 +00:00
DjWarmonger
125f39275d Compile fix for previous commit. 2011-02-06 17:37:51 +00:00
Ivan Savenko
2ff07fa66a - Next part of animation system: 
-- Reduced memory usage for images with margins
-- Implemented RLE compression
- Linux-related changes:
-- build system updated to include changed paths
-- new dependency: boost-program-options
-- configure option --disable-debug will produce optimized build

- Several gcc compile fixes
- Optimized CPU usage on town screens
- Removed several includes from headers
- Possible fix for #496
 2011-02-06 17:26:27 +00:00
Michał W. Urbańczyk
31fc8f6db3 Merged Warmonger's changes from trunk 2011-02-06 08:32:05 +00:00
Michał W. Urbańczyk
a3ba75b0b7 Various fixes, mainly around garrisons. 2011-02-05 13:39:10 +00:00
Michał W. Urbańczyk
c6db92c0be More development around bonus system: building hierarchy, managing morale bonuses. Fully functional Spell Scroll and Angelic Alliance artifacts. Fixed recruiting hero and moving hero to garrison. 2011-02-04 14:58:14 +00:00
Michał W. Urbańczyk
15011e611d Merged Ivan's changes from trunk (r1921) 2011-01-28 02:33:26 +00:00
Michał W. Urbańczyk
a75a37008f Practically finished combined artifacts changes, many other fixes. 2011-01-28 02:11:58 +00:00
Michał W. Urbańczyk
092ab5a77f Fix for #662. 2011-01-24 00:09:08 +00:00
Michał W. Urbańczyk
e6d577c233 Mostly done combined artifacts. 
[assembling, disassembling, moving, picking]
 2011-01-23 23:49:17 +00:00
Michał W. Urbańczyk
3fde9e45df Partially redone combined artifacts. 2011-01-22 03:43:20 +00:00
Michał W. Urbańczyk
591ba76f69 Fixed initialization of recruited stacks. 
Fixed displaying garrison slots in CCastleInterface.
 2011-01-21 10:37:19 +00:00
Michał W. Urbańczyk
ed07cfe073 Configurable duels. 2011-01-21 02:36:30 +00:00
mateuszb
824d2b52db * more or less fixed spells 
* certain hero specialties are still broken
 2011-01-20 19:57:12 +00:00
mateuszb
2451c0dea6 * a bit better stack reversing 
* FoWChange uses unordered_set instead of set
 2011-01-20 17:25:15 +00:00
Michał W. Urbańczyk
898ad292ea A few fixes for artifacts. 2011-01-18 18:56:14 +00:00
mateuszb
a9c98d2b8c #463 and #571 should be fixed now 2011-01-18 18:54:53 +00:00
mateuszb
98494a5e6f * defensive stance implemented (bug #342 fixed) 2011-01-18 17:23:31 +00:00
mateuszb
8a063b88e5 * bug #569 fixed 2011-01-18 16:24:06 +00:00
Ivan Savenko
551d1f1b26 - Possible support for sounds in GOG version 
- Fixed all issues with Russian localisation
- (Linux) fixed #637
 2011-01-17 16:07:08 +00:00
Michał W. Urbańczyk
28550c85fd Merged Ivan's changes in trunk ( r1918 ) 2011-01-15 20:07:16 +00:00
Michał W. Urbańczyk
502bb5392e The last set of fixes for non-combined artifacts operations. 2011-01-15 17:58:08 +00:00
Ivan Savenko
77ba5a5cd6 - some minor fixes: #626 #597 #275 
- fixed console on Linux
 2011-01-15 17:30:46 +00:00
Michał W. Urbańczyk
f52d4f7cd6 Merged changes from trunk. 2011-01-15 02:35:46 +00:00
Michał W. Urbańczyk
a940daba5e A handful of fixes for artifacts, minor for for battles. 2011-01-15 02:17:56 +00:00
mateuszb
57580b87e1 * minor fix for battle interface 2011-01-14 18:08:01 +00:00
mateuszb
56ec829049 * minor refactoring 
* minor improvements in battle interface
 2011-01-09 17:41:46 +00:00
Michał W. Urbańczyk
c1bd81abdd Mostly fixed battle animations. 
Added proper ending for duel mode.
 2011-01-08 19:38:42 +00:00
Michał W. Urbańczyk
a53ec23556 Stupid AI is capable of winning / losing battle. 2011-01-08 18:33:40 +00:00
mateuszb
957f1764d7 * some progress in StupidAI 
* refactoring of battle handling
WARNING: strange crash on entering battle
 2011-01-07 10:48:31 +00:00
Michał W. Urbańczyk
401b364ad7 Partially functional artifact screen. 
[TBD compound artifacts, backpack arranging, "live" modifying values, many details]
 2011-01-06 20:00:19 +00:00
Ivan Savenko
b8f65697ca - fixes for several bugs: #639 #656 #135 #646 #638 #94 #629 
- re-enabled console on Linux to allow disabling AI
 2011-01-01 20:26:39 +00:00
Michał W. Urbańczyk
c9189119b9 Little more work on artifacts. 2010-12-29 21:04:22 +00:00
mateuszb
8104a43809 * a voodoo fix of a mysterious bug 2010-12-27 10:48:28 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
mateuszb
b3fd14b524 * splitted CGameState into general game state and battle game state 
* added missing fields to serialize in CHero
 2010-12-25 19:23:30 +00:00
Michał W. Urbańczyk
2cf6729eee Towards duel support. 2010-12-25 01:43:40 +00:00
mateuszb
6383c9a013 * more extensive usage of CStack pointers instead of stack IDs 2010-12-24 21:44:48 +00:00
mateuszb
4929cf9782 * enum for secondary skills 
* THex for battle positions
* towards removal of battleGetStackByID

TODO:
investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp
 2010-12-23 20:18:10 +00:00
Michał W. Urbańczyk
2fe8b07f4f Little more development for duel mode. 2010-12-23 00:33:48 +00:00
mateuszb
af2c4633ad * partially done duel mode 
* program options parsing via boost::program_options
* Stupid AI - a stupid battle-only AI
* precompiled headers for server and Stupid AI on MSVC
 2010-12-22 20:14:40 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done 
* hch contents distributed to more appropriate folders
 2010-12-20 21:22:53 +00:00
mateuszb
8b831c1f46 Const-transitiveness of CGI almost reached 2010-12-20 13:04:24 +00:00
mateuszb
b15deaa203 * more constTransitivePointers in GameInfo, separated client GUI classes from it, moved def handlers from CGDefInfo 2010-12-19 14:39:56 +00:00
mateuszb
5806976a9a * towards ConstTranssitivePointers in CGI 2010-12-18 22:11:28 +00:00
mateuszb
23c501b79e some changes 2010-12-17 18:47:07 +00:00
Michał W. Urbańczyk
b15ac97c62 Half done refactoring of CHeroWindow. 2010-12-16 22:32:53 +00:00
Michał W. Urbańczyk
e301256f92 Adjusted player interface to new set of stack operations. 
Const transitive ptr.
 2010-12-14 21:55:23 +00:00
Michał W. Urbańczyk
f7f917845c Merged changes from trunk ( r1885 ) 2010-12-14 18:08:21 +00:00
mateuszb
3989afd153 * more const-correct interface 2010-12-13 20:16:18 +00:00
Michał W. Urbańczyk
02e4ef507e Stacks #5: giving creatures, practically finished (many fixes needed). 2010-12-12 23:44:16 +00:00
Michał W. Urbańczyk
fc6d6e02a3 More fixes for stacks, some basic macro-based logging for bonus graph operations. 2010-12-11 23:11:26 +00:00
Michał W. Urbańczyk
e677cd5b07 Merged r1880. 2010-12-11 20:30:33 +00:00
Michał W. Urbańczyk
69b97e0a51 Little more changes. 2010-12-09 23:10:28 +00:00
mateuszb
ad48681d91 * cleanup 2010-12-08 20:17:05 +00:00
Michał W. Urbańczyk
f020562570 Merged changes from trunk. 2010-12-05 23:26:56 +00:00
Michał W. Urbańczyk
848a00bc6f Stacks #4 -> giving creatures still needs to be fixed. 2010-12-05 23:10:02 +00:00
mateuszb
6f56b5bb30 * a few more consts 2010-12-04 19:44:23 +00:00
mateuszb
efedb1a55a * minor cleanup 2010-12-04 19:15:20 +00:00
DjWarmonger
ea03273c8e Some work towards useful AI: 
-It is possible to toggle adventure AI on / off typing "ai" in the console (default is true)
-General cleaning and formatting of code
-Some minor optimizations
-Teal console log for AI

AI tends to hang in the maze of mutexes and current player interface, further investigation is needed.

Fixed #580
minor tweaks
 2010-11-28 16:39:13 +00:00
Michał W. Urbańczyk
fdb541d81e Stacks #3 -> towards new system of stack operations. 2010-11-27 20:17:28 +00:00
Michał W. Urbańczyk
7c3f3d20c3 Stacks #2 -> towards new system of stack operations. 2010-11-27 01:46:19 +00:00
Michał W. Urbańczyk
32ce20af15 Moving stack system to pointers, part #1 2010-11-22 00:34:46 +00:00
Michał W. Urbańczyk
9250cc8adf Separated CStack and CStackInstance. 2010-11-20 17:36:02 +00:00
Michał W. Urbańczyk
cdf7b2b4d9 Bonuses now use pointers. 
Things are very broken.
 2010-11-18 22:06:56 +00:00
Michał W. Urbańczyk
4d657eaf47 Merges from trunk. Minor changes. 2010-11-18 18:07:57 +00:00
Ivan Savenko
73a4c2e446 - missed Hill Fort fixes 
- compile fix
 2010-11-18 13:34:21 +00:00
Ivan Savenko
265d7a22d6 Animation system update: 
-- files moved to /client, GUI classes added
-- handling of creatures, used in creature cards, fixed #469 \ #490
-- handling of town buildings
#631 crash at hill fort fixed
 2010-11-15 15:15:00 +00:00
DjWarmonger
310a36c8d1 Fixed 313 & 314 :) 2010-11-15 12:51:53 +00:00
DjWarmonger
56cd172b82 Fixed #296 
Partial fix for #314
 2010-11-15 07:15:10 +00:00
Michał W. Urbańczyk
9028684697 Disemboweling the system. 
Things are broken now.
 2010-11-13 20:26:15 +00:00
Michał W. Urbańczyk
bce805dacc Restored Warmonger's changes to artifacts system. 
They will be subject of my further work, along with next part of bonus system.
 2010-11-10 00:06:25 +00:00
Ivan Savenko
9771dd12ff - changes in LodHandler: 
-- file type (text, image...) can be specified in getFile(), all hacks removed
-- replaced Nodrze with std::set
-  some gcc warnings fixed
 2010-11-09 11:27:58 +00:00
Michał W. Urbańczyk
4434a73651 #630, ofstream doesn't have constructor from std::string on older compilers. 2010-11-07 12:14:31 +00:00
Michał W. Urbańczyk
d715510bee Version bump. 
Fixed a stupid typo, thankfully not very breaking.
 2010-11-06 14:43:48 +00:00
Michał W. Urbańczyk
5d1111019c Fix for garrison issue. 
To be released as second hotfix.
 2010-11-05 21:44:11 +00:00
Michał W. Urbańczyk
30ae49864a Workaround for the font issue. 2010-11-05 20:48:54 +00:00
Michał W. Urbańczyk
0f4478d8cf Hotfix for meeting window. 2010-11-04 23:28:26 +00:00
Michał W. Urbańczyk
1c8d909433 Hotfix for loading game. 2010-11-03 11:34:25 +00:00
Michał W. Urbańczyk
5004c1188b Since filename extensions are omitted, GARRISON.TXT was hiding GARRISON.BMP. I've added a crude workaround (ignore the first file since it's not used). 
Fixed #613.
 2010-10-31 21:29:39 +00:00
Michał W. Urbańczyk
a346708398 #610 / minor 2010-10-31 19:56:37 +00:00
Michał W. Urbańczyk
dc5370ad6e Fixed #585 and #588. 2010-10-31 19:17:26 +00:00
Frank Zago
dbe38a7062 A few bug fixes and arious warning fixes: unused code/variables, out of order initializations, ... 2010-10-30 21:53:41 +00:00
Michał W. Urbańczyk
e83b9fa8fa Fixed battles for network MP. 2010-10-30 19:26:39 +00:00
Michał W. Urbańczyk
0e12c1419e Not very nice fix for campaigns. 2010-10-30 14:53:23 +00:00
Ivan Savenko
923fed7dc1 - fix for bonuses in campaign screen 
- fixed gcc warnings
- build system updated
 2010-10-25 19:37:21 +00:00
Michał W. Urbańczyk
e301f8e048 Reenabled campaigns. Workaround for crash when button graphic is not available. 2010-10-24 21:29:18 +00:00
Michał W. Urbańczyk
daeb3af67a Early changes towards MP support. 
It's possible to connect several clients (running on localhost) and enter MP pregame. The actual MP game still not playable. (though it can be started)
 2010-10-24 11:35:14 +00:00
Michał W. Urbańczyk
aa131bbf15 Reverted r1811, r1812, r1813 2010-10-24 11:23:43 +00:00
Ivan Savenko
c10dac929d - New animation system: 
-- New files: hch/CAnimation.h/cpp
-- Class CAnimation capable to load file partially and/or keep data in compressed state
-- Buttons now use CAnimation instead of CDefHandler

- build system regenerated to include new files
- fixed several gcc warnings
- updated README.linux
 2010-10-18 15:08:59 +00:00
DjWarmonger
6cadd47f0d Fixes for artifact system - instances are serialized and synchronized. However, still some serializer issue prevents Scroll from working. 2010-10-09 18:38:32 +00:00
DjWarmonger
b75cf89f86 Partial support for customizable artifacts and Spell Scroll. Still doesn't work, though. 2010-10-03 17:52:11 +00:00
DjWarmonger
0f314e106c Artifacts will now be handled by pointers. 
Assembling & disassembling combos may be buggy, but it's already been before.
 2010-10-03 07:07:53 +00:00
DjWarmonger
2c43707661 More fixes for weeks & growths. 2010-10-02 09:43:22 +00:00
DjWarmonger
02d7fa35b7 A number of fixes. Banks serialization, doubling spell effects, week of plague. 2010-10-02 07:10:38 +00:00
DjWarmonger
47c8ee2e13 Statue of Legion constituents are now properly handled by GUI. 2010-09-26 05:21:09 +00:00
DjWarmonger
717141ab0b Statue of Legion is finally functional. 
You can see my attempt to create very generic handling of global effects, but I abandoned it since no other items might actually use it.

However, Statue's constituents are buggy, so may be assembling & dissasembling them. Most likely this issue is general.
 2010-09-25 20:23:55 +00:00
mateuszb
9356ba15ef * minor improvements for campaigns 2010-09-04 14:49:15 +00:00
Frank Zago
4b8be22fb6 Several compile/link fixes. 2010-09-04 14:47:39 +00:00
mateuszb
4ba3c68ced Chenges (networking for PG, minor fixes) 2010-09-03 18:42:54 +00:00
mateuszb
608e26b453 * a few fixes for CStack.effects removal - more should come 2010-08-31 10:22:21 +00:00
DjWarmonger
bfe266a377 Moved battle effects to bonus system. May be buggy. 
Moved creature damage to bonus system, simplified its handling. Some changes and tweaks.

Support for Adela's bless.
 2010-08-30 18:06:17 +00:00
Ivan Savenko
9e8d0651f6 - fix for #32 (b) 
- fix for some warnings
 2010-08-29 23:12:34 +00:00
DjWarmonger
cb1a01950f Fixed #617 2010-08-29 09:00:59 +00:00
Ivan Savenko
88fd213e87 - LodHandler now will ignore file extensions. 
Special case: MSK\MSG files (they have same names as def) can be accessed as file#msk or file#msg
- some fixes
 2010-08-28 15:10:37 +00:00
mateuszb
fc79b9b6cf * partial implementation of hero crossover 
* minor fixes to resolution handling
* other minor fixes and changes
 2010-08-28 14:52:20 +00:00
Ivan Savenko
4d171bd53c -rewrote GarrisonInt with use of object capturing 
- BitmapHandler can now load images from any format supported by SDL_Image
note: file can have any possible format but extension should be .bmp or .pcx
- fixed some warnings
 2010-08-27 16:20:35 +00:00
mateuszb
d1bfe4cbd6 * a bit better screen scrolling for small resolutions 
* a bit optimized terrainRect
 2010-08-26 15:33:55 +00:00
mateuszb
c45d037bc8 * small bugfix for hiding tiles 
* minor changes
 2010-08-26 12:06:36 +00:00
DjWarmonger
c7f8f0a967 Support for creature weeks and Deity of Fire is now complete. 2010-08-26 07:23:08 +00:00
Ivan Savenko
dc2f3cf181 - some fixes for town events 
- #190 - InfoWindow components adjusted vertically
- #194 - correct sex for heroes in battles
 2010-08-25 14:57:58 +00:00
mateuszb
7cad2364fe * minor fixes for screen scrolling 2010-08-23 16:13:30 +00:00
mateuszb
6b8718b046 * partially done support for resolutions smaller than 800x600 by screen scrolling 2010-08-23 15:16:40 +00:00
DjWarmonger
6f94fcd083 Minor fix for creature Component. 
Some missing code also.
 2010-08-22 07:54:24 +00:00
Frank Zago
e252c2d06c Build files update. 2010-08-21 00:41:40 +00:00
mateuszb
d681afe1c1 Changes towards campaign support. 2010-08-20 13:34:39 +00:00
mateuszb
6ebfe25f86 * compile fixes & minor changes (I hope they are correct, SComponent::setSurface didn't return any value and failed to compile - I'm not sure if I return proper value). 2010-08-19 15:24:32 +00:00
Ivan Savenko
d732565002 - blocked retreating from castle. Escape Tunnel implemented. 
- fixed crash when player have no hero (like castle defence)
- minor fixes
 2010-08-19 11:03:33 +00:00
Ivan Savenko
8319e5e703 - town events implemented 
- merged CustomImagecComponent into SComponent
- moved some subID-related code from CastleInterface
 2010-08-18 14:24:30 +00:00
Michał W. Urbańczyk
7e5b675cbf Fixed crash on drawing selectable component. 2010-08-18 10:58:41 +00:00
Michał W. Urbańczyk
58c2e176c4 Smarter fix for #577 ;) 2010-08-18 10:53:59 +00:00
Michał W. Urbańczyk
6057ca0c0b Reverted r1752 
[breaks a few things]
 2010-08-18 10:52:30 +00:00
mateuszb
fe87ba6608 * fixed crash on displaying right or bottom part of advmap 2010-08-18 10:37:43 +00:00
Michał W. Urbańczyk
4aa60cd40e Minor changes. 2010-08-18 09:50:25 +00:00
DjWarmonger
48b262756b Fixed #577. New BlockingDialog functionality - only accept. 2010-08-17 16:26:48 +00:00
DjWarmonger
6c3ad7fcae Fixed #565. Creature components will not get description if they quantity is set to zero. 2010-08-17 15:50:17 +00:00
DjWarmonger
084a0148c7 Compile fix + minor changes. 2010-08-17 15:16:08 +00:00
mateuszb
9c60629bcf * minor changes 2010-08-17 14:58:13 +00:00
mateuszb
c96dab5c7e * reverting prevoius revisiom 
* minor changes
 2010-08-17 12:48:34 +00:00
mateuszb
9aa6d0a7b9 * refactoring of map handler and minor changes 2010-08-16 13:51:31 +00:00
mateuszb
9445e5b184 * small refactoring 
Please don't touch CGI->state directly in client code - use callbacks instead. I'd like to make some mechanics-critical handlers in CGI const - a lot of work, certain changes have been done here.
 2010-08-16 09:54:09 +00:00
Ivan Savenko
fd45cd0a6d - fix for #283 
- ally support: adventure map
 2010-08-13 10:46:08 +00:00
Ivan Savenko
520d40cc59 - uploaded config/settings.txt from 0.82 (fix for #605) 
- fixes for #604 and #364
- ally support is mostly done:
-- exchange between heroes
-- exchange between hero\town
-- finishing the game
 2010-08-12 15:54:25 +00:00
Michał W. Urbańczyk
f76e28ee95 Creature animations in 16 bpp. 2010-08-12 05:22:48 +00:00
Ivan Savenko
bdcdc89991 - University fix for #594 
- Ally support:
- - fix for non-continuous players (notes to rev 1736)
- - objects visiting and shared puzzle map
 2010-08-06 13:14:10 +00:00
Frank Zago
904f764628 Compile and warning fixes. 2010-08-06 02:47:43 +00:00
mateuszb
6928f850b9 * fixed 494 
* minor changes
 2010-08-05 11:47:57 +00:00
Michał W. Urbańczyk
78f44dc648 Support for 16bpp displays. Possible optimizations. 2010-08-05 11:02:18 +00:00
mateuszb
a95bb9d916 * fixed 576 
* new cheat code: vcmiforgeofnoldorking - hero gets all artifacts except spell book, spell scrolls and war machines
 2010-08-05 09:47:12 +00:00
mateuszb
7002e73908 * small fix 2010-08-05 07:52:34 +00:00
mateuszb
844d170b4f * Town portal implemented 2010-08-04 13:41:01 +00:00
mateuszb
52319f5713 * CBonusSelection will now work on CCampaignState instead of CCampaign; unfortunately there seems to be no elegant way to move that state between bonus selection screen and CGameState::init, so it's not yet moved. 2010-08-04 11:18:13 +00:00
Ivan Savenko
3c868146a6 - linux fix for BuildingHandler 
- #584 should be fixed

- first part of ally support:
-- shared FoW
-- function Callback::getPlayerRelations for team checking
 2010-08-03 12:34:06 +00:00
mateuszb
54496ddee1 * player's serialID removed (save format broken, new game seems to work) 
* building bonus (campaigns) supported
 2010-08-03 11:36:52 +00:00
mateuszb
3361126c55 * partially done building bonus (campaigns) 
* ERMU -> picture name mapping by Ivan (thanks)
 2010-08-02 14:29:30 +00:00
mateuszb
34c58bc966 * fixed some warnings 2010-08-02 11:06:49 +00:00
Michał W. Urbańczyk
4140711b6d Version set to 0.82. 
Updated changelog.
Fixed crashes on losing.
 2010-08-01 14:46:19 +00:00
mateuszb
b441143a73 * monster campaign bonus handled 
* selecting / displaying difficulty
 2010-08-01 14:40:34 +00:00
Michał W. Urbańczyk
c6653949e1 Fixed #90, #581, #567. 
Broken #87
 2010-08-01 14:04:48 +00:00
mateuszb
c06de1f1ce * improved campaign handling - bonus selection screen is mostly functional 
* preliminary support for giving campaign bonuses (resources and spells, artifacts, skills for generated hero are given)
* differing the amount of resources given to AI and human players
* minor changes
 2010-07-31 13:55:05 +00:00
Ivan Savenko
1338340027 - fixed 578 
- minor fix to hero window
 2010-07-31 13:18:40 +00:00
Michał W. Urbańczyk
558350c686 Fixed #564. 
Minor improvements.
 2010-07-31 01:38:12 +00:00
mateuszb
af7aebc806 * minor changes 2010-07-30 14:26:37 +00:00
mateuszb
99fcb23182 * several implrovements in campaign handling 
* new cheat codes:
- vcmisilmaril - player wins
- vcmimelkor - player loses
 2010-07-30 11:29:42 +00:00
Frank Zago
686061071f Compile fix. 2010-07-30 02:08:53 +00:00
mateuszb
052e4f08e5 * partially done campaign bonus selection 2010-07-29 17:00:34 +00:00
mateuszb
d3bf011270 * fixed #559 2010-07-29 12:54:30 +00:00
Ivan Savenko
c1f0b956f4 bugfixing: 
#124 - level-up code will now use ping-pong mode
#145 - switched skills positions, 1st skill will be selected
#545 - replaced images in  reward dialog of seer hut
 2010-07-28 22:39:56 +00:00
Michał W. Urbańczyk
fc4c496f99 Fixed #556. Version for dev build 0.81d 
EDIT: r1703 will be 0.81d
 2010-07-28 22:24:16 +00:00
Michał W. Urbańczyk
cc96374a40 Fixed #552 2010-07-28 10:46:36 +00:00
mateuszb
f004cbff3f * fixed #550 2010-07-28 10:09:15 +00:00
Ivan Savenko
e025a43cb0 - some fixes for Castle Gate and Hill Fort 
- removed unavailable in Hill Fort upgrades from cr_upgrade_list.txt
- fixed bug in upgrading creatures
- workaround to make VCMI work with Russian language files (possibly fixed 289)
 2010-07-26 23:20:21 +00:00
Michał W. Urbańczyk
2b899d5777 Fixed #544. Final fix for #493. 2010-07-26 20:56:39 +00:00
Michał W. Urbańczyk
dc936d5686 Fixed #543 and #547. Fixes for marketplace. Combined artifacts will again give bonuses from their constituents. 2010-07-26 15:37:58 +00:00
Ivan Savenko
a00e5cc177 - implemented scholar skill 
- fixed some remaining building issues (#361)
- Portal of Summoning will now be present in fort window
- some fixes for Thieves Guild window (partial #386)
 2010-07-25 22:47:59 +00:00
Michał W. Urbańczyk
ff078dc440 Fixed #522 (probably), #529, #540. 
Version to be released as dev build 0.81b
 2010-07-24 11:46:04 +00:00
Michał W. Urbańczyk
4e9e3fce73 Minor improvements for the Hill Fort. 2010-07-23 12:13:03 +00:00
Michał W. Urbańczyk
8487653a8e Sacrificing artifacts. [Code is one giant workaround but should work good enough.] Updated changelog. 2010-07-23 12:02:15 +00:00
Ivan Savenko
215dc95acb - implemented Hill Fort (minor issue - you can do ANY upgrades, including archers to sharpshooters without Gelu and so on) 
- fixed some g++ errors in macroses
- minor tweaks
 2010-07-22 00:32:45 +00:00
Michał W. Urbańczyk
2f996f14ba Exchanging artifacts between slots should work again nicely. Minor fixes. 2010-07-21 19:50:15 +00:00
Michał W. Urbańczyk
90faf3fbdc Little missing piece - opening on adv maps spells from hero / exchange / kingdom windows. Minor fix. 2010-07-21 10:20:32 +00:00
Michał W. Urbańczyk
931949e349 A bunch of spellbook-related fixes: #91, #454, #462, #526, #527, #536 2010-07-21 10:09:29 +00:00
Michał W. Urbańczyk
7ae02b7c5a Fixed #471. 
Bonuses from artifacts are now inherited. Some work on artifacts set GUI. CArtifactsOfHero now operates on its own hero copy when picking artifact. Still more fixes are needed though.
 2010-07-20 18:34:32 +00:00
Ivan Savenko
5dc444cd2b - University is finally implemented, both town and map objects 2010-07-20 14:08:13 +00:00
Michał W. Urbańczyk
cd9ab4cc62 VCMI won't crash with invalid video file (should fix #92). 2010-07-20 10:46:38 +00:00
Michał W. Urbańczyk
0e9eb1ab2d Fixed #534, minor correction. 2010-07-20 09:16:48 +00:00
Michał W. Urbańczyk
cedf6d812c Half-done Altar of Sacrifice. (Sacrificing creatures should work) 2010-07-20 06:05:45 +00:00
Frank Zago
c9439b1621 Removed some c++0x extensions. 2010-07-17 22:53:04 +00:00
Frank Zago
eecfa0f2bd (g++) Compilation fixes. 2010-07-17 01:19:16 +00:00
DjWarmonger
52c224502c Compilation fix. Creature damage will now be displayed correctly. 2010-07-16 15:52:21 +00:00
mateuszb
a7d3c5fbca * minor cleanups 2010-07-16 14:22:18 +00:00
mateuszb
565d474364 * fixed #519 2010-07-15 17:13:17 +00:00
mateuszb
af52f308a2 * fixed #438 and crash on ZMM170S.DEF 2010-07-15 16:21:53 +00:00
mateuszb
bb5d765247 * fixed #485 2010-07-15 11:28:06 +00:00
Michał W. Urbańczyk
fffef1d740 Changes towards Hill fort support. 2010-07-15 03:04:57 +00:00
Michał W. Urbańczyk
9febb357ff Fixed #504. More logging for #419. 2010-07-14 01:08:27 +00:00
Michał W. Urbańczyk
88e1636250 Fixed #15, #224, #370, #516 
Minor changes.
 2010-07-13 05:25:40 +00:00
Michał W. Urbańczyk
fa4ee94cf9 Fixed #484. Preliminary support for bonus limiters/ 2010-07-12 10:20:25 +00:00
Ivan Savenko
bb7615309f - Implemented Portal of Summoning (Dungeon) 2010-07-10 16:50:23 +00:00
Michał W. Urbańczyk
3af697b91a Support for Favourable Winds. 2010-07-09 04:29:11 +00:00
Michał W. Urbańczyk
1e30045541 Support for Tavern on adv map. 2010-07-08 23:03:27 +00:00
Michał W. Urbańczyk
d3c6270980 Fixed a few potential crashes. 
Minor improvements.
 2010-07-07 02:29:07 +00:00
Michał W. Urbańczyk
88b4d69afa Minor fixes. 2010-07-06 02:40:42 +00:00
Michał W. Urbańczyk
d0ff61807d Obtaining town instance pointer via cb. Plz, don't access gamestate directly from player interface! Everything has to go via callback. 
Commented out giving starting artifact - new artifact randomization make it crashing. Please fix it.

New control - CTextBox - for multi-line text with optional slider. Used it for map description and info windows. Related changes. Fixes #22 and #96.
 2010-07-06 02:10:26 +00:00
Ivan Savenko
e4fcfd7044 - Skeleton transformer implemented 2010-07-03 12:00:53 +00:00
DjWarmonger
88f0ee0682 Added missing include for previous commit. Use of undefined type again. 2010-07-01 06:05:00 +00:00
Ivan Savenko
60c90af39c #41 - Implemented Castle Gates 
#375, #376 - fixed recruit window 
#362, #377 - fixed town window
 2010-06-30 19:27:35 +00:00
Michał W. Urbańczyk
21a05d73cb Black Market and Artifact Merchant (only buying artifacts) support. 2010-06-27 16:03:01 +00:00
Michał W. Urbańczyk
ec6342d9a7 Serializer will now smartly send over network CArtifact* and CHero*. Unified handling of items stored in vector. 
Started making support for Black Market / Artifact merchant.
 2010-06-26 16:02:10 +00:00
Ivan Savenko
2a99bc76da - part of castle gate handling (need to make server-client interaction) 
- minor fixes ( 361, 507, 466 )
 2010-06-26 10:01:26 +00:00
Michał W. Urbańczyk
e2fd2bbe04 Fixed #446 and #219. 
Version bumped.
 2010-06-24 12:10:45 +00:00
DjWarmonger
2ed69d3f4d Support for Cover of Darkness 2010-06-06 06:05:39 +00:00
DjWarmonger
b118060304 Major optimization of getVisBitmap() 2010-06-03 05:38:59 +00:00
Michał W. Urbańczyk
eb42048fbc Reverted r1596 2010-06-01 19:05:30 +00:00
mateuszb
d3aa5b6820 * possibly fixed problems with crashes on winning resources in creature bank 2010-06-01 17:40:15 +00:00
Michał W. Urbańczyk
124f0dd401 Possible deadlock fixed. 2010-05-31 23:53:35 +00:00
Michał W. Urbańczyk
39eb87924e Fixed #473, #475, #477 2010-05-31 21:14:15 +00:00
Michał W. Urbańczyk
9af18cf487 Fixed #464 and #467 2010-05-31 20:38:14 +00:00
Michał W. Urbańczyk
abf54deaa3 Fixed #459 and #465. 
Fixed crash on closing creature info window when upgrade was possible ( http://forum.vcmi.eu/viewtopic.php?p=4669#4669 ).
 2010-05-30 11:48:24 +00:00
Michał W. Urbańczyk
c55397f3ab Version set to 0.8b - for dev release. 
Minor.
 2010-05-26 22:54:00 +00:00
Michał W. Urbańczyk
3111a904ae Several minor fixes. 2010-05-26 21:59:58 +00:00
Michał W. Urbańczyk
8bda10b695 * Freelancer's Guild support (both town structure and adventure map object) 
* fixed crashes on r-click on hero in tavern and adv map
* fixed descync issue
* allow free movement FROM guarded tile
 2010-05-26 09:47:53 +00:00
mateuszb
0ac8430b11 * support for armor of the damned 2010-05-19 18:06:16 +00:00
Michał W. Urbańczyk
1002bd2b4f Trading Post handling. 2010-05-18 07:01:54 +00:00
mateuszb
71b73bad53 * mostly working hero flying and water walking; support for artifacts: 
- Angel's Wings
- Boots of levitation
and spells
- fly
- water walk
 2010-05-16 13:42:19 +00:00
mateuszb
0ebad5bed6 * fixed calling heroBonusChanged when artifact is unequipped; please fix hero screen without const_casts on hero (no mechanically important variable should be changed locally) 2010-05-16 12:34:48 +00:00
mateuszb
edd31ef41b * half-working boots of levitation and angel's wings 2010-05-15 15:00:19 +00:00
Michał W. Urbańczyk
70fa697f8b Support for War Machine Factory. 2010-05-15 08:33:32 +00:00
Michał W. Urbańczyk
bb80d4bc02 * support for build grail victory condition 
* improved formula for necromancy to match better OH3
* Support for new town structures:
- Lighthouse
- Colossus
- Guardian Spirit
- Necromancy Amplifier
- Soul Prison
 2010-05-14 02:18:37 +00:00
Frank Zago
df151cceba Various compile and warning fixes. 2010-05-12 02:32:56 +00:00
OnionKnight
87e66fff31 * Changed artifact handling so bonuses from constituent artifacts in combinational ones are added implicitly. 
* Discovered bug when attacking guarded visitables. Needs to wait before battle is over.
 2010-05-09 19:10:59 +00:00
mateuszb
adbc142ff0 * a bit of campaign support 2010-05-08 18:56:38 +00:00
Michał W. Urbańczyk
921bddc35e Some changes to the market window, sending resources to other players. 2010-05-07 22:10:32 +00:00
mateuszb
3c72644880 * teleportation implemented 2010-05-07 14:05:48 +00:00
mateuszb
dbbbaa1e18 * life drain implemented 
* fixed #134
* fixed damage calculation formula
 2010-05-07 12:29:41 +00:00
OnionKnight
cc616616c1 * Creatures now guard surrounding tiles. 2010-05-06 12:13:31 +00:00
DjWarmonger
931cebdb04 Some conflicts resolved, minor changes. 2010-05-03 06:25:19 +00:00
Michał W. Urbańczyk
7ad7a36363 Fixed crash on battle end. 2010-05-02 23:36:08 +00:00
Michał W. Urbańczyk
a14606f32d New bonus system. Unified HeroBonus and StackFeature. Still early version, will need improvements and development. 
If you encounter any new crashes / bugs / unacceptable slowdowns, please PM me.
 2010-05-02 18:20:26 +00:00
Frank Zago
c331aaf2f4 Updated makefiles. 2010-04-07 03:42:59 +00:00
mateuszb
5d3d9689e8 * luck support 
* support for distance/wall penalties & no * penalty abilities
* reworked damage calculation to fit OH3 formula better
 2010-04-06 13:19:54 +00:00
mateuszb
943c433d3f * moved mapHandler to client folder 2010-04-06 08:59:24 +00:00
mateuszb
de69d6f639 * minor speedups 2010-04-04 08:47:00 +00:00