games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-30 23:18:08 +02:00
Code Issues Releases Activity
2,427 Commits 19 Branches 63 Tags 113 MiB
1abf089bc7
Commit Graph

1088 Commits

Author SHA1 Message Date
DjWarmonger
6fdb984799 Lots of refactoring & work for creature spells. 
No new features yet, but summon elementals now work properly again.
 2011-10-01 19:56:54 +00:00
Frank Zago
5d4cfc0d0f Fixed #382. 2011-09-26 00:01:47 +00:00
Frank Zago
14261d6be9 Removed debug trace. 2011-09-25 18:59:59 +00:00
Frank Zago
4a3d1a22d6 Only draw the necessary borders for a message window. Fixes #388. 2011-09-25 18:44:13 +00:00
Frank Zago
1f9e97005f When changing resolution, both screen? and res? must be set. Fixes #813. 2011-09-25 16:39:13 +00:00
Frank Zago
ddd3d166b1 Let user add maps in his home directory. Linux only. 2011-09-25 15:41:03 +00:00
Frank Zago
01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +00:00
Frank Zago
6dd9d416b4 Fixed #812. 2011-09-24 01:24:11 +00:00
Frank Zago
c4b8039c1e Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos. 2011-09-24 01:15:36 +00:00
Ivan Savenko
d113517db4 - fixed #108, #798, #810 
- fixed several gcc warnings
- some work on JSON (const char* as input, no crash on missing value)
 2011-09-23 15:58:18 +00:00
Michał W. Urbańczyk
750995f7f9 A patch from Gesh fixing and #819 and removing reduntant #ifdefs (DLLHandler is win-only anyway). 2011-09-22 14:21:53 +00:00
Michał W. Urbańczyk
6ef44bde5a Work on pathfinder: torn the code out from CGameState into a separate class. It can use Subterranean Gates and Boats. Removed code for handling Fly spell effect. It didn't work as supposed anyway. 2011-09-19 20:50:25 +00:00
ori.bar
74fafbedbf Fix #807 2011-09-17 18:15:10 +00:00
DjWarmonger
1e4a08529c Path for #773 from Yupsi 
+ some refactorings
 2011-09-15 05:41:47 +00:00
Frank Zago
0cfb2deeaf Reverted r2382; add zvs to the game data (linux); simplified BitmapHandler::loadBitmap(). 2011-09-14 05:27:49 +00:00
DjWarmonger
e9991f7932 Fixed #797. Minor tweaks. 2011-09-10 15:06:48 +00:00
DjWarmonger
899aeeb748 New feature: All tiles affected by multi-hex attack will be highlighted when attack is possible. 2011-09-10 13:04:20 +00:00
ori.bar
ebacb433fe auto_ptr -> shared_ptr see http://gcc.gnu.org/onlinedocs/libstdc++/manual/auto_ptr.html 2011-09-10 09:42:09 +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
Michał W. Urbańczyk
bb1bdcb0a7 * fixed crash on visiting Sirens 
* fixed race condition on the new turn,  #729 should be gone
* fixed crashes in AI-only game mode
 2011-09-06 09:59:06 +00:00
Michał W. Urbańczyk
8b7a2f179c * Server will strictly require answering the queries before taking any actions. Let me know, if this causes any freezes. 
* Fixed crash on new week after we lost battle with neutral monster but killed the top stack (merging failed then).
* minor changes
 2011-09-06 06:00:32 +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
2ae53395d7 Removed duplicate function initVillagesCapitols(), and simplified its clone loadTownDInfos(). 2011-09-04 18:07:26 +00:00
ori.bar
5b836f428a Partial fix for 37. Full fix for 27, 64, 600. Fix for bug where code tried to reload non existent file. 2011-09-04 00:04:48 +00:00
Frank Zago
eff17aa850 Created campaign_regions.json from campaign_regions.txt. 2011-09-03 19:51:45 +00:00
Frank Zago
04995938dc Fixed bad battle backgrounds (introduced in r2334). 2011-09-03 03:53:08 +00:00
Michał W. Urbańczyk
d71ed76a0f Fixed villages/capitols not appearing. 2011-09-03 03:04:06 +00:00
Michał W. Urbańczyk
6b9e64de91 Lazy updates of hero paths. 2011-09-03 02:54:33 +00:00
Frank Zago
d8249d007f Replaced a few iterators with BOOST_FOREACH. 2011-09-01 04:01:54 +00:00
Michał W. Urbańczyk
c5452f26fc Fixed #791. Don't like it. Rogues do not have TURN_R sequence. I if-ed out that in reverse animation but I believe more general solution should be devised, possibly on the side of CCreatureAnimation. 2011-09-01 03:12:54 +00:00
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
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
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
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
Ivan Savenko
75d068bc03 - compilation fix for #765 2011-07-05 19:06:47 +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
Ivan Savenko
39feb24d64 - possibly fixed #763 2011-07-03 10:04:06 +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
81180de8be Handling of area attack animation & effect 2011-07-02 17:40:33 +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