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
2,271 Commits 30 Branches 75 Tags
a8a437ccb0a5fe4860b466ae4b38b2cfcf290c6e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał W. Urbańczyk a8a437ccb0 Don't behave so dramatically when Heroes3-cd2.snd is missing. 
Fixed a few typos in buildings.json.
 2011-08-26 22:52:02 +00:00
Michał W. Urbańczyk 18444fc72f Rewritten code handling growth to eliminate duplication and make it conformant to OH3 mechanics. Proper support for Statue of Legion. 
Displaying shield over minimap during AI turn.
 2011-08-26 20:32:05 +00:00
Michał W. Urbańczyk 4f20c5a376 Fixed #731. 2011-08-25 21:08:53 +00:00
Michał W. Urbańczyk 4c3ed24fe1 Fixed #768. More logging for #774. 
Fixed crash on town time event (-1 and -2 "structures" present on buildings list).
 2011-08-25 20:02:38 +00:00
Michał W. Urbańczyk 77be397bf6 Fixed #782. 2011-08-25 15:49:11 +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
Michał W. Urbańczyk 583f37bf1f * Playing terrain music 
* Fixed crash on l-clicking advmap during AI turn
 2011-08-17 21:48:12 +00:00
Michał W. Urbańczyk a043bfa44a * Reinstated music player. Added terrain music. To MSVC users: you need the recently uploaded libraries pack for this to work! [ http://download.vcmi.eu/msvc-pack.7z ] 
* Not crash on empty (or 1-byte) lod file. (Case in SoD+WoG installations, where h3ab*.lod are dummies.
 2011-08-17 20:44:14 +00:00
Michał W. Urbańczyk c0127032fc Restored ERM interpreter to the solution. 2011-08-16 09:32:08 +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
Michał W. Urbańczyk 05f166f751 Portability fix for „Win64”. 32-bit DLLs (bink, smack) cannot be loaded, so an empty player-placeholder is used to capture calls we can't properly handle. 
Probably some fixes for Linux will be needed. (I guess the whole thing could use some refactoring to unify more code)
 2011-08-08 07:12:18 +00:00
Michał W. Urbańczyk b05a0c7c83 The add_file method throws an exception where there is no file with a given name. 
Catch it and leave NULL, so the silent return can be used.
 2011-08-08 06:28:18 +00:00
Michał W. Urbańczyk f417cee2c0 Updated project file. 2011-08-07 08:20:28 +00:00
Michał W. Urbańczyk 79f5b29196 Various player/AI interface related fixes and improvements. 2011-07-17 18:49:05 +00:00
Michał W. Urbańczyk ed056cf0df Set of minor improvements and fixes. 2011-07-05 19:05:41 +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
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
Michał W. Urbańczyk e6409e8ddd Fix for printing the line number. Fixed #753. 2011-06-27 16:03:03 +00:00
Michał W. Urbańczyk 212bc13ad6 Fixed #755 and #759. 2011-06-25 14:22:19 +00:00
Michał W. Urbańczyk d88b6b1bb3 Interactive mode for ERM interpreter. 2011-06-23 21:42:30 +00:00
Michał W. Urbańczyk d9a9477cb4 Likely fixing #754. 2011-06-22 22:35:26 +00:00
Michał W. Urbańczyk 0a48e51af9 Fixes, more tests. 2011-06-21 00:00:49 +00:00
Michał W. Urbańczyk a1930300be ERM needs to be built after lib. 2011-06-20 11:50:47 +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
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
Michał W. Urbańczyk 0dbd7ee3c8 Fixed #739 and #742. 
Version set to 0.85.
 2011-06-01 18:26:44 +00:00
Michał W. Urbańczyk 96d6d34bc3 For 0.84d build. 2011-05-30 01:03:16 +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
Michał W. Urbańczyk 47e4c8d6e6 Probably fixed #732, one more fix for spawning wandering monsters. 2011-05-29 14:06:52 +00:00
Michał W. Urbańczyk b07e8fbfa4 For 0.84c dev build. 2011-05-29 01:44:47 +00:00
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
Michał W. Urbańczyk 953a3bf165 Final changes for 0.84b: 
* no hard crash on startup when AB videos are not installed (1 byte file)
* moved some DLL_EXPORTs to resolve incomprehensible (to me) linker error occurring only with release builds.
 2011-05-26 01:03:35 +00:00
Michał W. Urbańczyk c32242b4e9 For 0.84b dev build. 2011-05-25 23:52:27 +00:00
Michał W. Urbańczyk df062614d7 Fixed #260, improvement for #250. 2011-05-25 22:44:02 +00:00
Michał W. Urbańczyk 528f0363a1 Fixed crash after a battle when resurrection was cast. 
[However the spell still is not implemented correctly... :/ ]
 2011-05-25 20:44:18 +00:00
Michał W. Urbańczyk 8e57dba850 Fixed #658 and #699. 
Checking for water availability won't cause spurious warnings. New creature window enabled for testing.
 2011-05-25 14:48:49 +00:00
Michał W. Urbańczyk 601bee9c0f Fixed unitialized ptr from previous commit. Added classicCreatureWindow option to the config, deciding whether classic or the new creature window will be used. Added switchCreWin console command for switching this option run-time. Garrison slots now shouldn't redraw themselves on top of creature window. 2011-05-25 13:11:03 +00:00
Michał W. Urbańczyk 072bb5884b Fixed #728. 
Fixed issue with game loading.
Minor fixes.
 2011-05-24 23:17:57 +00:00
Michał W. Urbańczyk 2845123a0a A patch from zjarek ( #727 ) — refactoring of CTerrainRect::showPath. 2011-05-21 01:10:41 +00:00
Michał W. Urbańczyk 249977af2f Various fixes and improvements for ERM: 
* comparisons need to have comparison operator -> they won't catch plain var usage
* removed qmacro -> that's just reading into normal macro
* there are 10000 standard vars
* there is one global (base) set of y-vars
* the iterator from !!DO loop is correctly passed into called function
* fixed getting variable value (also supporting array indexing)

* post- and pre-triggers share common base
 2011-05-14 13:20:19 +00:00
Michał W. Urbańczyk 58ebfc421d One more file: 
* lib/IGameEventsReceiver.h

Workaround for crash on post-visit.
 2011-05-09 22:30:37 +00:00
Michał W. Urbańczyk 617e1f962e New files for lib: 
* lib/ERMScriptModule.cpp
* lib/ERMScriptModule.h
* lib/CObstacleInstance.h

More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts.
Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).
 2011-05-09 22:20:47 +00:00
Michał W. Urbańczyk b4144dc616 Callback jugglery, part 1. 
Fixed #252.
 2011-05-03 03:14:18 +00:00
Michał W. Urbańczyk aca90abd38 Settings.txt with info for 1920x1080 resolution. The package with graphics can be obtained from http://forum.vcmi.eu/download.php?id=380 
The new resolution has been prepared by Plush.
 2011-05-03 03:10:05 +00:00
Michał W. Urbańczyk ec76876bda drawBorder should not crash when attempted drawing outside the surface. 2011-04-29 00:50:54 +00:00
Michał W. Urbańczyk 362f413b4d Fixing #127 and #702. 2011-04-24 02:02:41 +00:00
Michał W. Urbańczyk 5cc9d16014 Fixed #276. 2011-04-22 22:28:13 +00:00
Michał W. Urbańczyk d092eaf9d1 Artifact Merchant: selling artifacts. Messy, but completes H3 town structures functionalities. 
BTW updating screen after closing marketplace is broken.
 2011-04-22 21:51:10 +00:00
Michał W. Urbańczyk 0aad12ae67 Added ERM preprocessor (removing comments, empty lines, joining multi-line commends). 2011-04-03 21:38:47 +00:00
Michał W. Urbańczyk b5a546349b Moved framerate keeper from CPlayerInterface to CGuiHandler, thing should be running smoother. 2011-04-03 10:45:39 +00:00
Michał W. Urbańczyk 6d52bb5842 timeHandler: FreeBSD fixes, based on plush's patch ( #719 ). 
Aesthetic „fixes”.
 2011-04-02 23:45:47 +00:00
Michał W. Urbańczyk 07ea131c97 ERM parser won't crash when there is no Data/s folder (addressing issue #717) 2011-03-20 16:45:18 +00:00
Michał W. Urbańczyk 7b9e77f899 Lib project file updated. 2011-03-19 18:30:58 +00:00
Michał W. Urbańczyk 5e4140762f Fixed #687. 2011-03-19 14:35:29 +00:00
Michał W. Urbańczyk 95efcc7cb5 Fixed #305, #707, #708. 2011-03-19 00:06:54 +00:00
Michał W. Urbańczyk 236ba6f1a8 And the solution file. 2011-03-17 23:12:34 +00:00
Michał W. Urbańczyk 4d3776058d My project files for VC10. 2011-03-17 23:06:48 +00:00
Michał W. Urbańczyk a382b641b7 Removing old, VC9 project files. 2011-03-12 22:53:52 +00:00
Michał W. Urbańczyk a461326380 Fixed #634 and #703. 2011-03-12 22:29:19 +00:00
Michał W. Urbańczyk 39120fe4a5 Spell scroll improvements, fixing #689, #690, #691. 
CArtPlace now uses common CInfoWindow for r-click popup (with or without a custom component), old CMessage::genWindow no longer needed.
 2011-03-12 21:55:31 +00:00
Michał W. Urbańczyk 7dbf105f6e Surrendering and related artifacts (Statesman's Medal, 
Diplomat's Ring, Ambassador's Sash).
 2011-03-05 16:38:22 +00:00
Michał W. Urbańczyk 9acfbc4dce Version bump. 2011-03-01 19:32:21 +00:00
Michał W. Urbańczyk e4edb525cb Version set to 0.84. 2011-03-01 18:44:22 +00:00
Michał W. Urbańczyk 222bf004b9 Fixed #679 and #681. 2011-03-01 13:54:48 +00:00
Michał W. Urbańczyk aaf3729367 War machines won't be present at creature banks. 2011-03-01 10:28:31 +00:00
Michał W. Urbańczyk c5930893fd Fixed #682. 2011-03-01 10:19:05 +00:00
Michał W. Urbańczyk 207e573001 Fixed #645 by reverting support for screen scrolling [there are still some remains in settings file] 
Removed some unused code.
 2011-03-01 09:57:18 +00:00
Michał W. Urbańczyk 23d0221611 One more fix for 0.83c build. 2011-02-27 21:05:53 +00:00
Michał W. Urbańczyk 03fdd22b1a Version set to 0.83c, to be released as development build. 
Code reorganizations in bonus system, allowing defining bonusNode-like classes.
Fixed some issues with artifact handling (proper updating of GUI when moving, minor fixes). 
Restoring battle AI for neutrals after loading game.
 2011-02-27 19:58:14 +00:00
Michał W. Urbańczyk d7b586f1fd Eliminating duplicated bonuses. Smarter getting [no code duplication]. 2011-02-27 11:26:18 +00:00
Michał W. Urbańczyk 236345e61d Fixed #674, #675, #676, #677. 2011-02-25 17:57:30 +00:00
Michał W. Urbańczyk 91d0ea64de Version to be released as dev release 0.83b 2011-02-24 14:54:18 +00:00
Michał W. Urbańczyk e505328fcd Reverted r1992 for now [boost < 1.46 won't work with it] 2011-02-24 14:01:58 +00:00
Michał W. Urbańczyk 1afcaf2817 * CThreadHelper.cpp now belongs to VCMI_lib project 
* fixed console on Windows (restored old code)
 * GeniusAI won't get blocked when it has a hero with tactics in battle
 * fixed an issue with switching turns in hot-seat mode when there is Cover of Darkness active
 * suppressed bonus system console output: it goes only to the logfile
 * [win32] setting thread names (debug purposes)
 * minor fixes
 2011-02-24 13:57:47 +00:00
Michał W. Urbańczyk cab8f9e11d AI for neutral creatures and battles and player AIs can be different. StupidAI will handle neutrals by default. 
Fixes for issues with deserialization and handling Tactics secondary skill.
 2011-02-23 03:57:45 +00:00
Michał W. Urbańczyk a46ad0b7ef Next set of fixes, mostly for deserialization. 2011-02-22 09:47:25 +00:00
Michał W. Urbańczyk d36f8087aa minor fix — duration has to be passed as ui16. 2011-02-21 04:24:46 +00:00
Michał W. Urbańczyk 4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +00:00
Michał W. Urbańczyk 44619757e8 Fixed opening spellbook via hero screen. 2011-02-15 18:40:06 +00:00
Michał W. Urbańczyk 2f9ed138f6 Tactics more or less working (some improvements still needed, as proper updating battle GUI). 2011-02-14 20:31:53 +00:00
Michał W. Urbańczyk 99a7320e99 Fixes for Altar of Sacrifice (got broken after artifact rewrite) 2011-02-14 10:38:33 +00:00
Michał W. Urbańczyk e3310f8759 Eagle Eye seems to work. 2011-02-14 09:29:35 +00:00
Michał W. Urbańczyk 0c700f97cd A little progress with Eagle Eye and Tactics. 2011-02-13 22:46:04 +00:00
Michał W. Urbańczyk 9f90ef58ca Some work towards Eagle Eye skill support. 2011-02-11 19:12:08 +00:00
Michał W. Urbańczyk ab20e024c0 Various fixes and improvements around kill hero and kill monster quests. A few minor unrelated fixes. 2011-02-11 12:27:38 +00:00
Michał W. Urbańczyk 979f77d900 Some preparations towards handling stack experience by the new bonus system. New nodes for controlling premies for creatures of given tier (level). Minor changes. 2011-02-10 13:12:53 +00:00
Michał W. Urbańczyk 9f21e4b46f Minor compile fix, std::copy used that way overwrites original bonuses [but the code won't be needed anyway] 2011-02-09 12:33:58 +00:00
Michał W. Urbańczyk ec601ffffd Merged bonusesFifthPart branch. 
- Rewritten stacks and artifacts handling
 - Partially done bonus system features (propagators still not working)
 - Duel mode (only battle between two players) for automated testing of battle AIs
 - New battle AI: StupidAI. Very simple and minimalistic but should be way better than GeniusAI
 - Files from hch/ subfolder moved to folders of their projects

Still there are many bugs but whole thing should be stable enough to allow further development/fixing in the trunk [merging changes became too big pain]
 2011-02-06 09:07:19 +00:00
Michał W. Urbańczyk 31fc8f6db3 Merged Warmonger's changes from trunk 2011-02-06 08:32:05 +00:00
Michał W. Urbańczyk a3ba75b0b7 Various fixes, mainly around garrisons. 2011-02-05 13:39:10 +00:00
Michał W. Urbańczyk c6db92c0be More development around bonus system: building hierarchy, managing morale bonuses. Fully functional Spell Scroll and Angelic Alliance artifacts. Fixed recruiting hero and moving hero to garrison. 2011-02-04 14:58:14 +00:00
Michał W. Urbańczyk 15011e611d Merged Ivan's changes from trunk (r1921) 2011-01-28 02:33:26 +00:00
Michał W. Urbańczyk e5bf71538f Minor fix. 2011-01-28 02:16:38 +00:00
Michał W. Urbańczyk a75a37008f Practically finished combined artifacts changes, many other fixes. 2011-01-28 02:11:58 +00:00
Michał W. Urbańczyk 092ab5a77f Fix for #662. 2011-01-24 00:09:08 +00:00
Michał W. Urbańczyk e6d577c233 Mostly done combined artifacts. 
[assembling, disassembling, moving, picking]
 2011-01-23 23:49:17 +00:00
Michał W. Urbańczyk 3fde9e45df Partially redone combined artifacts. 2011-01-22 03:43:20 +00:00
Michał W. Urbańczyk 591ba76f69 Fixed initialization of recruited stacks. 
Fixed displaying garrison slots in CCastleInterface.
 2011-01-21 10:37:19 +00:00
Michał W. Urbańczyk ed07cfe073 Configurable duels. 2011-01-21 02:36:30 +00:00
Michał W. Urbańczyk 898ad292ea A few fixes for artifacts. 2011-01-18 18:56:14 +00:00