games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Code Issues Releases Activity
5,235 Commits 21 Branches 61 Tags 103 MiB
fbebbf39f3
Commit Graph

1065 Commits

Author SHA1 Message Date
AlexVinS
9eaa136c58 fix releasing obstacle pointer 2015-06-02 07:12:44 +03:00
AlexVinS
5226081f33 rewrite stack movement processing 2015-06-02 07:12:43 +03:00
AlexVinS
e45b6cfdda fix mantiss 0001581 2015-04-13 17:27:47 +03:00
AlexVinS
20acdbbf3b Fix wrong side for opening battle spells 2015-03-30 19:16:08 +03:00
AlexVinS
6dea40aa95 Do not damage immune creature by spell-created obstacle. This should fix 0001846 2015-03-29 16:50:23 +03:00
DjWarmonger
8820bc05a9 MSVS compiler doesn't allow default arguments for Lambdas. 2015-03-10 10:06:45 +01:00
DjWarmonger
ec879046ca Merge pull request #93 from ArseniyShestakov/feature/pathfindingTeleports 
Okay let's do this!
 2015-03-10 09:04:25 +01:00
ArseniyShestakov
3773859e9d CGameHandler::moveHero allow transit, but for teleports only 2015-03-08 17:08:57 +03:00
ArseniyShestakov
21aaad6972 MoveHero: add transit movement option 
Transit is new option for hero movement. If it passed for movement then hero can get get on tile without visiting of object on it.
Currently it's will be only allowed is object under destination is teleport.
 2015-03-08 17:04:09 +03:00
ArseniyShestakov
25656aa586 Add showTeleportDialog everywhere except actual code for AI and player 
Just like TeleportDialog it's based off showBlockingDialog, but as number of package is higher when possible showTeleportDialog will be after other dialogs handling code.
 2015-03-08 16:52:50 +03:00
ArseniyShestakov
18535db0ef Add TeleportDialog and CTeleportDialogQuery 
TeleportDialog is based off BlockingDialog and it's needed for server to ask client what teleport hero should be teleported to.
It's also contain list of possible exits, identifier of currently used channel and also impassable option.
If impassable set to true then client will remember that current teleport channel is lack of exit point.
 2015-03-08 16:37:33 +03:00
AlexVinS
685deddac1 Start spell-relatet files reorganisation 
* moved existing files to separate directory
-> todo: split mechanics
 2015-02-26 08:39:48 +03:00
AlexVinS
08d4f7991e Extract adventure spell mechanics 2015-02-26 08:39:39 +03:00
DjWarmonger
a736a863da Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-02-22 18:36:23 +01:00
DjWarmonger
6797c374ed Additional check 2015-02-22 18:36:13 +01:00
ArseniyShestakov
445ded71a7 Movement: now hero will always ignore guards if visiting object that he staying on 
This one is replicating original game behaviour and fixes issue 1990 and related to issue 2084.
Currently this is mainly caused problem with teleporters which lead to crash in AI due to unexcepted hero loss.
 2015-02-22 20:12:49 +03:00
AlexVinS
aa5e9fc959 get rid of global debug macros. 2015-02-14 22:43:16 +03:00
DjWarmonger
a8ff08a562 Fixed #2012 2015-02-14 19:44:04 +01:00
DjWarmonger
84b2510aa4 Merge pull request #62 from vcmi/SpellsRefactoring4 
OK
 2014-12-26 08:46:29 +01:00
DjWarmonger
8c471f6359 Merge pull request #69 from ArseniyShestakov/artifactsImprovements 
Thanks, looks great now.
 2014-12-25 20:24:08 +01:00
DjWarmonger
5b8180e327 Cleaning logs. 2014-12-25 12:58:15 +01:00
ArseniyShestakov
4cb98e7e8d Use isTradable and fix issue 1392 
This change make it possible to sell spell scrolls in Artifacts Merchant.
 2014-12-24 20:48:37 +03:00
ArseniyShestakov
937ef0227b Use ArtifactID instead of int when possible 2014-12-24 18:49:12 +03:00
AlexVinS
eebf65e88f Merge branch 'develop' into SpellsRefactoring4 2014-12-24 00:15:27 +03:00
DjWarmonger
c538370c5d Players will be always able to see their owned heroes and other objects. Fixes #1959. 2014-12-21 13:56:32 +01:00
AlexVinS
d94f15bdf4 Added configurable animation for SPELL_LIKE_ATTACK 2014-11-28 00:36:14 +03:00
AlexVinS
f4cf12d3f8 Fix a crash 2014-11-27 00:53:08 +03:00
AlexVinS
b31ed0e4ea Use SetMana packet in battle 2014-11-26 13:30:55 +03:00
AlexVinS
ca5391cde6 Get rid of handleSpellCasting 2014-11-25 22:00:04 +03:00
AlexVinS
c67887ae58 Use spell mechanics clases in GameHandler 2014-11-25 18:16:14 +03:00
AlexVinS
f2bf3d7f7b Added a way to obtain ID of newly added Stack 2014-11-25 12:26:32 +03:00
AlexVinS
f7ff61ce4f Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4 2014-11-24 12:41:17 +03:00
KroArtem
e73c60740c corrected text in vcmibuilder, corrected errors and warnings from cppcheck 2014-11-16 20:48:29 +03:00
AlexVinS
a06dae1f96 Move getAffectedCreatures to CSpell. + more drafts 2014-11-13 04:53:25 +03:00
AlexVinS
d7800b834e get rid of CBattleInfoCallback::calculateSpellDmg 2014-11-12 09:52:11 +03:00
AlexVinS
e4b726151d get rid of CBattleInfoCallback::battleStackIsImmune 2014-11-12 09:20:20 +03:00
AlexVinS
ddf98a5920 +SpecialRisingSpellMechanics::isImmuneByStack 2014-11-12 08:34:43 +03:00
Patrick Simmons
41da0ad2e6 multiplayerload changes (committing so I can revert...) 2014-10-25 19:05:49 -04:00
Patrick Simmons
3685e96042 Revert "multiplayer load changes" 
This reverts commit 368d2c8836cc6e3b5af9cf71e892bf4515f26bda.
 2014-10-25 19:05:49 -04:00
Patrick Simmons
99a63c4bbd multiplayer load changes 2014-10-25 19:05:49 -04:00
Patrick Simmons
cfa6f46d62 VERY buggy, unusable, but progress is being made... 2014-10-25 19:05:49 -04:00
Mikhail Paulyshka
b8f5a57c64 Include ZLib headers for launcher and server 2014-10-12 16:33:38 +03:00
AlexVinS
66b022f93e initializer lists part1 2014-10-02 19:43:46 +04:00
Ivan Savenko
aa0433228a Fixed cheats - sendMesssage will also pass current object. 
Workaround-ish but should work. Branch should be fixed now.
 2014-09-21 20:35:53 +03:00
Ivan Savenko
6c0c03d74b Refactoing of pathfinder <-> client/AI interaction to remove dependency on selected hero 
- finished removal of server-side setSelection
- disabled some broken code (AI & cheats). TODO: fix
 2014-09-21 16:42:08 +03:00
Ivan Savenko
78709e223b Breaking things - trying to remove server-side knowledge of selected objects 2014-09-19 00:18:49 +03:00
DjWarmonger
36a7cff998 Cleaning error messages at access to players. 2014-09-17 11:03:53 +02:00
DjWarmonger
d9273b3b2a Cleaning logs. 2014-09-10 19:09:48 +02:00
Ivan Savenko
b551bdb725 Final part of the merge 
Merging VCMI Dirs refactoring + GUI refactoring with current develop
 2014-09-04 20:59:07 +03:00
josch
2e6e026645 let vcmiserver handle commandline options first 
The vcmiserver application will first try to initialize various things
before parsing the commandline arguments. This leads to the program only
outputting an initialization error when it cannot initialize instead of
parsing arguments like --help. This patch moves the argument parsing to
earlier in program execution to avoid this behaviour.
 2014-09-02 18:42:38 +02:00
DjWarmonger
0edaf4fa8a Merge pull request #26 from vcmi/FFMpeg 
Let's do this, way too many branches running now.
 2014-09-01 10:35:30 +02:00
DjWarmonger
8b10f70afd Migrating to MSVS 2013, which allows to delete inttypes.h file. 2014-08-31 19:08:39 +02:00
Karol
1b6f2ea3b7 VCMIDirs update #5 fix 
- Updated old OS detect macros.
- Fixed 1 misspell.
 2014-08-26 12:19:04 +02:00
Karol
a302f6c7ad VCMIDirs update #3 
bfs = boost::filesystem;
- Updateting filenames (std::string -> bfs::path) #1
- Added platform detection, and some specyfic boost::filesystem includes
to Global.h
- Updated CBasicLogConfigurator. Now class uses bfs::path pathes.
 2014-08-10 23:42:39 +02:00
beegee1
5139378319 - migrated boost::function/ref/bind to std:: variants 2014-08-04 20:33:59 +02:00
Michael Pavlyshko
bad7050096 spaces -> tabulation 2014-07-11 11:01:03 +03:00
Michael Pavlyshko
08ee65c3c8 fix .dll and .exe filenames 2014-07-10 01:06:37 +03:00
Michael Pavlyshko
c935193558 disable WIN32 flag for executables, fix previous commit 2014-07-10 00:47:22 +03:00
AlexVinS
195eae48ca Merge branch 'develop' into SDL2 
Conflicts:
	client/CPlayerInterface.cpp
 2014-07-02 17:15:12 +04:00
DjWarmonger
bf567c9e50 Fixed crash caused by hiding tiles around AI heroes. 2014-07-01 09:13:19 +02:00
Ivan Savenko
1157111fcf More bugfixing: 
- Fixed compile in VCAI (precompiled headers should not include VCMI headers)
- Fixed crash on visiting observatories, including shroud of darkness
 2014-06-29 17:23:06 +03:00
Ivan Savenko
32240da34e Reduced number of #include's in headers. May break compilation on Win 
since some net packs now need DLL_LINKAGE
 2014-06-25 17:11:07 +03:00
Ivan Savenko
6e3eaeee21 Minor fix to schema, server will print visited objects in debug log 2014-06-25 00:23:56 +03:00
Ivan Savenko
a0689fa377 Refactoring of hoverText from objects: 
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
 2014-06-24 20:39:47 +03:00
Ivan Savenko
ad632d1e8a Moved FoW management from CGObjectInstance to callback 2014-06-24 20:39:47 +03:00
AlexVinS
3b8d0e44d4 Merge branch 'develop' into SDL2 2014-06-24 14:09:44 +04:00
DjWarmonger
3ac306f501 Merge pull request #19 from vcmi/feature/mapObjects 
Feature/map objects
 2014-06-22 14:49:42 +02:00
Ivan Savenko
0a71e89f58 Created large number of missing objects in configs 
Minor bugfixes in code
 2014-06-17 14:57:47 +03:00
Haryaalcar
fee9f0c1a0 "0001766: Disassembling artifacts in hero and hero meeting screen doesn't work." fix 2014-06-14 16:52:30 +03:00
AlexVinS
0bf7d2b84c fix server project configure 2014-06-13 07:55:49 +04:00
AlexVinS
56c74bc46a +More build target to support both SDL1 and SDL2 builds 2014-06-13 07:55:48 +04:00
AlexVinS
bbd0312b45 Tweak configuration 2014-06-13 07:55:47 +04:00
Ivan Savenko
44742814cd More cleanup: 
- moved SoundBase.h to lib since it contains shared data
- added RMG info to object format. Note that data is not yet imported in
configs
- slightly updated API of object handlers
 2014-06-05 23:51:24 +03:00
Ivan Savenko
b2e8c92383 Cleanup: 
- removed commented-out #includ'es
- renamed some files to match name of class
 2014-06-05 20:26:50 +03:00
Ivan Savenko
652ceb2bde Finally shattered CObjectHandler.cpp into tiny bits 
- This file is now split into multiple smaller files in mapObjects
directory
- CObjectHandler itself now contains only core classes (Handler itself,
CGObject and interfaces)
- Cleaned up excessive #include's through whole project
 2014-06-05 19:52:14 +03:00
Ivan Savenko
0afdfa529c Moved all object-related files to lib/mapObjects directory. 
Renamed some classes to more readable names
 2014-06-05 14:19:47 +03:00
Ivan Savenko
32b6568b65 Merged changes from upstream and fixed compilation caused by API changes 2014-06-03 22:45:18 +03:00
karol57
c676c5da82 Fixed small error in nearest town finding algorithm. 2014-05-25 21:53:25 +02:00
karol57
dd33fd51a8 int3 dist2d microoptimization 2014-05-25 20:42:25 +02:00
Ivan Savenko
7f276185bd Moving files: 
- new config for objects (config/objects/generic.json)
- renamed lib/CDefObjectHandler to lib/CObjectClassesHandler
 2014-05-24 02:07:54 +03:00
AlexVinS
6f65d2484b Extract battleStackIsImmune from battleIsImmune 
This fix possible problems with rising spells as now immunty is handled on stack level not on hex level
* battleIsImmune in now protected - only used in canCastThisSpellHere
 2014-05-19 13:44:38 +04:00
AlexVinS
ababd0d995 there can`t be resistance to rising spell (immunities are handled seperately) 2014-05-18 17:03:02 +04:00
AlexVinS
afd74ff649 Remove more hardcoded immunity handling. 
* ANIMATE_DEAD already limited to UNDED
* make DEATH_STARE immunties absolute
 2014-05-18 17:03:02 +04:00
AlexVinS
b6b12ad8f6 Merge and simplify resistance calculation 2014-05-18 17:03:01 +04:00
AlexVinS
1431fcedf7 handleSpellCasting: Handle immunity before RESISTANCE. Now immune creatures shouldnt show resisted animation 2014-05-18 17:03:00 +04:00
AlexVinS
d9368ca5ba Use new battleGetStacksIf method 2014-05-18 17:02:59 +04:00
DjWarmonger
00c31b4b85 Fixed #1790 2014-05-17 21:30:55 +02:00
Ilya Zhuravlev
db7cd79cf7 Android port. 
Conflicts:
	lib/vcmi_endian.h
 2014-05-16 23:24:29 +04:00
DjWarmonger
fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup 
Conflicts:
	client/CKingdomInterface.cpp
 2014-05-02 12:03:02 +02:00
DjWarmonger
4a71442c80 Missing changes. 2014-04-27 14:38:20 +02:00
Macron1Robot
31f2af6243 Removed commented part for daily income 2014-04-27 13:44:56 +04:00
Macron1Robot
8ec7a9b919 Moved "max heroes on map per player", "max heroes available for player" to "defaultMods.json" 2014-04-27 10:43:46 +04:00
Macron1Robot
907caedb13 Added "produce" section in "building" structure. Changed dailyIncome. 2014-04-26 18:23:35 +04:00
Macron1Robot
b7b890acff Added "tavernVideo","guildBackground" to "faction" JSON config and schema. If "primaryResource" is set to "gold", silo will generate 500 gold per day 2014-04-24 23:36:18 +04:00
DjWarmonger
9e7013de77 Backup for my own MVS project configuration 2014-04-24 21:07:43 +02:00
beegee1
1d57b75bc5 - random number generation refactoring 
- fixed mantis #1743
 2014-04-10 19:22:32 +02:00
DjWarmonger
a64df5718f Some nontrivial optimizations based on profiling results: 
- Movement bonuses will be calculated ONCE per pathfinder loop
- Goals will be sorted by hero to reduce number of calculatePaths calls
 2014-03-31 14:26:09 +00:00
Ivan Savenko
9c0df68cb8 Fixing spelling mistakes. Patch from josch, fixes #1759 2014-03-23 12:59:03 +00:00
Ivan Savenko
760ae7d44a Changes related to Debian packaging, based on josch patch 
- AUTHORS file is now in UTF-8
- tags for desktop files
- fixed some typos
- better reaction on --help and --version commands
- vcmibuilder should work with both avconf and ffmpeg
 2014-03-20 18:17:40 +00:00
beegee1
fe1b16a7ec Some preparation towards mantis #1743: 
- refactored CRandomGenerator (added util methods, improved method names)
- usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced)
- refactored getArtSync method of CArtHandler -> now named pickRandomArtifact
- fixed some compiler warnings
- updated source code URL in VCMI spec
 2014-03-17 19:51:07 +00:00