1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

2434 Commits

Author SHA1 Message Date
AlexVinS
a3f2667376 Remove some deprecated fields from CSpell
* now only new SpellScholl API is used
(!) untested
2015-02-26 08:39:43 +03:00
AlexVinS
550df6360e cleanup 2015-02-26 08:39:42 +03:00
AlexVinS
b3d8e2e783 Move calculateHealedHP to mechanics 2015-02-26 08:39:41 +03:00
AlexVinS
77b4774a29 fix 2015-02-26 08:39:40 +03:00
AlexVinS
08d4f7991e Extract adventure spell mechanics 2015-02-26 08:39:39 +03:00
DjWarmonger
c5e772eb78 Fixed issue which created large empty areas on two-level maps. 2015-02-25 19:34:02 +01:00
DjWarmonger
ef4e199f15 Implemented "Quantity does not grow" for monsters (#2094) 2015-02-22 20:54:09 +01:00
DjWarmonger
2a082e6c21 Merge pull request #84 from Fayth/test/advMapFading
If no one objects, I will try to merge this.
2015-02-18 09:52:09 +01:00
DjWarmonger
200bcd7da6 Merge pull request #88 from ArseniyShestakov/improvedQuestLog
Awesome, thanks!
2015-02-17 06:44:38 +01:00
ArseniyShestakov
43f1e37546 Quest Log: fix text for quests with minimal level requirement
This is needed because m13478val is ui32 while translation expect %s string.
2015-02-16 00:53:44 +03:00
ArseniyShestakov
789da96a81 Stables: give 400 movement points bonus instead of 600
Tested it and now VCMI work exactly as original game.
This one fix issues 2077 / 2082
2015-02-15 07:55:59 +03:00
AlexVinS
aa5e9fc959 get rid of global debug macros. 2015-02-14 22:43:16 +03:00
ArseniyShestakov
746914d219 Added missionType check to CQuest::getRolloverText
This function shouldn't be called if quest type is MISSION_NONE as this type used for quest that don't have text yet.
For example Keymaster`s border guards in H3 didn't add any entries to Quest Log so there is no text for them or at least it's not defined how to use it in VCMI.
2015-02-14 00:57:33 +03:00
ArseniyShestakov
7c5af02b78 Fix saving of player's quests
This commit break saves compatibility
2015-02-12 13:19:22 +03:00
AlexVinS
ac3e48f4b9 Move JsonNode operator<< to right plase 2015-02-10 14:43:26 +03:00
Fay
aaec94ea87 Changed fading to be enabled by default (when entries are not present in config); 2015-02-09 20:41:03 +01:00
Fay
cbd3a19987 Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading
Conflicts:
	client/CPlayerInterface.cpp
2015-02-09 16:09:27 +01:00
ArseniyShestakov
1396476869 Merge pull request #79 from ArseniyShestakov/fixIssue1557
Only remove extension if it belongs to specified file type
2015-02-07 18:17:22 +03:00
ArseniyShestakov
4eed1716d5 Fix tiny memory leak on opening/closing new game window
Find this one when tested huge pack of 5000+ maps. Each time I opened/closed Single Scenario window memory usage was growing for ~1MB.
It's happen because inflateEnd is freed related structures, but not freed inflateState that created outside of zlib code.
2015-02-07 17:30:57 +03:00
AlexVinS
91cc6a04eb possible fix for mantiss 2055 2015-02-07 00:06:24 +03:00
ArseniyShestakov
8f08effe93 Check that resource type set before setName used 2015-02-06 10:51:32 +03:00
Fay
3c3fb0e21d Added advmap config options to enable/disable fading; 2015-02-02 19:38:30 +01:00
AlexVinS
594295da32 Merge branch 'feature/worldView' into develop 2015-02-01 20:49:14 +03:00
ArseniyShestakov
19d1de3142 Only remove extension if it belongs to specified file type
This one fixes issue 1557
Now it's possible to load maps with dots in filename.
2015-01-26 16:40:49 +03:00
DjWarmonger
0acae7a708 Additional adjustment of zone positions to ensure balanced zone sizes. 2015-01-16 19:28:27 +01:00
DjWarmonger
ba604f4e43 Implemented "junction" zone type. 2015-01-16 17:39:16 +01:00
DjWarmonger
b7386250e9 Fixed fractalized paths inside zones. 2015-01-16 09:40:11 +01:00
DjWarmonger
fe180335de Important fix that prevents treasures from sealing off, adding too many blocked tiles. 2015-01-15 11:21:29 +01:00
Fay
4b248c2762 World view impl -- initial; 2015-01-13 20:57:41 +01:00
DjWarmonger
9f05f53e65 Corrected monster agressiveness #2034 2015-01-10 10:23:58 +01:00
DjWarmonger
c22c3cdd80 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-01-08 07:15:26 +01:00
AlexVinS
8deee7610c CMapGenerator.cpp: remove unused variables 2015-01-03 01:04:42 +03:00
DjWarmonger
7055357996 Fixed spell scroll generation #2024 2015-01-02 23:01:14 +01:00
DjWarmonger
8e99e803c1 Post-release version bump. 2014-12-27 10:34:16 +01:00
DjWarmonger
850350e402 Savegame bump. To be released as 0.97b. 2014-12-27 09:48:16 +01:00
DjWarmonger
fdd392e47c Add some space around unguarded treasures. 2014-12-26 21:13:13 +01:00
DjWarmonger
53c39f7d05 Treasure density and quality now matches OH3. 2014-12-26 19:35:45 +01:00
DjWarmonger
f5f0f61076 Density does not depend on zone size. 2014-12-26 17:13:41 +01:00
DjWarmonger
5fbd856a4c New rule for placement of unguarded treasures 2014-12-26 16:17:39 +01:00
DjWarmonger
121c39a994 Fixed Jebus and CoD templates. 2014-12-26 15:14:22 +01:00
DjWarmonger
4a41d138cc Update Visual projects. 2014-12-26 09:56:11 +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
5271ca156b Merge pull request #70 from vcmi/StackSplitting
Stack splitting
2014-12-25 19:59:02 +01:00
ArseniyShestakov
04d15174e7 Use switch for CArtHandler::isTradableArtifact 2014-12-25 17:18:37 +03:00
DjWarmonger
0d2879158b Merge pull request #67 from ArseniyShestakov/fixIssue1912
Okay, let's do this.
2014-12-25 14:23:26 +01:00
DjWarmonger
5b8180e327 Cleaning logs. 2014-12-25 12:58:15 +01:00
DjWarmonger
51495381ef Better obstacle shapes inside zones. 2014-12-25 10:24:48 +01:00
DjWarmonger
e46f03fabe Upgrades, stack splitting. Results now are identical to OH3. 2014-12-25 10:21:39 +01:00
DjWarmonger
3c39ef477f Implemented original stack splitting algorithms proposed by AlexSpl. Save format changed. 2014-12-24 23:53:56 +01:00
ArseniyShestakov
de6752c048 Implement CArtHandler::isBigArtifact and CArtifact::isTradable 2014-12-24 20:43:35 +03:00
ArseniyShestakov
937ef0227b Use ArtifactID instead of int when possible 2014-12-24 18:49:12 +03:00
DjWarmonger
6f7bda65b4 Better obstacle shapes inside zones. 2014-12-24 15:07:20 +01:00
DjWarmonger
b208ebbee9 Increase treasure density to match OH3. 2014-12-24 14:01:05 +01:00
AlexVinS
eebf65e88f Merge branch 'develop' into SpellsRefactoring4 2014-12-24 00:15:27 +03:00
DjWarmonger
75d407b59a Last improvements - zones on simpler maps should not be smashed. 2014-12-23 18:16:53 +01:00
DjWarmonger
53b3ea8d97 Final update for zone placer. 2014-12-23 14:26:14 +01:00
DjWarmonger
0dbfee0edb Final shape of algorithm 2014-12-23 13:49:07 +01:00
DjWarmonger
990e38e961 Fixes for placement. 2014-12-23 12:42:59 +01:00
DjWarmonger
868d2f61ee New zone placement algorithm 2014-12-23 11:39:41 +01:00
DjWarmonger
0e34775770 Important fix. 2014-12-23 10:42:01 +01:00
DjWarmonger
875bfb025e Better fitness function(s) 2014-12-22 23:35:19 +01:00
DjWarmonger
b52eeb2263 Remember "best" placement at right moment. 2014-12-22 21:47:19 +01:00
DjWarmonger
067b56dda4 Zone placer will remember the best solution, not the last generated. 2014-12-22 21:33:37 +01:00
DjWarmonger
94c0d5896f [MVS] Added /LTCG option to improve linker performance. 2014-12-22 19:44:15 +01:00
DjWarmonger
7735e193f0 Merge branch 'develop' into experimental/serializerrefactoring 2014-12-22 19:17:40 +01:00
ArseniyShestakov
5d59bbc0d4 Fix CGBonusingObject serialization
Now state of adventure map objects that use this handler will be saved properly and they'll work as indended after save loaded. Affect following objects: Buoy, Swan Pond, Faerie Ring, etc.
2014-12-22 11:56:53 +03:00
AlexVinS
74161198c4 More refactoring 2014-12-21 21:47:02 +03:00
AlexVinS
b86938de5e More rafactoring 2014-12-21 18:22:12 +03:00
AlexVinS
c57b2403e1 Refactor metaprogramming-helper structs 2014-12-21 17:53:51 +03:00
AlexVinS
3bca68fd2d Initial refactoring
* reduce registerTypes* templtates instantiation
2014-12-21 17:29:42 +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
DjWarmonger
fee2184996 Wood & ore mines will be placed close to zone center. 2014-12-20 22:13:10 +01:00
DjWarmonger
485b2ac688 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-12-20 15:17:22 +01:00
DjWarmonger
50dc22fa1b Tuned density. 2014-12-20 14:52:01 +01:00
DjWarmonger
3886a19771 More balanced treasure pile distribution. 2014-12-20 14:01:48 +01:00
DjWarmonger
a3a42ae144 Merge branch 'develop' of https://github.com/vcmi/vcmi into fuzzyFix 2014-12-19 14:21:44 +01:00
DjWarmonger
6fc873dcd5 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-12-19 14:14:18 +01:00
DjWarmonger
cb5a3c0f73 Fixed shortage of Prisons on random maps. 2014-12-19 14:04:59 +01:00
DjWarmonger
a1e42caddd Banks won't use fuzzy engine at all, only center of mass. 2014-12-10 12:29:51 +01:00
ArseniyShestakov
6391f0f85a Fix crash on Cartographer if there is no underground level
Show "already visited" text for stalagmite cartographer if map don't have underground level.
This one fixes bug #1985
2014-12-09 14:01:32 +03:00
AlexVinS
64dccfec80 Rewrite Beneficial spell selection 2014-12-02 00:24:36 +03:00
AlexVinS
b0df8172f9 Move battleIsImmune to CSpell 2014-11-29 04:25:51 +03:00
AlexVinS
e8aeb0bf8e Merge branch 'develop' into SpellsRefactoring4 2014-11-28 22:44:33 +03:00
AlexVinS
499a281dfe Disallow rising spells for genie 2014-11-28 21:08:34 +03:00
AlexVinS
e583f4e44d Fix #1928
* disallow geneie to cast teleport
2014-11-28 20:39:23 +03:00
AlexVinS
8f84e24aa6 Get rid of mainEffectAnim 2014-11-28 01:03:25 +03:00
AlexVinS
d94f15bdf4 Added configurable animation for SPELL_LIKE_ATTACK 2014-11-28 00:36:14 +03:00
AlexVinS
657385e32c We need to know caster stack ID for proper projectile animation 2014-11-27 20:47:37 +03:00
AlexVinS
6893509f65 Fix manaGain animation always showing 2014-11-27 19:09:59 +03:00
AlexVinS
f1ab328a09 Cleanup 2014-11-27 17:08:19 +03:00
AlexVinS
75b93b070d Implemented configurable hit/affect animation
* need more testing
2014-11-27 16:51:16 +03:00
AlexVinS
f4cf12d3f8 Fix a crash 2014-11-27 00:53:08 +03:00
AlexVinS
256894d18a Use configuration for spell projectile 2014-11-27 00:27:38 +03:00
AlexVinS
242aa72796 Implemented loading of new spell configuration parameters 2014-11-26 22:39:27 +03:00
AlexVinS
16d08b062a First draft of spell animation configuration 2014-11-26 22:25:13 +03:00
AlexVinS
b31ed0e4ea Use SetMana packet in battle 2014-11-26 13:30:55 +03:00
AlexVinS
fe1233310f Centralize dispell mechanics 2014-11-25 23:59:21 +03:00
AlexVinS
756c19227b update VS project. untested. 2014-11-25 22:47:28 +03:00
AlexVinS
ca5391cde6 Get rid of handleSpellCasting 2014-11-25 22:00:04 +03:00
AlexVinS
2a75c432e0 Remove 2 unused methods 2014-11-25 19:45:50 +03:00
AlexVinS
fa9c1e8637 remove healedHP calculation from battlestate 2014-11-25 19:43:34 +03:00
AlexVinS
20a058f3f9 Formatting & cleanup 2014-11-25 18:27:18 +03:00
AlexVinS
6d4cd1c91b Copying of handleSpellCasting finished 2014-11-25 17:37:42 +03:00
AlexVinS
a387ad0d09 Continue moving spell cast logic 2014-11-25 16:16:49 +03:00
AlexVinS
d87153a610 Hide mechanics classes 2014-11-25 15:00:34 +03:00
AlexVinS
c8f1e6d1a1 Move mechanics factory 2014-11-25 14:58:42 +03:00
AlexVinS
226b737b6b Small cleanup 2014-11-25 14:51:55 +03:00
AlexVinS
0fda90c67d Start moving server side spell mechanics 2014-11-25 14:19:13 +03:00
AlexVinS
f2bf3d7f7b Added a way to obtain ID of newly added Stack 2014-11-25 12:26:32 +03:00
AlexVinS
aa31625774 More flexible way of spell school access 2014-11-24 19:14:10 +03:00
AlexVinS
f7ff61ce4f Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4 2014-11-24 12:41:17 +03:00
AlexVinS
6dbed27b65 Add more "const" 2014-11-23 14:10:29 +03:00
DjWarmonger
9e5cc2d1b1 Treasure piles will prefer to grow upwards to make space for object accessible from bottom. 2014-11-22 14:17:53 +01:00
DjWarmonger
91d89add7c Reverted RMG bug introduced in 6da79d01d7 2014-11-22 13:01:28 +01:00
DjWarmonger
4b02af23e1 Merge pull request #55 from KroArtem/develop
Merging, thanks!
2014-11-20 16:00:38 +01:00
KroArtem
6da79d01d7 reverted changes back 2014-11-20 15:33:22 +03:00
KroArtem
305ce5b53d fixed else statement 2014-11-20 15:14:16 +03:00
Ivan Savenko
ffd5867913 Merge pull request #58 from josch/kFreeBSDandHurdSupport
FreeBSD and HURD support
2014-11-18 19:24:50 +02:00
josch
5c356f4415 add support for the HURD 2014-11-17 16:43:26 +01:00
josch
a96b5e7905 add support for FreeBSD 2014-11-17 12:25:10 +01:00
josch
c36042f8c7 rename preprocessor variable VCMI_LINUX to VCMI_XDG
- the variable is only used to enable XDG support
 - XDG is not exclusive to linux
2014-11-17 12:19:52 +01:00
ArseniyShestakov
4dd1ca5e78 Fix bonuses of Rampart's Treasury and Fountain of Fortune
Change IDs of two special buildings in Rampart to make them identical with one in config files / game assets.

Original code was introduced in 0ca9f64 with those two IDs likely was typo. As result Fountain of Fortune +2 luck bonus was given to Treasury and Treasury's weekly bonus didn't worked at all.
2014-11-17 03:26:18 +03:00
KroArtem
e73c60740c corrected text in vcmibuilder, corrected errors and warnings from cppcheck 2014-11-16 20:48:29 +03:00
AlexVinS
752965ff69 Merge branch 'develop' into SpellsRefactoring4
Conflicts:
	lib/CSpellHandler.cpp
2014-11-14 05:28:23 +03:00
AlexVinS
7a429fc38b Revert @24efb9b4 2014-11-14 03:29:11 +03:00
AlexVinS
7af4f44237 rewrite CGHeroInstance::canCastThisSpell 2014-11-13 17:57:35 +03:00
AlexVinS
3fcb1254f7 Rewrite CGHeroInstance::getSpellSchoolLevel using SPELL_SCHOOL_CONFIG 2014-11-13 17:24:30 +03:00
AlexVinS
5d1077161c Change spell school serialization 2014-11-13 16:57:49 +03:00
AlexVinS
787c970003 Simplify CGameInfoCallback::estimateSpellDamage 2014-11-13 15:16:27 +03:00
AlexVinS
3da27243c8 Fix SPELL_DAMAGE_REDUCTION calculation. 2014-11-13 15:07:39 +03:00
AlexVinS
9e8b09d747 Use clearAffected flag 2014-11-13 15:00:45 +03:00
AlexVinS
9f983c67c0 Fix uninitialized variables 2014-11-13 14:35:58 +03:00
AlexVinS
00013ed31a Fix spell school immunity evaluation 2014-11-13 14:10:25 +03:00
AlexVinS
ce8fa33efc Introduced new spell configuration options (not used yet) 2014-11-13 13:37:42 +03:00
AlexVinS
c7480e7fe5 Move getAffectedStacks to mechanics classes 2014-11-13 12:33:51 +03:00
AlexVinS
22c251b57d Small fix for rangeInHexes 2014-11-13 08:29:04 +03:00
AlexVinS
bab7198cd7 Use some constants in SRSLPraserHelpers 2014-11-13 08:13:06 +03:00
AlexVinS
4042757f93 Move spell range calculation to Mechanics
* made ISpellMechanics opaque
2014-11-13 07:34:20 +03:00
AlexVinS
b62ee20880 Move TargetInfo initialization to constructor 2014-11-13 06:29:41 +03:00
AlexVinS
0015027ec7 Draft fo CHAIN_LIGHTNING
* fix usage of RECEPTIVE bonus
2014-11-13 05:40:52 +03:00
AlexVinS
a06dae1f96 Move getAffectedCreatures to CSpell. + more drafts 2014-11-13 04:53:25 +03:00
Ivan Savenko
dce9880d16 Minor refactoring of FunctionList using variadic templates.
Please make sure that all supported compilers are OK with this code
2014-11-12 22:46:37 +02:00
AlexVinS
5ba53da9bf Extract SpellMechanics to separate file 2014-11-12 11:36:34 +03:00
AlexVinS
22178151aa More general spell school handling 2014-11-12 11:03:55 +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
AlexVinS
639b915391 Move calculateSpellBonus to CSpell 2014-11-12 08:02:27 +03:00
AlexVinS
059698217c Use CLONE and DISPEL_HELPFUL_SPELLS Mechanics classes in immunity caculation 2014-11-12 07:41:12 +03:00
AlexVinS
61d6bca3ff Extract some spell imuunity mechanics + draft of overall design (UNTESTED) 2014-11-12 07:09:05 +03:00
AlexVinS
a49da360d2 Use ESpellCastProblem inside SpellHandler 2014-11-12 06:17:03 +03:00
AlexVinS
24efb9b413 SpellHandler: add more error checking + cleanup. 2014-11-12 03:48:11 +03:00
AlexVinS
c4fdca45d9 Small cleanup 2014-11-12 03:48:10 +03:00
AlexVinS
4e9cff3403 spelling fix 2014-11-06 15:06:16 +03:00
AlexVinS
34ffdb5981 small cleanup 2014-11-06 14:28:34 +03:00
Ilya Zhuravlev
3eb3996241 Fix android build. 2014-11-02 16:19:14 +03:00
DjWarmonger
333d740aba Post-release version bump. 2014-11-01 13:57:37 +01:00
DjWarmonger
41acc944a0 Version 0.97. Updated changelog. 2014-11-01 12:57:17 +01:00
DjWarmonger
d280b0ac9f Cleaned some logs. 2014-11-01 09:52:56 +01:00
DjWarmonger
b61b79b458 For 0.97 release: generate full underground to avoid many issues 2014-10-31 18:47:10 +01:00
DjWarmonger
dd0033b5a4 Zones will now not bounce off map edges too much, should allow more space in the middle of a map. 2014-10-31 17:55:47 +01:00
DjWarmonger
9eeea7299a - Removed unecessary includes
- Fixed town types configured from RMG templates
2014-10-31 17:09:34 +01:00
DjWarmonger
afaf74a05b Improved zone sizes for two-level maps. 2014-10-31 13:37:23 +01:00
DjWarmonger
7ac3713d32 Significantly improved zone graph placement. 2014-10-31 12:58:55 +01:00
DjWarmonger
697e42dd24 - Fixed several legacy issues with map templates
- Added Clash of Dragons 1.2 template
- Temporarily disabled exception when RMG runs out of two-way monoliths (exception was not handled anyway)
2014-10-30 21:23:25 +01:00
DjWarmonger
ce83db0f43 - Option to configure monster types spawning in a zone
- 25% chance to get neutral faction in zone with no town
2014-10-30 13:03:53 +01:00
DjWarmonger
530a3e69bf Option to allow / ban certain types of town in a template. 2014-10-30 10:00:29 +01:00
DjWarmonger
b518fd6ea6 Added graphics for GENERAL_DAMAGE_REDUCTION bonus. Files are now in vcmi mod. 2014-10-28 19:04:34 +01:00
DjWarmonger
06983fc346 Fixed issue with empty mage guild on random maps. 2014-10-26 13:09:59 +01:00
Patrick Simmons
436272f00c Fix pathfinding bug. 2014-10-25 21:15:40 -04:00
Patrick Simmons
cfa6f46d62 VERY buggy, unusable, but progress is being made... 2014-10-25 19:05:49 -04:00
Mikhail Paulyshka
0541b544c4 fix minizip build error for MSVC 2014-10-12 16:41:05 +03:00
DjWarmonger
775d6c41b4 Merge pull request #41 from vcmi/refactoring/initializers
Works under Visual, merging.
2014-10-04 08:29:21 +02:00
AlexVinS
54453aee73 get rid of boost::assign 2014-10-04 00:34:13 +04:00
AlexVinS
66b022f93e initializer lists part1 2014-10-02 19:43:46 +04:00
Ilya Pomaskin
67506144ae Fixing Mac OS building issues 2014-10-01 17:47:37 +04:00
DjWarmonger
f7882135e6 More random paths within zones. 2014-10-01 14:56:06 +02:00
DjWarmonger
c832eab172 Fixed #1909 2014-10-01 11:38:03 +02:00
DjWarmonger
e40818f2c6 Fixed incorrect treasure distance on underground maps. 2014-09-26 13:19:39 +02:00
DjWarmonger
59ab30751c - Version set to 0.96b
- Updated changelog
2014-09-26 07:40:51 +02:00
DjWarmonger
1f7ce7c1d9 Cut area around towns to prevent sealing off parts of zone. 2014-09-23 21:12:10 +02:00
DjWarmonger
df9d2f8d8f A bit smarter algorithm for cutting paths. 2014-09-23 18:32:32 +02:00
DjWarmonger
87ecd0075e Even tighter obstacles. 2014-09-23 16:53:26 +02:00
Ivan Savenko
bfd3aab78d More precise timings for logs (microsecond resolution) 2014-09-23 16:01:43 +03:00
DjWarmonger
8e1e8abe90 Default constructors for Scholar, Pandora and Event. 2014-09-23 09:46:31 +02:00
DjWarmonger
3e36d0d88b Possible tweak for underground. 2014-09-22 15:27:42 +02:00
DjWarmonger
b96ab55c4d Tighten obstacles to improve map look and feel. It should be now on pair with original maps :) 2014-09-22 14:46:52 +02:00
DjWarmonger
f3d7c658f0 Ensure distance between treasure piles. 2014-09-22 14:18:01 +02:00
DjWarmonger
0f4608ae01 Nicer treasure piles. 2014-09-22 13:36:55 +02:00
DjWarmonger
035d028d5c Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-21 22:20:30 +02:00
DjWarmonger
e3d968e284 Generate Grail to not crash at Obelisks. 2014-09-21 21:51:51 +02:00
Ivan Savenko
fc16c8d207 Merge branch 'optimization/swiftAI' into develop
Conflicts:
	lib/CGameState.cpp
2014-09-21 22:31:29 +03:00
DjWarmonger
5cb6eaa252 Fixed major RMG bug. 2014-09-21 20:57:42 +02: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
c4fc8f08c0 Moved assertions before variable is used 2014-09-21 18:25:52 +03:00
DjWarmonger
147ca72f65 Fixed RMG Prisons. 2014-09-21 15:59:35 +02:00
Ivan Savenko
380c100783 Disabled Nagle algorithm for net packs.
This should significantly reduce TCP delays. On my systems this is ~120ms for server to reply to ~15ms
Possible downside - increased load on network due to possible increase in number of packages due to disabled batching
2014-09-21 16:43:25 +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