games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
6,988 Commits 19 Branches 63 Tags 113 MiB
c1138d9df7
Commit Graph

153 Commits

Author SHA1 Message Date
Ivan Savenko
50e8bc1704 - build system update 
- compile fix for quests (vector can't be used to store const data)
- fixed several "unitialized" warnings
 2012-07-06 20:19:54 +00:00
Ivan Savenko
faaf799d95 - fixed some extra warnings. Mostly harmless. 
NOTE: Please check changes in BattleState.cpp and GameHandler.cpp for possible bugs
 2012-05-28 19:29:32 +00:00
Michał W. Urbańczyk
ee6e9fcc7f Fixed #947. 2012-05-22 21:08:16 +00:00
Michał W. Urbańczyk
d168f3eac2 * Implemented Moat functionality during siege (stops movement and deals dmg) 
* Mostly implemented battle spells:
 - Fire Wall
 - Force Field
 - Land Mine
 - Quicksands
 2012-05-18 20:50:16 +00:00
DjWarmonger
416c08260a - Basic Commander window 
- First part of unified quests interface

This graphics package is needed:
http://forum.vcmi.eu/viewtopic.php?p=6943#6943
 2012-05-16 17:29:05 +00:00
Ivan Savenko
9efe05c90b - removed usage of Graphics in several places (Components and hero window). 
minor:
- fixed several deprecation warnings in video player
- config file may have multiple upgrades for creatures
 2012-05-13 15:04:21 +00:00
Michał W. Urbańczyk
5449546447 Advanced work on support for Quicksand and Land Mine spells. 2012-05-04 21:16:39 +00:00
Michał W. Urbańczyk
b5526f0f54 Fixed #925. 2012-04-14 07:22:08 +00:00
Michał W. Urbańczyk
722ec55384 Redid stack artifacts. Broken save compatibility. Added serializer support for boost::variant and sending CStackInstace* over network by implicitly passing IDs. Moved seeds and checksum to StartInfo. Various minor changes. 2012-04-14 02:20:22 +00:00
Michał W. Urbańczyk
a9af0da0ab Rewritten handling mouse movement over hex and l-clicking hex into one procedure. That way the tooltip and cursor are always accurate, because they're set by the same routing that selects action. Having that logic duplicated in two methods was unmaintainable. [though the new one is still monstrous...] By the way fixed numerous issues, including: 
* #785 and parts of #760
* first aid tent can heal only creatures that suffered damage
* war machines can't be healed by tent
* creatures casting spells won't try to cast them during tactic phase
* console tooltips for first aid tent
* console tooltips for teleport spell
* cursor is reset to pointer when action is requested
* fixed a few other missing or wrong tooltips/cursors

Implemented opening creature window by l-clicking on stack. Master Genie's spell is picked by server, not client.
Minor changes.
 2012-03-30 21:36:07 +00:00
DjWarmonger
88e9dec974 Fixed Thieves Guild window showing for all players. 
It needed 11 files modified... :/
 2012-03-07 14:05:54 +00:00
DjWarmonger
5e14d17ed3 Fixes for r2543. 2012-02-20 09:50:49 +00:00
Michał W. Urbańczyk
046e54563c * fixed project files for RD configuration 
* fixed crash when creature is casting Hypnosis (ie. exped Vampire Lords)
* fixed crash when creature is casting Cure before attack (ie. exped Unicorns)
* fixed crash when creature is summoning elemental (TODO fix it)
* fixed crash when doing a bonus system operation with a hero liberated from prison (ie. entering town or battle)
* fixed deadlock when StupidAI tried to assault the turrets
* fixed never ending siege when StupidAI has to use catapult (no more deadlocks on AI-AI siege)
* fixed deadlock when a hero received a level during another player's turn (ie. when he successfully defended)
* AI can win the game by defeating all enemies if there is a specific victory condition applying only to human players
* added options to help testing adventure map AI (--onlyAI, --autoSkip and --oneGoodAI).
* many minor changes
 2012-01-03 01:55:26 +00:00
beegee1
156aa6e4d9 * Updated class - file - handling 
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
 2011-12-22 13:05:19 +00:00
beegee1
2f5d6f2684 * CHexField renamed to CBattleHex 
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
 2011-12-17 18:59:59 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
DjWarmonger
9a1460c2e0 Handling of cursor for creatures casting spells. 
Lots of refactoring.
 2011-10-08 06:59:36 +00:00
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
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
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
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
ed056cf0df Set of minor improvements and fixes. 2011-07-05 19:05:41 +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
Frank Zago
129c9d521e Warning fixes + typo. 2011-06-18 23:56:48 +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
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
mateuszb
94166b83aa * some changes 2011-05-22 18:46:52 +00:00
Michał W. Urbańczyk
617e1f962e New files for lib: 
* lib/ERMScriptModule.cpp
* lib/ERMScriptModule.h
* lib/CObstacleInstance.h

More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts.
Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).
 2011-05-09 22:20:47 +00:00
Michał W. Urbańczyk
b4144dc616 Callback jugglery, part 1. 
Fixed #252.
 2011-05-03 03:14:18 +00:00
mateuszb
b4edd10e6c * beegee's comments patch 
* very minor changes
 2011-02-22 11:52:36 +00:00
Michał W. Urbańczyk
ab20e024c0 Various fixes and improvements around kill hero and kill monster quests. A few minor unrelated fixes. 2011-02-11 12:27:38 +00:00
mateuszb
2451c0dea6 * a bit better stack reversing 
* FoWChange uses unordered_set instead of set
 2011-01-20 17:25:15 +00:00
Michał W. Urbańczyk
c9189119b9 Little more work on artifacts. 2010-12-29 21:04:22 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
Michał W. Urbańczyk
f7f917845c Merged changes from trunk ( r1885 ) 2010-12-14 18:08:21 +00:00
mateuszb
3989afd153 * more const-correct interface 2010-12-13 20:16:18 +00:00
Michał W. Urbańczyk
02e4ef507e Stacks #5: giving creatures, practically finished (many fixes needed). 2010-12-12 23:44:16 +00:00
Michał W. Urbańczyk
fc6d6e02a3 More fixes for stacks, some basic macro-based logging for bonus graph operations. 2010-12-11 23:11:26 +00:00
Michał W. Urbańczyk
69b97e0a51 Little more changes. 2010-12-09 23:10:28 +00:00
Michał W. Urbańczyk
848a00bc6f Stacks #4 -> giving creatures still needs to be fixed. 2010-12-05 23:10:02 +00:00
Michał W. Urbańczyk
fdb541d81e Stacks #3 -> towards new system of stack operations. 2010-11-27 20:17:28 +00:00
Michał W. Urbańczyk
7c3f3d20c3 Stacks #2 -> towards new system of stack operations. 2010-11-27 01:46:19 +00:00
Michał W. Urbańczyk
32ce20af15 Moving stack system to pointers, part #1 2010-11-22 00:34:46 +00:00
DjWarmonger
310a36c8d1 Fixed 313 & 314 :) 2010-11-15 12:51:53 +00:00
Michał W. Urbańczyk
bce805dacc Restored Warmonger's changes to artifacts system. 
They will be subject of my further work, along with next part of bonus system.
 2010-11-10 00:06:25 +00:00
Michał W. Urbańczyk
aa131bbf15 Reverted r1811, r1812, r1813 2010-10-24 11:23:43 +00:00
DjWarmonger
b75cf89f86 Partial support for customizable artifacts and Spell Scroll. Still doesn't work, though. 2010-10-03 17:52:11 +00:00
DjWarmonger
0f314e106c Artifacts will now be handled by pointers. 
Assembling & disassembling combos may be buggy, but it's already been before.
 2010-10-03 07:07:53 +00:00
DjWarmonger
f6b97704c7 Partial support for random wandering stacks. Well, they are not 'that' random as don't use global ran() function. 2010-08-22 07:11:46 +00:00
DjWarmonger
6c3ad7fcae Fixed #565. Creature components will not get description if they quantity is set to zero. 2010-08-17 15:50:17 +00:00
Ivan Savenko
fd45cd0a6d - fix for #283 
- ally support: adventure map
 2010-08-13 10:46:08 +00:00
Ivan Savenko
3c868146a6 - linux fix for BuildingHandler 
- #584 should be fixed

- first part of ally support:
-- shared FoW
-- function Callback::getPlayerRelations for team checking
 2010-08-03 12:34:06 +00:00
Michał W. Urbańczyk
221728c680 Fixed #541 2010-07-26 21:14:08 +00:00
Michał W. Urbańczyk
8487653a8e Sacrificing artifacts. [Code is one giant workaround but should work good enough.] Updated changelog. 2010-07-23 12:02:15 +00:00
Ivan Savenko
5dc444cd2b - University is finally implemented, both town and map objects 2010-07-20 14:08:13 +00:00
Michał W. Urbańczyk
1e30045541 Support for Tavern on adv map. 2010-07-08 23:03:27 +00:00
DjWarmonger
12f6d5a380 Redesigned artifact randomization. 
Fixed #119, #128, #433, #493
 2010-06-28 05:07:21 +00:00
Michał W. Urbańczyk
21a05d73cb Black Market and Artifact Merchant (only buying artifacts) support. 2010-06-27 16:03:01 +00:00
Michał W. Urbańczyk
a14606f32d New bonus system. Unified HeroBonus and StackFeature. Still early version, will need improvements and development. 
If you encounter any new crashes / bugs / unacceptable slowdowns, please PM me.
 2010-05-02 18:20:26 +00:00
Michał W. Urbańczyk
0fdbe787dc * New file: lib/HeroBonus.cpp - updated project files for MSVC 
* Updated changelog
* Support for Lighthosues and Obelisks
* Bonus system extended on players 
* Army speed won't affect movement points when sailing
* Picking grail position (digging not implemented though, puzzle map only partially)
* Minor improvements
 2010-02-10 02:56:00 +00:00
DjWarmonger
53365af90e Last part of Seer Hut & Quest Guard code: 
1.Required artifacts & army are now taken on completion.
2.Hoover tooltip.
3.Fixed bugs.
 2010-02-07 16:05:27 +00:00
mateuszb
5fbde49bfb * another part of thieves' guild 
* den of thieves
 2010-02-06 13:49:14 +00:00
DjWarmonger
ce00ceaf08 Next part of Seer Hut code, including large number of Components, packs and help functions. 
Mapa now contains separate vector of monsters to avoid linear search trough all objects.
 2010-02-02 17:05:03 +00:00
mateuszb
60a401384f * please don't include headers in headers if not necessary 2009-10-25 10:41:58 +00:00
DjWarmonger
1683a419a3 Implemented artifact placement rules for advMap objects, but not for the random artifacts placed via editor. (feature #119) 2009-10-24 19:21:32 +00:00
DjWarmonger
55925e0eea 1.Fixes for RazeStructures net packs. 
2.Support for Pyramid. Unfortunately untested entirely as combats won't work on my system.
 2009-09-24 17:54:02 +00:00
mateuszb
e9c991a180 * compilation fixes (I didn't test everything, I hope it works) 2009-09-23 12:05:33 +00:00
DjWarmonger
91b4212c5f Support for Magic Spring 
Optimized Pandora Box
 2009-09-22 16:12:33 +00:00
DjWarmonger
b29ac50dcb 1.Support for cage of Warlord, Temple of Valhalla, Wall of Knowledge, Order of Fire 
2.Level-up from newly implemented School of War crashed the game.
3.A sketch of shops support
 2009-09-21 09:00:33 +00:00
Michał W. Urbańczyk
efb1049860 * fixed crashes with paths when fastly switching heroes 
* fixed and improved slider behavior
* fixed possible thread access conflicts
* support for attacking town with visiting hero
* fixed dwellings saving
* minor improvements
 2009-09-12 22:17:23 +00:00
OnionKnight
3d2ab9c753 * Garrison dialogs for garrisons. Required a bit restructuring of the code to take removable units into account. All showGarrisonDialog methods and the GarrisonDialog struct now takes it as a parameter. Visiting ally towns would benefit from this other than garrisons. 
* Garrison right-click information shown, but not taking detailed info into account.
* Town info dialogs centered around cursor.
 2009-09-09 17:49:03 +00:00
mateuszb
543e3c6431 * one more fix for r1145 2009-08-24 10:35:11 +00:00
DjWarmonger
23c917f874 Next part of Creature Banks script, partial support for once visitable objects in towns. 
Can't test it anymore due to new major bug in AI library (vector subscript out of range)
 2009-08-23 15:02:21 +00:00
Michał W. Urbańczyk
66dd31fd8a * attacking and capturing towns 
* r-click popups on selected town/hero.bonus and teams in pregame
* disabled music due to bugs in SDL_mixer and smpeg (probably it was the source of reported random crashes / hangups)
* minor fixes
 2009-08-22 13:59:15 +00:00
mateuszb
9c45f050ef * minor changes to code handling cartographer (next time please make more documentation of your code, especially interfaces and especially when it's not consistent with the rest of the engine (map level description in this case) ) 2009-08-20 10:30:00 +00:00
DjWarmonger
dd2509f4e8 Support for Cartographers of all types. 
But damn, it's slow.
 2009-08-19 06:56:53 +00:00
mateuszb
e892913635 * support for battles in creature banks (hopefully) 2009-08-17 10:47:08 +00:00
DjWarmonger
fbc117b034 1.Pandora and Event now give experience correctly 
2.Better, but not complete handling for big exp values
 2009-08-17 10:02:29 +00:00
DjWarmonger
dd91e7e406 1. Support for Pandora Box 
2. Improved functions handling experience. Now it works with values over 65K, but still didn't with event giving 99M exp
I have no idea what it has to do with AI though
 2009-08-16 15:39:18 +00:00
DjWarmonger
4653396d76 1.Support for Keymaster Tent & Borderguard, Eye & Hut of The Magi, Stables. 
2.Partially done support for creature banks. ToDo: load config file, start battle with surrounding enemies
3.Attempt to increase hero exp capacity. You may ignore it at the moment.
4.Fixed negative countdown in timeHandler.
 2009-08-11 07:50:29 +00:00
Michał W. Urbańczyk
9fd4b5bb62 Fourth part of sailing code. 
Support for Shipyard (both for town and adventure map versions). Improved boat displaying code. Minor changes.
 2009-07-26 03:33:13 +00:00
Michał W. Urbańczyk
9206a13390 Fixed fighting guardians of Dwellings (and other objs as well). 
Most of creature generators should work fine.
 2009-07-20 23:34:06 +00:00
mateuszb
8231a6e6cc * first part of exchange window 
* minor changes
 2009-06-16 11:18:14 +00:00
Michał W. Urbańczyk
4581c30b20 * VCMI won't try to calculate path when clicking terrain on the other map level then that of currently selected hero (caused hangs) 
* Mines / Resource Silos won't give income in the first turn
* Double click on hero slot during stack splitting won't crash
* Fixed problems with updating buttons / minimap
 2009-05-24 23:21:55 +00:00
Michał W. Urbańczyk
d80afb1902 * server sends confirmation (given later to player interface) after applying request (will be needed for AI) 
* created new package for injuring multiple units - needed for area spells (not tested)
* proper screen updating on garrison change
* spell effects will be removed when they time out
* Corpse (Skeleton) will be accessible from all directions
* new objects supported:
- Corpse
- Lean To
- Wagon
- Warrior's Tomb

* several minor improvements
 2009-04-16 00:28:54 +00:00
mateuszb
f9ae91d88c * further changes towards support for ranged spells 
* added info about author & license in files
 2009-04-15 14:03:31 +00:00
Michał W. Urbańczyk
f9aebcc4bd * Started making support for garrison window. Leaving guardians in flagged mines. 2009-04-12 00:58:41 +00:00
Michał W. Urbańczyk
d72d988a9c * fixed crash on closing application 
* unified yes/no and selection dialog interface calls
* VCMI won't anymore be always giving all three stacks in the starting armies
* fix for drawing starting army creatures count
* support for School of Magic
* support for School of War
* support for Pillar of Fire
* minor changes
 2009-04-11 01:32:50 +00:00
mateuszb
2a7ad63495 * massive spells go via one SetStackEffect 2009-03-21 16:03:07 +00:00
Michał W. Urbańczyk
6ce9a253a4 * support for Redwood Observatory 
* support for Shrine of Magic Incantation / Gesture / Thought
* minor improvements
 2009-03-14 11:25:25 +00:00
Michał W. Urbańczyk
4653ca6b29 New file for VCMI_Server - NetPacksServer.cpp 
Redone client -> server protocol.
 2009-03-09 10:37:49 +00:00
Michał W. Urbańczyk
e9ebc7de5b wrong1 2009-03-06 22:25:19 +00:00
Michał W. Urbańczyk
b1c0d10ece 2009-03-06 22:11:17 +00:00
Michał W. Urbańczyk
6a3bfbee46 * added "Next hero" button functionality 
* minor improvement for prison (hero appears at proper tile)
* only one spell can be casted per turn
* minor changes
 2009-02-20 10:36:15 +00:00
Michał W. Urbańczyk
adf5c052f9 * support for prison 
* updated changelog
 2009-02-14 19:12:40 +00:00
Michał W. Urbańczyk
fb4ee65d0e * changed map reading routine in pregame, minor changes for events 2009-02-08 06:42:15 +00:00
Michał W. Urbańczyk
05b3e3215c * magic well support 
* improvements in the recruitment window
* improvements for pregame  
[cf http://vcmi.antypika.aplus.pl/forum/viewtopic.php?t=97 issues 12-15 and 21 - 22]
* minor changes
 2009-02-06 11:15:39 +00:00
Michał W. Urbańczyk
218a3beaf6 * further changes towards luck/morale support 
* partial support for Idol of Fortune, Fountain of Fortune, Faerie Ring, Swan Pond
 2009-02-04 13:40:54 +00:00
Michał W. Urbańczyk
3474fdaf05 * save/load partially working 
* Arena and Witch Hut support
* improved support for Resources
* minor fixes and changes
 2009-01-10 22:08:18 +00:00
Michał W. Urbańczyk
4a8ae4ed9a * restored objects functionalities (hopefully working) 
* new file in vcmi lib: IGameCallback.cpp
 2008-12-27 01:01:59 +00:00