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