1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

2259 Commits

Author SHA1 Message Date
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
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
Frank Zago
b3a3cabd5b Moved the starting ressources into a json file. 2011-08-20 02:53:57 +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
Frank Zago
f6c39eed0c Added a new json constructor to read from a file. 2011-08-20 01:04:59 +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
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
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
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
Michał W. Urbańczyk
f417cee2c0 Updated project file. 2011-08-07 08:20:28 +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
56bf3dc8ab Replaced io_service()) with get_io_service(). Fixes bug #780. 2011-08-04 23:49:32 +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
DjWarmonger
2272b4a316 Reverted changes from r2270. These strange callbacks were introduced for purpose (bugs 574 & 615).
Described crash after a battle is not reproductible now. Refer to these bug reports for more details.
2011-07-30 18:02:31 +00:00
beegee1
a5c39ca84b * Fixed a crash which occurred when a battle was won against a enemy hero but not gaining a lvl-up.
* Code improvements, fixed warnings.
2011-07-30 15:04:34 +00:00
Frank Zago
5eab8339d0 Someone likes to put semicolons in the wrong places. Fixed. 2011-07-28 00:38:19 +00:00
DjWarmonger
8789968d67 Fixed #777. 2011-07-27 10:41:27 +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
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
c551a32f9f Version bump. 2011-07-21 15:03:58 +00:00
DjWarmonger
da83f0fcde For dev release 0.85b
Quick fix for #762
2011-07-21 14:16:45 +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
Michał W. Urbańczyk
79f5b29196 Various player/AI interface related fixes and improvements. 2011-07-17 18:49:05 +00:00