games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity
2,353 Commits 21 Branches 65 Tags 121 MiB
6fdb984799
Commit Graph

897 Commits

Author SHA1 Message Date
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