games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
2,813 Commits 19 Branches 62 Tags 112 MiB
74cd2e77fe
Commit Graph

1197 Commits

Author SHA1 Message Date
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
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
Ivan Savenko
1415f8dbf5 - fix for boost 1.49 2012-04-02 11:14:38 +00:00
Michał W. Urbańczyk
1eeebdee10 Fixed #914. 2012-04-01 12:35:33 +00:00
Michał W. Urbańczyk
c80d9b0a51 Possibly "fixed" #915. 
Fixed server output (printing ui8 as %d apparently breaks boost.format :/).
 2012-03-31 15:10:16 +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
DjWarmonger
81367ef6d5 - A complete solutions for reserved adventure objects 
- AI won't get stuck at School of War / School of Magic when no money
 2012-03-29 18:26:06 +00:00
Michał W. Urbańczyk
3cf4ebc163 Little more work on #760: 
* no tactics in creature banks
* no spellcasting during tactics phase
 2012-03-28 21:54:43 +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
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
a3f36ccc71 - Unified interface for visitable objects 
- AI will manage visitable objects smarter
 2012-03-14 13:02:38 +00:00
DjWarmonger
9518474ec7 First attempt to replace rule-of-a-thumb behavior with actual reasoning 
- GATHER_ARMY goal replaces wander function
- Heroes will remember their own goals until they are fulfilled
- Goal search handles mutual dependency
- AI will recruit multiple heroes for exploration
- Lots of tweaks
 2012-03-13 12:47:47 +00:00
Ivan Savenko
f2f39f1497 - makefiles for fuzzylite (#911) 
- fixes for gcc compilation
- fixed #908
 2012-03-12 20:11:46 +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
DjWarmonger
0793ce2c4a AI will now always pick best stacks from towns. 
It will also crash when picking stacks from objects, work in progress.
 2012-03-06 18:49:23 +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
DjWarmonger
3e351f029c Fixed creeps regenerating casualties from won battle at the start of new week. 2012-03-06 08:39:05 +00:00
DjWarmonger
bdd71b4f38 AI can now use external dwellings. 
AI will weekly revisit dwellings & mills.
 2012-03-05 19:11:28 +00:00
DjWarmonger
cd0ed39fbf Implemented rule-based evaluation of tactical advantage between armies. 
AI will creep more agressively and smarter.
 2012-03-04 10:43:46 +00:00
DjWarmonger
c5007f8bef Fixed #891. 
Minor tweaks.
 2012-03-03 12:42:53 +00:00
DjWarmonger
998d8bf501 Added trivial fuzzy logic to handle creature banks estimation. 
Check http://forum.vcmi.eu/viewtopic.php?p=6570#6570 for new library used.
 2012-03-03 10:08:01 +00:00
Michał W. Urbańczyk
ebfbccdd0e Post-release version bump. 2012-03-01 23:14:16 +00:00
Michał W. Urbańczyk
2bea93f43f Version set to 0.88. Put release date into changelog. 2012-03-01 15:45:43 +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
Michał W. Urbańczyk
e7603a1fee One more thing for dev release — bump save format (so the old saves won't crash us). 2012-02-22 22:32:23 +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
d9a78ff1ce * fixed #871 
* dead stacks won't be also shaded as possible targets
 2012-02-22 14:31:53 +00:00
Michał W. Urbańczyk
e18419f5d2 * adventure map GUI should be properly blocked during AI turn 
* battle window will wait till all dialogs are closed
* fixed problems with AI working after the game ended
* fixed problems with overzealous redrawing of infobar
 2012-02-22 13:41:27 +00:00
Ivan Savenko
08417cd42a - fixed battle obstacles positioning (#769) 
- removed unused Makefile.amiga and Makefile.x
 2012-02-22 12:44:46 +00:00
Ivan Savenko
fd625fe87d - enabled fix for #866 2012-02-21 14:18:58 +00:00
Ivan Savenko
354b9e7fb3 - fixed #793 and #865 
- fixed #866 but may result in performance decrease
- (deb) removed vcmi-doc package
 2012-02-21 14:08:42 +00:00
Michał W. Urbańczyk
5afa5cfb54 * fixed #863 — all members of team will receive notification about FoW change 
* fixed #486 
* removed reference to a deleted file from lib VC project file
 2012-02-20 21:01:54 +00:00
DjWarmonger
386ac80cf9 Fixed #855 & 861. Unsigned values were bad idea to prevent overflow. 2012-02-20 16:26:14 +00:00
DjWarmonger
329f39bb2a Fixed #837 2012-02-20 11:02:19 +00:00
DjWarmonger
5e14d17ed3 Fixes for r2543. 2012-02-20 09:50:49 +00:00
DjWarmonger
444b59d478 1. Fixed #843 
2. Refactoring for battle console hoover texts
3. Clone should work only for creatures of certain tier. However, ALL creature immunities stopped working in the meantime. Looking for an earlier bug.
 2012-02-20 08:19:03 +00:00
Michał W. Urbańczyk
e4dc00abac * new file lib/UnlockGuard.h — unlock_guard is for unlocking a mutex for the scope time (RAII) 
* all lock/unlock and unlock/lock pairs are done by RAII guards now
* fixed two possible crashes at the end of battle when last stack was killed by spell. That should fix #749 and #752.
* fixed a very nasty race condition, eliminating possible deadlock at the start of battle when human hero has tactics
* fixed #422
 2012-02-19 21:03:43 +00:00
Michał W. Urbańczyk
b35636d5e9 Fixed #869. 2012-02-18 20:50:06 +00:00
DjWarmonger
5c86d32903 Cloned stack dissapear when killed. 
Fixed #864
 2012-02-18 17:39:47 +00:00
Michał W. Urbańczyk
a975805ae8 Fixed #850. 2012-02-17 19:30:40 +00:00
Michał W. Urbańczyk
4baf4e13ed * fixed #857 and #858 
* fixed crash when AI attacked player before his first turn
* fixed various crashes when mass-effect spells affected town turrets in sieges
* some refactoring around spell positiveness
 2012-02-16 21:19:07 +00:00
Ivan Savenko
0c3e88226f - (linux) replaced Genius with VCAI 
- gcc set to c++0x mode
- most of gcc warnings fixed
- replaced boost::assign with initialization lists (if available in compiler)
- new cheat code: vcmiarmenelos - build everything
- updated linux readme
- minor fixes, applied patch for #98
 2012-02-16 17:10:58 +00:00
Michał W. Urbańczyk
7a66c1bf2b * added an initial version of adventure AI: VCAI, more details here: http://forum.vcmi.eu/viewtopic.php?p=6508#6508 
* VCAI set as default adventure AI
* several adjustments in GUI (hourglass during AI turn), minor changes
 2012-02-14 18:04:45 +00:00
DjWarmonger
c724092028 Partial support for Clone spell. 2012-02-10 13:13:24 +00:00
DjWarmonger
9e5fcc3152 Stack artifact backup. 
Still doesn't serialize properly, though.
 2012-02-10 10:32:21 +00:00
DjWarmonger
2bddf29cbf Stack artifacts part 2, not working yet. 2012-02-04 16:34:29 +00:00
DjWarmonger
b8a5d0d430 Stack artifacts - part 1 2012-01-30 16:07:52 +00:00
DjWarmonger
56c56f81e3 Fixed #849. Fixed buying artifacts for free. 
Minor tweaks.
 2012-01-28 11:42:15 +00:00
DjWarmonger
855cebfe81 - MIND_IMMUNITY bonus replaces separate protectons from various spells 
- Creature Window can handle descriptions of spellcasting abilities
 2012-01-27 07:25:29 +00:00
DjWarmonger
1cbd7e94e4 - Extended cap or removed sign for some values that may potentially overflow 
- Fixed #851
 2012-01-26 16:48:53 +00:00
Ivan Savenko
b72a19cdb1 - fix for creature banks (was broken several revisions ago) 2012-01-23 00:02:10 +00:00
DjWarmonger
f31a729ddc Game version should be 0.87b. 2012-01-21 11:44:53 +00:00
Ivan Savenko
dbc603b7d7 - fixed crash on opening spellbook during enemy turn 
- fixed last known localization issue (bank configs)
- diplomacy and new weeks\month mechanics should be identical to H3
- minor fixes
 2012-01-19 14:33:22 +00:00
Ivan Savenko
3fcf8b6f4b - minor mechanics fixes, corrected handling of 2nd upgrades (like pirates from hota) 2012-01-13 14:18:32 +00:00
DjWarmonger
ba646b1d41 Compile fix for #847 2012-01-12 20:41:32 +00:00
Ivan Savenko
86e7d96b39 - setting system: replaced settings.txt + sysopt.bin with json-based system (defaultSetting.json + settings.json) 
- some work on system settings window
- new menu for selecting resolution (reused town portal graphics), can be opened from system settings
 2012-01-12 15:23:00 +00:00
Michał W. Urbańczyk
046e54563c * fixed project files for RD configuration 
* fixed crash when creature is casting Hypnosis (ie. exped Vampire Lords)
* fixed crash when creature is casting Cure before attack (ie. exped Unicorns)
* fixed crash when creature is summoning elemental (TODO fix it)
* fixed crash when doing a bonus system operation with a hero liberated from prison (ie. entering town or battle)
* fixed deadlock when StupidAI tried to assault the turrets
* fixed never ending siege when StupidAI has to use catapult (no more deadlocks on AI-AI siege)
* fixed deadlock when a hero received a level during another player's turn (ie. when he successfully defended)
* AI can win the game by defeating all enemies if there is a specific victory condition applying only to human players
* added options to help testing adventure map AI (--onlyAI, --autoSkip and --oneGoodAI).
* many minor changes
 2012-01-03 01:55:26 +00:00
Ivan Savenko
91c0ce33f4 - re-generated build system 
- fixed several gcc issues
 2011-12-31 10:03:29 +00:00
beegee1
156aa6e4d9 * Updated class - file - handling 
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
 2011-12-22 13:05:19 +00:00
beegee1
2f5d6f2684 * CHexField renamed to CBattleHex 
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
 2011-12-17 18:59:59 +00:00
beegee1
cce814c41b * Final commit 2011-12-13 21:35:28 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
Ivan Savenko
2eca314e92 - fixed #841 and #840 
- fixed several crashes
 2011-11-27 18:55:11 +00:00
DjWarmonger
dfea7db6e8 Compile fixes. May be suboptimal. 2011-11-27 15:39:44 +00:00
Ivan Savenko
064466998a - made main menu configurable (mainmenu.json) 
- added credits screen (using NWC credits for now)
- campaigns can be started
 2011-11-27 13:14:20 +00:00
Ivan Savenko
29f42aa873 - fixed #834 
- fixed crash at campaigns loading
- minor fixes
 2011-11-25 19:41:23 +00:00
Frank Zago
a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
DjWarmonger
2e0ca6d162 Cleaned some code. 2011-11-13 09:29:22 +00:00
DjWarmonger
364a207f71 Fixes for previous commit. 2011-11-11 15:39:46 +00:00
DjWarmonger
08ae42c684 Added full list of spells to namespace Spells. For sanity. 2011-11-11 14:51:27 +00:00
DjWarmonger
9b24ec0e81 Fixed #745 and #830. 2011-11-08 08:54:32 +00:00
DjWarmonger
c448b61976 Fixed #833 2011-11-06 17:39:49 +00:00
Ivan Savenko
0f2e00c780 -(linux) Moved all (I hope) files created by VCMI to ~/.vcmi to prevents crash on launch from read-only directory 
- minor fixes for #362 #835 #836
 2011-11-01 12:58:01 +00:00
Ivan Savenko
ede7fd5a7a - (linux) Fixed gcc linking issues 2011-10-31 18:00:44 +00:00
DjWarmonger
1e45674a7c Fixed #832. War machines will now be immune to a number of effects. 2011-10-29 11:12:30 +00:00
DjWarmonger
57216eea44 Console texts for creature casting spells. 
Fixes related to war machines in battle.
 2011-10-22 07:05:57 +00:00
DjWarmonger
10fce0025a Support for wall penalty & No Wall Penalty ability. 
All creature abilities should now be more or less working.
 2011-10-20 17:41:40 +00:00
DjWarmonger
bdb6db2ab7 Support for Aura of Magic Resistance. 2011-10-20 11:03:04 +00:00
yupsi
092dac1f63 Fixed #262 (double quotes in some messages). 2011-10-19 07:06:08 +00:00
DjWarmonger
95f23cf20f Support for Bind ability. 2011-10-17 08:24:51 +00:00
yupsi
4c2bbad18e Fixed #746 (2-hex units on the left edge of combat field). 2011-10-16 20:19:18 +00:00
yupsi
828a3f0776 Fixed #427 (custom quest messages). 2011-10-16 19:24:05 +00:00
Frank Zago
e43ac3fa06 Fixed alignment issue on sparc. Minor optimization of CCreatureAnimation::nextFrameT. 2011-10-13 04:33:19 +00:00
DjWarmonger
b4d0ebf9ab Support for Mana Channeling ability. 2011-10-09 11:23:24 +00:00
DjWarmonger
5e40d3da72 Support for Enchanter ability. 2011-10-09 07:20:23 +00:00
DjWarmonger
d607d90a91 Support for Fear & Fearless ability. 
Ogre Magi can now cast too.
 2011-10-08 17:10:43 +00:00
Ivan Savenko
89bd7e273d - fixed #808 
- Implemented Json validator and schema for buildings.json
- several fixes for Json writing
- fixed several gcc warnings
 2011-10-08 16:58:25 +00:00
Frank Zago
7b1ede449d Removed last instances of readNormalNr. Made readChar an inline. 2011-10-08 16:06:11 +00:00
DjWarmonger
0903d6037c New pack - BattleEffectTrigger for various one-shot effects with animation 2011-10-08 13:02:58 +00:00
DjWarmonger
f4fc77ccb8 Creature spells are now functional. 
It includes Master Genie, Archangel, Faerie Dragon & Elementals
 2011-10-08 09:11:36 +00:00
DjWarmonger
9a1460c2e0 Handling of cursor for creatures casting spells. 
Lots of refactoring.
 2011-10-08 06:59:36 +00:00
Frank Zago
8403d177aa Added endian aware macros read_le_u16 and read_le_u32 to replace readNormalNR(). Fixes a couple of issues on big endian machines. 2011-10-08 01:23:46 +00:00
Frank Zago
16c23bbf4e Fixed one bad condition; and a compile fix. 2011-10-06 00:27:27 +00:00
DjWarmonger
8c2dd9fdce More mechanics for creature spells. 2011-10-04 13:12:29 +00:00
DjWarmonger
fa6bddcad5 A bunch of mechanics & refactorings. 2011-10-03 19:29:36 +00:00
DjWarmonger
f1f416c890 Fixed (unnecessary?) deadlock in BattleStacksRemoved. Daemon summoning is pretty functional. 2011-10-02 13:59:12 +00:00
DjWarmonger
07b8f87fb7 Partial support for Daemon Summoning. 
It freezes for unknown reason, but still.

Minor fixes.
 2011-10-02 07:16:34 +00:00
DjWarmonger
6fdb984799 Lots of refactoring & work for creature spells. 
No new features yet, but summon elementals now work properly again.
 2011-10-01 19:56:54 +00:00
Michał W. Urbańczyk
623325ca61 Ouch. Thing was for branch only. 2011-09-27 22:03:43 +00:00
Michał W. Urbańczyk
bdd66b6537 Zmiany do Programming challenge. 2011-09-27 21:54:40 +00:00
Frank Zago
ddd3d166b1 Let user add maps in his home directory. Linux only. 2011-09-25 15:41:03 +00:00
Frank Zago
c4b8039c1e Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos. 2011-09-24 01:15:36 +00:00
Ivan Savenko
d113517db4 - fixed #108, #798, #810 
- fixed several gcc warnings
- some work on JSON (const char* as input, no crash on missing value)
 2011-09-23 15:58:18 +00:00
Michał W. Urbańczyk
6ef44bde5a Work on pathfinder: torn the code out from CGameState into a separate class. It can use Subterranean Gates and Boats. Removed code for handling Fly spell effect. It didn't work as supposed anyway. 2011-09-19 20:50:25 +00:00
Frank Zago
0cfb2deeaf Reverted r2382; add zvs to the game data (linux); simplified BitmapHandler::loadBitmap(). 2011-09-14 05:27:49 +00:00
Frank Zago
479a714dbf Better fix than r2381. 2011-09-13 03:31:17 +00:00
Frank Zago
bc8bfc2c9c Fixed path to zvs (bug #809); fix from from vaderas. 2011-09-13 02:33:09 +00:00
Frank Zago
c46cb29446 sex is uninitialized (a virgin ?). Fixed a typo. 2011-09-13 01:46:11 +00:00
Frank Zago
4dedfcabd1 Compile fix. 2011-09-13 01:45:28 +00:00
DjWarmonger
e9991f7932 Fixed #797. Minor tweaks. 2011-09-10 15:06:48 +00:00
DjWarmonger
899aeeb748 New feature: All tiles affected by multi-hex attack will be highlighted when attack is possible. 2011-09-10 13:04:20 +00:00
Michał W. Urbańczyk
9621cbcaa7 * fixed crash on calculating dmg dealt by stack under Curse 
* fixed crash on sea battles (obstacles data got corrupted during conversion)
* fixed crash when StupidAI had a catapult
* minor fixes and refactorings (typename for bonus list under shared ptr)
 2011-09-06 13:59:26 +00:00
Michał W. Urbańczyk
bb1bdcb0a7 * fixed crash on visiting Sirens 
* fixed race condition on the new turn,  #729 should be gone
* fixed crashes in AI-only game mode
 2011-09-06 09:59:06 +00:00
DjWarmonger
8c7f574b01 Fixed #806. 2011-09-06 06:26:58 +00:00
Michał W. Urbańczyk
8b7a2f179c * Server will strictly require answering the queries before taking any actions. Let me know, if this causes any freezes. 
* Fixed crash on new week after we lost battle with neutral monster but killed the top stack (merging failed then).
* minor changes
 2011-09-06 06:00:32 +00:00
DjWarmonger
5fff82a3d2 Fix for #792 2011-09-05 18:12:46 +00:00
DjWarmonger
e3a8a41063 Fixed #804. 
Phoenix won't upgrade to Centaur Captain ;)

Minor tweaks.
 2011-09-05 06:37:24 +00:00
Frank Zago
2ae53395d7 Removed duplicate function initVillagesCapitols(), and simplified its clone loadTownDInfos(). 2011-09-04 18:07:26 +00:00
Frank Zago
76268fac46 Created spell_info.json from spell_info.txt. 2011-09-04 02:26:56 +00:00
Frank Zago
35350aeeff Created hall.json from hall.txt. 2011-09-04 02:02:20 +00:00
ori.bar
5b836f428a Partial fix for 37. Full fix for 27, 64, 600. Fix for bug where code tried to reload non existent file. 2011-09-04 00:04:48 +00:00
Frank Zago
2787830c00 Created buildings5.json from buildings5.txt. 2011-09-03 20:45:27 +00:00
Frank Zago
00adba18c9 Created battleStartpos.json from battleStartpos.txt. 2011-09-03 19:25:37 +00:00
Frank Zago
c03a5eb4d2 Created bankconfig.json from bankconfig.txt. 2011-09-03 18:32:37 +00:00
Frank Zago
11b50ca176 Created ressources.json from resources.txt. 2011-09-03 14:26:39 +00:00
Frank Zago
029b77e7c4 Created dwellings.json from cregens.txt. 2011-09-03 14:14:43 +00:00
Michał W. Urbańczyk
6b9e64de91 Lazy updates of hero paths. 2011-09-03 02:54:33 +00:00
Michał W. Urbańczyk
5072bda7e6 Fixed the stables crash #799. 2011-09-02 05:44:53 +00:00
Frank Zago
bcce343b6c Created terrains.json from native_terrains.txt and TERCOSTS.TXT. 2011-09-02 03:39:49 +00:00
Frank Zago
f9b14ba282 Created puzzle_map.json from puzzle_map.txt. 2011-09-02 02:46:18 +00:00
Frank Zago
3cb92baf18 Created obstacles.json from obstacles.txt. 2011-09-02 02:12:55 +00:00
Frank Zago
fbf822ba11 Fixed typo. 2011-09-02 01:09:53 +00:00
Michał W. Urbańczyk
e3db348304 Bump save format. Release date in changelog. 2011-09-01 09:10:49 +00:00
Frank Zago
d8249d007f Replaced a few iterators with BOOST_FOREACH. 2011-09-01 04:01:54 +00:00
Frank Zago
99000866bc Moved the notUsedMonsters values into creatures.json. 2011-09-01 03:48:58 +00:00
Frank Zago
2c26b9be96 Merge cr_abils.txt into creatures.json. Force loading of data from ZCRTRAIT.TXT (was controlable before, but switch was in an inconvenient place). 2011-09-01 03:39:53 +00:00
Michał W. Urbańczyk
20a53b04fd Removed object recycling that was causing #796. Fixed text nr typo. 
Corrected json include in client/Client.cpp.
 2011-09-01 01:40:46 +00:00
Frank Zago
6826826e87 Reintroduced partial patch from r2327 (sex->female) + typo fix. 2011-08-30 23:10:01 +00:00
Michał W. Urbańczyk
835bd1fbeb Reverting r2327 
http://forum.vcmi.eu/viewtopic.php?t=410
 2011-08-30 06:19:07 +00:00
Ivan Savenko
33719696d8 - added default values to JsonNode 
- small cleanup to heroes.json
 2011-08-27 21:17:45 +00:00
Frank Zago
f3b6ecf9a3 Compile fix for ubuntu 10.04 2011-08-27 19:58:46 +00:00
Frank Zago
2a0fef0e4d Merged specials.txt into heroes.json. 2011-08-27 17:33:07 +00:00
Frank Zago
9594058157 Merged hero_spells.txt into heroes.json. 2011-08-27 16:13:44 +00:00
Frank Zago
fc9282fd50 Created heroes.json from heroes_sec_skills.txt. 2011-08-27 15:53:45 +00:00
Frank Zago
866d1c6e2a Rewrote CCreature::estimateCreatureCount to fix a compile warning. 2011-08-27 02:15:58 +00:00
Frank Zago
e3e2e45777 Merged requirements.txt into buildings.json. Plus a few cleanups in buildings.json. 2011-08-27 01:17:23 +00:00
Michał W. Urbańczyk
18444fc72f Rewritten code handling growth to eliminate duplication and make it conformant to OH3 mechanics. Proper support for Statue of Legion. 
Displaying shield over minimap during AI turn.
 2011-08-26 20:32:05 +00:00
Frank Zago
74620dc685 Merged mageLevel.txt into buildings.json. 2011-08-26 04:12:46 +00:00
Frank Zago
e997b25583 Merged building_horde.txt into buildings.json. 2011-08-26 03:58:07 +00:00
Frank Zago
584e7e3c46 Merged creatures_upgr.txt and basicCres.txt into buildings.json. 2011-08-26 03:43:43 +00:00
Frank Zago
1a2323996e Move CTownHandler::loadStructures inside CTownHandler::loadNames and rename the latter with the former. 2011-08-26 03:10:56 +00:00
Frank Zago
b114047738 Integrate buildings4.txt into buildings.json. It's ligthly tested because I can't find what this file is supposed to define. 2011-08-26 02:39:58 +00:00
Michał W. Urbańczyk
4c3ed24fe1 Fixed #768. More logging for #774. 
Fixed crash on town time event (-1 and -2 "structures" present on buildings list).
 2011-08-25 20:02:38 +00:00
Michał W. Urbańczyk
3152e6d540 Fixed #771, #772 and #787. 
Some minor changes and fixes.
 2011-08-25 15:24:37 +00:00
Frank Zago
16fcd025a7 Converted bonusnames.txt to a json file. 2011-08-20 22:31:59 +00:00
Frank Zago
b853df76ba Consolidated crerefnam.txt, monsters.txt, cr_factions.txt, cr_upgrade_list.txt, CREDEFS.TXT, cr_shots.txt and cr_to_turret.txt into creatures.json 2011-08-20 21:53:03 +00:00
Frank Zago
233ce7d6e3 Merge buildings3.txt into buildings.json. 2011-08-20 16:03:27 +00:00
Ivan Savenko
7eb82278d9 - minor fixes to JSON 
- music will resume correctly after battles
 2011-08-20 11:27:09 +00:00
Frank Zago
8fa540b4da Add building blit priorities in the json building file. Reorganized building coordinates processing code a little. 2011-08-20 06:08:48 +00:00
Frank Zago
6bbccaa76d Convert the buildings coordinates into a json file. 2011-08-20 04:48:23 +00:00
Frank Zago
b3a3cabd5b Moved the starting ressources into a json file. 2011-08-20 02:53:57 +00:00
Frank Zago
f6c39eed0c Added a new json constructor to read from a file. 2011-08-20 01:04:59 +00:00
Michał W. Urbańczyk
a043bfa44a * Reinstated music player. Added terrain music. To MSVC users: you need the recently uploaded libraries pack for this to work! [ http://download.vcmi.eu/msvc-pack.7z ] 
* Not crash on empty (or 1-byte) lod file. (Case in SoD+WoG installations, where h3ab*.lod are dummies.
 2011-08-17 20:44:14 +00:00
Michał W. Urbańczyk
26a83d7680 http://forum.vcmi.eu/viewtopic.php?p=5956#5956 
Significant changes in project files:
* new library package required! URL: http://download.vcmi.eu/msvc-pack.7z
* created VCMI_global.props property sheet for settings common to all VCMI projects
* added configuration for x64 builds
 2011-08-15 21:53:03 +00:00
DjWarmonger
864f758ad8 Some movements towards creature artifacts. 
Minor improvement - Summon elemental can now benefit from hero's special.
 2011-08-13 10:54:23 +00:00
Michał W. Urbańczyk
f417cee2c0 Updated project file. 2011-08-07 08:20:28 +00:00
DjWarmonger
e67b7b9da4 Some fixes for shooting vs Creature Window. 2011-08-06 07:05:04 +00:00
Frank Zago
56bf3dc8ab Replaced io_service()) with get_io_service(). Fixes bug #780. 2011-08-04 23:49:32 +00:00
beegee1
f609c4ad9a * Fixed #33 -> Creatures tend to stop at every hex during movement 2011-08-01 17:36:18 +00:00
Ivan Savenko
5d2f5c2e33 - fixed #762 
- (linux) fixed video in campaigns menu
 2011-07-22 23:34:15 +00:00
Ivan Savenko
35a528e062 - Rewrote Kingdom Overview window - all should be stable now 
- New classes for GUI - lists and tabs
- finishing work on Json config in animations
 2011-07-22 16:22:22 +00:00
DjWarmonger
f5874540b3 Underground rock tiles will be always blocked -> no spawning monsters in there. 2011-07-22 07:07:27 +00:00
Ivan Savenko
98d32acf1b - new files JsonNode.cpp/.h 
- CAnimation can use JSON configs from Sprites folder instead of .def files
 2011-07-21 18:29:22 +00:00
DjWarmonger
da83f0fcde For dev release 0.85b 
Quick fix for #762
 2011-07-21 14:16:45 +00:00
Ivan Savenko
0693312a8e - fixed several crashes with joining creatures 
- support for loading *.tga images
- minor fixes
 2011-07-18 15:21:16 +00:00
Michał W. Urbańczyk
79f5b29196 Various player/AI interface related fixes and improvements. 2011-07-17 18:49:05 +00:00
DjWarmonger
16e7241fbd Support for WoG's Defense bonus. 2011-07-16 16:40:38 +00:00
beegee1
62c43451ef * Updated bonus caching -> faster in particular cases, operations by limiter objects aren't cached 2011-07-16 13:57:25 +00:00
DjWarmonger
b609479496 Support for Magic Mirror spell. 2011-07-16 08:28:01 +00:00
DjWarmonger
79a453f442 Support for WoG "cast before attack" bonus. Minor fixes. 2011-07-16 06:42:44 +00:00
DjWarmonger
92006b53f1 Fixed interface freezes for some mass-target spells. 
How comes no one has reported it before?
 2011-07-15 16:41:43 +00:00
Ivan Savenko
706510f12f - gcc compile fixes 2011-07-13 23:36:37 +00:00
beegee1
55e7959fd9 * Bonus system caching updated, partially rewritten, much more robust, thread-safe 
* Adjusted projectile speed, trebuchet canon speed
 2011-07-13 18:39:02 +00:00
DjWarmonger
a7577ccb6b More details for Rebirth ability. 2011-07-10 09:03:46 +00:00
DjWarmonger
036ad1233f fixes for Phoenix. Its animation will now be restored to Alive. 2011-07-10 08:22:20 +00:00
Frank Zago
9c3a10b2c7 Fixed a bug in phoenix code. Fixed a couple warnings. 2011-07-09 22:42:39 +00:00
DjWarmonger
5269e845fd handling of Rebirth ability for Phoenix. 
However, I've got no idea how to restore its animation to alive state.
 2011-07-08 14:54:20 +00:00
DjWarmonger
1bf9bb4d94 Flexible handling of creature spell power. 2011-07-08 13:17:05 +00:00
DjWarmonger
f33fbdc43b Support for Thunderbolt (Thunderbirds). 
General framework for handling creatures casting spells with arbitrary spell power.
 2011-07-08 07:00:11 +00:00
DjWarmonger
8102fd4cf0 Support for Death Blow ability. 2011-07-06 17:00:45 +00:00
DjWarmonger
c53c226820 Support for Titan's Thunder (creating Spellbook) & Titan's Lightning Bolt. 2011-07-06 14:25:12 +00:00
Michał W. Urbańczyk
ed056cf0df Set of minor improvements and fixes. 2011-07-05 19:05:41 +00:00
beegee1
488e54688f * Bonus caching system disabled for the moment now. => #764 2011-07-05 18:29:48 +00:00
Ivan Savenko
b8448e4c3b - (linux) build system update 
- gcc errors/warnings fixes
 2011-07-05 11:31:26 +00:00
Michał W. Urbańczyk
b3234e8bfa * CGameInterface.h/.cpp moved from client project to lib (and, appropriately, to lib subfolder). 
* New files in lib: ResourceSet.h/.cpp -> containing new structure for managing resources logic
* Minor changes and fixes
 2011-07-05 06:14:07 +00:00
DjWarmonger
08b7d0db17 All multi-hex attacks and shots should now be fully functional. 2011-07-05 06:07:36 +00:00
DjWarmonger
e95ae22061 Implemented Dragon Breath, Attack All Around & Three-Headed Attack. 
Dragon Breath does not yet work correctly for all double-wide stacks, though.
 2011-07-04 19:34:49 +00:00
mateuszb
aac1c0b4e7 * cleaner code is better :) 2011-07-03 19:10:36 +00:00
DjWarmonger
57a36e77f3 Improvement for multiple-hex effects. 
TODO: Attacker must know exact attacked tile, not only the stack.
 2011-07-03 05:55:57 +00:00
Michał W. Urbańczyk
4592ddb74e Fixing several issues with artifacts in hero window described in note http://bugs.vcmi.eu/view.php?id=761#c1828 . Also resolving #741. 2011-07-03 01:03:46 +00:00
DjWarmonger
51943e5f1e Partial support for Death Cloud & Magog's Fire Ball. 
Lots of refactoring is needed to handle this and multiple-target attacks.
 2011-07-02 16:49:22 +00:00
Ivan Savenko
48e79b163c - missed file from previous commit 
- minor fixes
 2011-07-01 16:26:36 +00:00
Ivan Savenko
a89895452a - (linux) fixed searching/loading of scripting libraries 
- (linux) moved AI libraries to /lib/vcmi/AI/lib*, ERM lib to /lib/vcmi/Scripting/*
- gcc compile and warnings fixes
 2011-06-28 14:19:16 +00:00
DjWarmonger
9ca5d9048a Fixed total spell immunity granted by 2212. 
Improvements for Life Drain.
 2011-06-25 15:05:01 +00:00
Michał W. Urbańczyk
212bc13ad6 Fixed #755 and #759. 2011-06-25 14:22:19 +00:00
beegee1
5fdb5aa494 * Improved battle and bonus system performance (significantly faster in debug build, tip: use vs 2008, turn of hex field presentation) 
* Implemented caching for the bonus system
 2011-06-25 13:53:15 +00:00
DjWarmonger
a60fd00e22 Fixes for Pandora Box texts. 2011-06-25 09:28:28 +00:00
DjWarmonger
e5c11385cd Fixed #293 
Support for damage spell immunities.
 2011-06-25 06:55:35 +00:00
DjWarmonger
7dce558e28 More fixes. Estates skill is now handled as a Bonus. 2011-06-24 18:16:28 +00:00
DjWarmonger
37cd2b7394 Another fix for previous commit. 2011-06-24 17:50:22 +00:00
DjWarmonger
bdce46ab60 Minor refactorings, fixes & improvements. 
Moved CArtifactSet to ArtHandler. ObjectHandler is already too messed.
 2011-06-24 17:43:02 +00:00
DjWarmonger
3f85ca4504 Fixes for necromancy. 2011-06-23 13:50:13 +00:00
DjWarmonger
5f53531f4b Fixed crash on joining units that we already have in our army. 2011-06-23 10:12:35 +00:00
mateuszb
c71127809e * minor fixes for revision 2193 (no shooting penalty bonus wasn't needed indeed but was poorly removed) 
* minor changes
 2011-06-22 12:44:28 +00:00
DjWarmonger
af8d8cbfc7 Implemented #479 2011-06-21 12:45:57 +00:00
DjWarmonger
423fd2ffb7 Fixed #756 
Extended range (ui64) for army strenght.
 2011-06-21 09:31:08 +00:00
Frank Zago
f99d0bf966 (linux) autoconf update for the new scripting directory. 2011-06-21 02:34:11 +00:00
Michał W. Urbańczyk
580c4e4c9b ERM is now a separate project, linking to ./Scripting/ERM.dll and consisting all ERM* files from ./lib. 
Little changes around handling ERM. New class in lib: CFileUtility, so the code for scanning files with given extension is not duplicated.
 2011-06-20 11:41:04 +00:00
DjWarmonger
e7bbfb615c Removed odd "no shoting penalty" bonus. It seems to be confused with No Distance Penalty. 2011-06-20 06:42:53 +00:00
DjWarmonger
825562a092 Fixed #538 2011-06-19 09:07:15 +00:00
Frank Zago
129c9d521e Warning fixes + typo. 2011-06-18 23:56:48 +00:00
mateuszb
645ca7be87 * a few examples of verm usage 
* semantic macros for verm
* many bugfixes in interpreter
 2011-06-18 18:24:56 +00:00
DjWarmonger
c850ee6fe0 Fixed #180. Minor tweaks. 2011-06-18 15:43:28 +00:00
DjWarmonger
d4465ec929 Smarter handling of Magic Resistance & Resistance hero skill. 2011-06-18 10:58:46 +00:00
DjWarmonger
60ee0e1a3c Better fix for #128 2011-06-18 09:48:25 +00:00
DjWarmonger
a497c88bde Fixed #128 and #301 2011-06-18 05:55:39 +00:00
Frank Zago
4b7d0f3092 Partial integration of Android patches, from Pelya. 2011-06-15 02:15:05 +00:00
Frank Zago
14efb9fd13 Warning fix. 2011-06-15 01:36:36 +00:00
mateuszb
3e9b247470 * defining functions in verm works 
* a few more standard functions
* standard verm file
 2011-06-14 17:29:13 +00:00
Frank Zago
b471c10149 Compile fix, from Pelya. 2011-06-14 13:22:00 +00:00
mateuszb
73a05d62fd * significantly improved verm interpreter - if, comparisons, lambda expressions are working! 2011-06-11 18:10:15 +00:00
Michał W. Urbańczyk
9775f88045 Version bump. 
Initial support for IF:M elements and string formatting.
Various minor changes related to ERM interpreter.

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

!?FU1;
!!IF:M^Hello world number %X16!^;
 2011-06-10 23:50:32 +00:00
Frank Zago
78b5e11b93 Compile fix. 2011-06-10 12:49:31 +00:00
mateuszb
af3050058f * some work on interpreter 2011-06-04 18:16:32 +00:00
Frank Zago
aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
Michał W. Urbańczyk
0dbd7ee3c8 Fixed #739 and #742. 
Version set to 0.85.
 2011-06-01 18:26:44 +00:00
DjWarmonger
f4f2af664f Fixed #744 2011-06-01 05:10:28 +00:00
Frank Zago
ff49b852df Silenced several "warning: suggest parentheses around ‘&&’ within ‘||’": added some parenthesis, optimized a couple statments and fix a bug in another. 2011-05-30 19:20:14 +00:00
Michał W. Urbańczyk
2d61fab7e9 * Probably fixed #655. 
* Fixed #736, #737.
* Fixed crash on loss/victory.
* Fixed crash on loading some AB maps.
* Fixed crash on loading map where victory/loss condition objective hero was placed inside the town.
* Fixed crash on loading map when neutral Dungeon has built Portal of Summoning.
* Mutex protecting GS will be used to prevent changes in GS when GUI might read it.
* Little more securities around moving hero and ending turn, still needed more.
 2011-05-29 23:49:25 +00:00
DjWarmonger
936005aa1c Correct, yet ugly handling of Magic Resistance. 2011-05-29 18:28:50 +00:00
mateuszb
5786c26586 * building verm tree without modifiers 2011-05-29 18:16:49 +00:00
Michał W. Urbańczyk
47e4c8d6e6 Probably fixed #732, one more fix for spawning wandering monsters. 2011-05-29 14:06:52 +00:00
DjWarmonger
7d56db6fb3 Fixed #597 once more. 2011-05-29 13:34:26 +00:00
DjWarmonger
968080a890 Fixed #734 2011-05-29 12:36:38 +00:00
DjWarmonger
c6a69d35cf More bonuses & graphics handled. 2011-05-28 05:34:40 +00:00
Frank Zago
b11981293f Compile fix. 2011-05-28 05:09:06 +00:00
Michał W. Urbańczyk
3ca95ef5ed Fixed #730: 
* crash on +5 growth week 
* crash on spawning wandering creatures on double growth months
(how come that has not been found in previous build?)

More logging for #729-like issues.
 2011-05-28 01:02:28 +00:00