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,294 Commits 21 Branches 65 Tags 121 MiB
102593aabe
Commit Graph

1008 Commits

Author SHA1 Message Date
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
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
Michał W. Urbańczyk
1bd543ad0c Ouch. #37 is not so easy. :> 2011-08-30 07:08:11 +00:00
Michał W. Urbańczyk
b217768d0a A patch from ori.bar fixing #37 and #64. 
http://forum.vcmi.eu/viewtopic.php?p=5993#5993
 2011-08-30 06:36:57 +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
Michał W. Urbańczyk
33020cf953 Fixed fix for #771. 2011-08-26 23:45:00 +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
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
06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +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
3152e6d540 Fixed #771, #772 and #787. 
Some minor changes and fixes.
 2011-08-25 15:24:37 +00:00
Frank Zago
4cad2f4587 Cache the selected graphic resolution instead of looking it up many times. 2011-08-24 04:13:45 +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
81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +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
3519cca2c9 Moved the spell sounds into a json file. 2011-08-20 01:57:03 +00:00
Frank Zago
cf1d179acf Store battle fields sounds in a json file instead of a text file. 2011-08-20 01:15:37 +00:00
Ivan Savenko
8054c85091 - some work on sound and music players: 
-- Adventure map music will update with hero movement
-- implemented battle intro sounds
-- battle music tracks will  be selected randomly each time
- fixed #781
 2011-08-19 19:50:24 +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
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
287761a93d Fixed #229 & #332 2011-08-12 19:38:30 +00:00
DjWarmonger
4895540f80 Compile fixes. 2011-08-08 14:37:18 +00:00
Ivan Savenko
c63df4f07a - compile fixes for linux player 2011-08-08 14:20:22 +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
Frank Zago
c1ffe738f0 Load sound file from 2nd CD. 2011-08-07 21:37:07 +00:00
DjWarmonger
de0d6b8c17 Compile fix. 2011-08-07 19:30:30 +00:00
Frank Zago
2cc80e1267 Modified CMediaHandler to handle more than one file. 2011-08-07 19:14:46 +00:00
DjWarmonger
d3a014ee94 Smarter implementation of last change. 2011-08-06 07:15:21 +00:00
DjWarmonger
e67b7b9da4 Some fixes for shooting vs Creature Window. 2011-08-06 07:05:04 +00:00
DjWarmonger
d29850a2fa Fixed #740 2011-08-05 07:59:15 +00:00
Frank Zago
18a376696d Support for newwer libavformat API. Patch from exine, bug #779. 2011-08-04 22:12:53 +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
0893ed816f - fix for #775 
- fix for crash in battle options window
 2011-07-27 09:35:27 +00:00
DjWarmonger
2047862eb1 Compile fix for Kingdom Overview 
Fixed common crash with gained exp, fixed necromancy.
 2011-07-23 06:14:05 +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
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
Frank Zago
20574dea3d Added missing initializations. 2011-07-21 02:39:37 +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