1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

263 Commits

Author SHA1 Message Date
DjWarmonger
8c2dd9fdce More mechanics for creature spells. 2011-10-04 13:12:29 +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
Frank Zago
01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +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
DjWarmonger
e3a8a41063 Fixed #804.
Phoenix won't upgrade to Centaur Captain ;)

Minor tweaks.
2011-09-05 06:37:24 +00:00
Frank Zago
34698eee4d Fix description. 2011-09-04 02:40:46 +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
Frank Zago
2787830c00 Created buildings5.json from buildings5.txt. 2011-09-03 20:45:27 +00:00
Frank Zago
eff17aa850 Created campaign_regions.json from campaign_regions.txt. 2011-09-03 19:51:45 +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
1568e58029 Fixed malformed json file. 2011-09-03 16:14:31 +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
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
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
Frank Zago
d49058049e Created towns_defs.json from townsDefs.txt. 2011-09-01 00:11:34 +00:00
Frank Zago
35622913f9 Convert ERMU_to_picture.txt into ERMU_to_picture.json. 2011-08-31 23:27:33 +00:00
Ivan Savenko
3fc42134b7 - fixed #586, #757, #758
- fixed spinning projectiles for some creatures
2011-08-31 12:11:34 +00:00
Frank Zago
e5349c58cd Created wall_pos.json from wall_pos.txt. 2011-08-31 04:11:44 +00:00
Frank Zago
71b1eef6b6 Merged AC_desc.txt into battles_graphics.json. 2011-08-31 03:27:18 +00:00
Frank Zago
68090a4ec6 Created battles_graphics.json from battleBack.txt and battleHeroes.txt. 2011-08-31 01:11:41 +00:00
Frank Zago
0a58d1f2cf Created town_pictures.json from townPics.txt. 2011-08-31 00:35:04 +00:00
Frank Zago
21f72c61b1 Created creature_backgrounds.json from cr_bgs.txt. 2011-08-31 00:12:02 +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
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
cb66e1b69b Fixed many typos. 2011-08-27 01:27:02 +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
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
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
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
Frank Zago
06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +00:00
Frank Zago
839c437fbc Moved the resolution configurations in their own json files. Lots of C++ voodoo going away. Yay! 2011-08-24 02:19:53 +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
81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +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