games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
3,395 Commits 30 Branches 75 Tags
30a0237fb88f1869d3798f7cfa9b7fc22df1ddb2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał W. Urbańczyk 30a0237fb8 Merged the 092c-compat branch. 2013-09-28 12:31:06 +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 0a0048fdf4 Updated EmptyAI project to follow the conventions. 2013-09-27 23:41:15 +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
Michał W. Urbańczyk 0e5a59e2a5 Changes related to #1444 — fixing affected savegames, assert to detect when things go wrong. 2013-09-27 15:20:42 +00:00
Michał W. Urbańczyk d4a8e90460 Fixed #1448, #1470 2013-09-14 19:09:35 +00:00
Michał W. Urbańczyk 20be1631a6 Bumped format version, merged r3457. 2013-09-13 00:37:09 +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 b420626a30 Merger r3544. 2013-09-11 22:11:28 +00:00
Michał W. Urbańczyk f6ab4609fe Version set to 0.93c. 2013-09-11 22:09:17 +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
Michał W. Urbańczyk 9aaaa0027e Branch for debugging/solving 0.92b reports — compatible with its savegames and having some fixes. 2013-09-11 11:57:43 +00:00
Michał W. Urbańczyk a1d3bcb276 Fixed #1434. 2013-09-08 22:45:40 +00:00
Michał W. Urbańczyk d307ed5f92 Updated readme with the links to our pages + updated the year. 2013-09-08 21:57:00 +00:00
Michał W. Urbańczyk ab042aa685 Boat will be removed when hero is defeated on water. 
Should fix #1303, #1419, #1425.
 2013-09-08 21:50:49 +00:00
Michał W. Urbańczyk 141c1a9854 Not crash when asking callback about requirements for not existing building, fixing #1444 corrupted saves (for testing). 2013-09-07 16:57:31 +00:00
Michał W. Urbańczyk dd72261193 Fixed #1437. 2013-09-05 22:11:13 +00:00
Michał W. Urbańczyk 6fc87d0df1 Fixed #1426. 2013-09-04 22:57:41 +00:00
Michał W. Urbańczyk f217c61131 Added launcher to solution, fixed .rc file so launcher has its icon. 2013-09-04 20:12:37 +00:00
Michał W. Urbańczyk a2610de87d Fixed #1385 (and possible some related issues) 2013-09-03 13:18:09 +00:00
Michał W. Urbańczyk a50e9219c2 Launcher works for me. 
Details: http://forum.vcmi.eu/viewtopic.php?p=10290#10290
 2013-09-02 17:26:52 +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
Michał W. Urbańczyk 92246a2c17 * Fixed #1417 — infinite loop of AI trying to visit allied creture generator 
* Fixed #1401 — battle AI won't attempt attacks with First Aid Tent
 2013-08-25 13:03:29 +00:00
Michał W. Urbańczyk 38c1542d9d Fixed crash on battle end — don't attempt giving exp to loser (hero is removed -> can't get exp -> crash). 2013-08-18 17:49:31 +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
Michał W. Urbańczyk 2e92bfb617 Added missing property sheets to RD|Win32 configuration. 2013-08-18 11:44:14 +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 be3da8fcf8 Unique macro for minizip exports. Define to nothing on non-msvc. 2013-08-01 22:37:08 +00:00
Michał W. Urbańczyk c57b159fc9 Missed one call. 2013-08-01 22:36:49 +00:00
Michał W. Urbańczyk eb90f93231 Dereference optional in logs. 2013-08-01 16:26:29 +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
Michał W. Urbańczyk 91a1f0eae5 Proejct file for minizip library, fixes compilation issues. 2013-08-01 09:55:57 +00:00
Michał W. Urbańczyk d8a27d8f3c Refactored player-specific data into single struct BattleState. 2013-07-21 22:01:29 +00:00
Michał W. Urbańczyk 0eb496fb57 Fixed #1338 and #1341. Introduced post-load step to ease initialization of bonus source ids. 2013-07-21 14:19:29 +00:00
Michał W. Urbańczyk 1e11904d8a Fixed Remove Obstacle. TODO: limit its working on spell-created obstacles depending on spell school level. 2013-07-21 10:25:12 +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
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
Michał W. Urbańczyk 2f1cf09881 VS project for Tests, not really working ATM though. 2013-07-07 08:30:06 +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
Michał W. Urbańczyk 68603245c4 Or should not be the same way as And. 2013-07-03 20:18:41 +00:00
Michał W. Urbańczyk 1e8c58ecdf Patch from O01eg fixing #1308 http://forum.vcmi.eu/viewtopic.php?t=721 
Helper functions for enabling/disabling smart vector memeber serialziation. [doesn't really save writing but adds consistency]
 2013-07-02 16:48:01 +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 7a8e401860 Ignore the cmath-fix block on non-vs compilers. 2013-07-02 15:19:54 +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
Michał W. Urbańczyk 1a2c8de6ad Minor improvements. 2013-06-24 14:35:27 +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
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
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
Michał W. Urbańczyk 1d46db6a57 Post-release version bump. 2013-06-01 20:19:03 +00:00
Michał W. Urbańczyk 7e13e85762 Changelog. 2013-06-01 14:11:28 +00:00
Michał W. Urbańczyk f19e41d38c Fixed #1269. 
Version set to 0.93.
 2013-05-31 22:23:53 +00:00
Michał W. Urbańczyk 1e8e932323 Logging around #1237. Typos. 2013-05-30 12:14:39 +00:00
Michał W. Urbańczyk 608a080971 Partial support for serializing std::shared_ptr. Should fix #1281. 2013-05-30 10:44:39 +00:00
Michał W. Urbańczyk 11bcc48cc3 Version bump 0.92c. Fixed #1268. Split a few mehods from CGameState::init. 2013-05-28 22:47:15 +00:00
Michał W. Urbańczyk 9f5d1ba623 Fixed #1271. 2013-05-27 21:46:04 +00:00
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
Michał W. Urbańczyk 1c7aad6a50 Improved handling buildings with mode "auto": 
* they will properly processed (new creatures will be added if dwelling, spells learned if mage guild, and so)
* transitive dependencies are handled (A makes B build, and B makes C and D)
 2013-05-22 15:16:36 +00:00
Michał W. Urbańczyk c920f29c45 More missing serialization items. 2013-05-20 17:25:19 +00:00
Michał W. Urbańczyk 096e1230ce That needs to be serialized. 2013-05-20 08:37:31 +00:00
Michał W. Urbańczyk c85829a00c * creature window prints morale/luck for actual stack in battle (CStack), not stack as seen in hero screen (CStackInstance), fixes #1264 
* creature abilities bonus properties are updated when the creature id is assigned
* removed decrease morale ability from config file (it was duplicating the one from ZCRTRAIT.TXT
 2013-05-19 19:53:03 +00:00
Michał W. Urbańczyk fc6e72dc75 * Fixed enchantments (#1265). Their effects were not properly added when reading config. Battle interface will be little less likely to block itself after corrupted spell cast. 
* Fail gracefully when the file from which game is started is in invalid version.
* Bumped versions.
 2013-05-19 15:14:23 +00:00
Michał W. Urbańczyk be7c2bd07f CGHeroInstance* can be serialized over network even when hero has been defeated. Strongly typed hero type ID introduced. 
Should fix #1260.
 2013-05-18 22:30:48 +00:00
Michał W. Urbańczyk f95e6c233b It is possible to set on visit query that object is to be removed after visit is over. 
Fixes #1263.
 2013-05-14 13:42:52 +00:00
Michał W. Urbańczyk 0eb19dc16d WoG map version is 0x33, not 33. 2013-05-09 11:45:20 +00:00
Michał W. Urbańczyk 5c2473d436 Support for saving/loading in player interfaces, including VCAI. 
Minor changes.
 2013-05-09 11:09:23 +00:00
Michał W. Urbańczyk 5de00c752c VC project updated. 2013-05-05 12:21:50 +00:00
Michał W. Urbańczyk be6aff5173 VC11 compile fix. 2013-04-25 08:22:04 +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 d30571aa4d AI won't access enemy heroes' objects that went under FoW. Fixes #1235. 2013-04-21 12:11:13 +00:00
Michał W. Urbańczyk d1d67caa0b Get rid of some old serialization workaround code that is not needed because serializer was improved in the meantime. 
Fixing #1254.
Fixed possible race causing corruption of the server savegame.
 2013-04-20 18:44:55 +00:00
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
Michał W. Urbańczyk 850f47261d ID should be always outputted as number (not char). 2013-04-17 19:09:54 +00:00
Michał W. Urbańczyk f42cfa6f43 MSVC compile fixes: 
1) Names of compile units need to be unique, renamed the new CLogget.cpp to CNewLogger.cpp. (at least till the old CLogger is gone)
2) Fixes for project files (a few includes were marked as compile items).
 2013-04-11 01:05:51 +00:00
Michał W. Urbańczyk ac9a009516 VC project file update. 2013-03-03 14:08:39 +00:00
Michał W. Urbańczyk e708dd5545 Version set to 0.92. Changelog updated. 2013-03-01 21:48:37 +00:00
Michał W. Urbańczyk 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
Michał W. Urbańczyk 459e858756 One more fix for turrets — defender should also not be turned. 
Development build 0.91c.
 2013-02-27 07:40:21 +00:00
Michał W. Urbańczyk a9fd7b806c Fixed crash on the new month when there are no creatures that can get double growth. (#1219, possibly #1217) 
The list of double growth creatures will be serialized.
Bumped format.
MSVC: silenced that stupid C4275 warning. (senseless when using STL)
 2013-02-27 03:11:45 +00:00
Michał W. Urbańczyk 9cc7a28222 Fixed unnecessary turret turning. 2013-02-27 03:06:49 +00:00
Michał W. Urbańczyk 01e563b579 #1211 won't crash. 2013-02-21 02:25:44 +00:00
Michał W. Urbańczyk 9492592a8f Version bump. Fixed crash on desync saves. 2013-02-19 12:24:17 +00:00
Michał W. Urbańczyk ca4a34df7b Development build 0.91b. 
Removed not necessary log.
 2013-02-18 23:35:25 +00:00
Michał W. Urbańczyk 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
Michał W. Urbańczyk d23a5dcfdf Fixed #1208. 2013-02-14 15:19:35 +00:00
Michał W. Urbańczyk 12e627ec49 Fixed #1206. 2013-02-14 13:19:03 +00:00