FeniksFire
3de891b4b4
Moving/dividing classes from BattleState to separate files.
2017-03-17 16:48:44 +01:00
dydzio
8a2b47d967
Fix for bug #2435
2017-02-10 12:19:35 +01:00
dydzio
81a00f59d1
Basic fix for bug #2635
2017-02-02 19:17:15 +01:00
Dydzio
79c101a56d
Remove leftover commander artifact code
2016-12-31 21:29:47 +01:00
AlexVinS
2dd6a47764
try to plug a few coverity false positives
2016-11-28 02:50:41 +03:00
AlexVinS
312793efd9
try to plug a few coverity false positives
2016-11-27 23:41:17 +03:00
AlexVinS
6196ae7fca
Fixed a few CWE-457
2016-11-27 19:00:16 +03:00
AlexVinS
27b853618c
Fixed a few CWE-457
2016-11-27 18:17:20 +03:00
AlexVinS
86e33a4c45
[Refactoring] Unified SetResources NetPack API.
2016-11-26 15:14:43 +03:00
AlexVinS
86c7bab9c1
Fixed CID 1366324
2016-11-25 22:28:16 +03:00
AlexVinS
80666fb134
Tweaks
2016-11-25 22:12:22 +03:00
AlexVinS
f0963c91bb
Fixed CID 1197409
2016-11-25 21:59:27 +03:00
AlexVinS
8b6543bef2
Fixed CID 1366365, CID 1288839
2016-11-25 19:58:52 +03:00
AlexVinS
6a616a5d33
Fixed CID 1366371
2016-11-25 19:36:40 +03:00
AlexVinS
663099882c
Fixed CID 1366366, CID 1366367, CID 1366368, CID 1366369, CID 1366370, CID 1366372
2016-11-25 19:28:00 +03:00
AlexVinS
5dd5a0d4a8
Fixed CID 1197445, CID 1197446
2016-11-25 17:54:01 +03:00
AlexVinS
b908c70468
Fixed CID 1197487
2016-11-25 17:29:49 +03:00
AlexVinS
04d22644e5
fixed http://bugs.vcmi.eu/view.php?id=2617
2016-11-23 14:47:57 +03:00
AlexVinS
33c0bc49f6
Merge branch 'CommanderArtifacts3' into develop
2016-11-13 15:31:16 +03:00
AlexVinS
a8a661b159
Map handler refactoring, part 2.
2016-11-08 00:19:53 +03:00
AlexVinS
aad675a7c4
Revert "Merge branch 'p254_4' into develop"
...
This reverts commit 37f68713a7
, reversing
changes made to 4477b7c35d
.
2016-11-08 00:17:20 +03:00
AlexVinS
c9a3d92ff3
cleanup
2016-11-06 17:36:46 +03:00
dydzio
96fa0fb6d4
Implement giving commander artifacts back to hero
2016-11-06 13:02:00 +01:00
dydzio
baeb3c9e55
Refactor CArtPlace + use it for commanders
2016-11-04 17:54:09 +01:00
dydzio
47a72d4441
Make artifacts worn by commander visible
2016-11-03 14:25:17 +01:00
Vadim Markovtsev
8d40a4aa95
Fix GUI disposal in creature info window
2016-10-30 22:21:26 +01:00
Vadim Markovtsev
34005228e0
Fix bugs with giving commander's badge to stacks
...
1. SEGFAULT
2. Memory leaks
3. Invalid drawing
4. Fix returning artifacts
2016-10-30 16:32:28 +01:00
AlexVinS
3dddbcf2e8
try to use CAnimation for Hero path
2016-10-27 16:34:15 +03:00
AlexVinS
536f36ede8
use CAnimation fro world view icons
2016-10-27 16:34:12 +03:00
AlexVinS
365c64a345
use CAnimImage for world view legend
2016-10-27 16:34:10 +03:00
AlexVinS
36ac9ac86c
CAdvMapInt tweak
2016-10-27 16:34:07 +03:00
Vadim Markovtsev
d51c9a1ff0
Fix uninitialized scrolling state
2016-10-22 10:18:57 +02:00
AlexVinS
28dd12089b
CSpellWindow fixes.
2016-10-18 02:15:43 +03:00
ArseniyShestakov
eec14028fe
Merge pull request #242 from dydzio0614/MapScrollCursor
...
Implement adventure map scroll cursor change
2016-10-17 16:09:01 +03:00
dydzio
22564dde4b
Implement adventure map scroll cursor change
2016-10-17 14:55:55 +02:00
AlexVinS
5346ecb6df
tweak
2016-10-17 05:42:29 +03:00
AlexVinS
3bd8cde8e0
fix
2016-10-17 05:21:43 +03:00
AlexVinS
345dd913f6
use CLabel in SpellArea
2016-10-17 05:05:48 +03:00
AlexVinS
e3ee51a28f
Use label object for mana
2016-10-17 04:05:33 +03:00
AlexVinS
bc2f0ba6f1
fixed spell school ordering http://bugs.vcmi.eu/view.php?id=91
2016-10-17 03:33:29 +03:00
AlexVinS
ba5b65ff93
get rid of CDefHandler in CSpellWindow
2016-10-16 15:27:35 +03:00
AlexVinS
2a6bab119b
Use CAnimImage for SpellArea
2016-10-16 13:22:07 +03:00
AlexVinS
3a52a3c663
Allow CAnimImage to share animation object.
2016-10-16 12:58:18 +03:00
AlexVinS
a0300b0447
CSpellWindow widgets capturing
2016-10-16 12:01:18 +03:00
AlexVinS
e1f9b2c74a
SpellArea tweak
2016-10-16 10:43:49 +03:00
AlexVinS
2eb61533fa
use only CSpell in CSpellWindow
2016-10-16 10:32:12 +03:00
AlexVinS
63cbf960df
cleaned up spell window creation
2016-10-16 09:27:22 +03:00
AlexVinS
415bd8247a
Moved SpellbookInteractiveArea into CSpellWindow class
2016-10-16 09:17:23 +03:00
AlexVinS
c4b72342de
CSpellWindow: improved constructor readability
2016-10-16 09:03:13 +03:00
AlexVinS
5506ae036a
Reworked CHillFortWindow
...
* fixed displaying free upgrades
* do not try to print 3rd or more resource in slot cost (in theory possible with mods)
** we need dynamic gui for that
* CDefEssential--
2016-10-16 08:03:52 +03:00
AlexVinS
055c84bc7a
cleanup
2016-10-16 04:23:38 +03:00
AlexVinS
abb875b400
cleanup
2016-10-16 03:52:11 +03:00
AlexVinS
41a5cc1b69
get rid of CCastleInterface::bicons
2016-10-16 03:00:57 +03:00
Vadim Markovtsev
34cf92cb9b
Change logging style
2016-10-03 20:32:01 +02:00
Vadim Markovtsev
d5327f3daf
Fix loading "" bitmap at game start
2016-10-02 22:45:00 +02:00
AlexVinS
85863dbed6
Fix build
2016-10-02 17:25:55 +03:00
Piotr Wójcik
ea6545b1d3
Prevent flipping empty spellbook
...
When hero has no travel spells he can no longer flip spell book opened from right panel button
2016-10-01 21:39:40 +02:00
AlexVinS
7c91d378c8
Display specific message if cast blocked by CURSED_GROUND
2016-10-01 18:35:56 +03:00
AlexVinS
52ae5b4a86
Fixed http://bugs.vcmi.eu/view.php?id=482
2016-10-01 18:18:46 +03:00
AlexVinS
96c17505ae
get rid of IBonusBearer::getSpellBonuses & Selector::anyRange
2016-10-01 09:07:18 +03:00
dydzio
33ea28c5dd
Improve creature upgrade handling. Fix issue #2172
2016-09-30 21:21:41 +02:00
Vadim Markovtsev
2c1dddde33
Fix memory problems with BonusList
...
Bonus * -> std::shared_ptr<Bonus>
This cures the following problems:
1) Memory corruption at exit. Some Bonus-es were deleted twice (mods?).
2) Memory leaks. Some Bonuses were not deleted.
3) Reduce the number of "Orphaned child" messages.
Valgrind reports 0 leaked memory now and no invalid reads/writes.
2016-09-29 15:08:00 +02:00
AlexVinS
921d2f6210
Fixed http://bugs.vcmi.eu/view.php?id=2522
2016-09-29 10:21:22 +03:00
Vadim Markovtsev
31e5f7b800
Fix morale widget update after dismissing a creature in garrison
2016-09-19 18:59:34 +02:00
Arseniy Shestakov
f623865991
CCastleBuildings: add dialog for shipyard when there is boat already
2016-09-14 03:32:03 +03:00
Arseniy Shestakov
02f70464fb
Fix mismatched-tags Clang warnings
...
They're not important at all, but sicne there only few of them left just fix them.
2016-09-08 19:42:59 +03:00
Piotr Wójcik
044e2b9e51
Properly calculate building requirements
...
In OH3 you can't build Capitol when Tavern is not builded.
In VCMI up to now you could.
2016-08-30 22:15:24 +02:00
Arseniy Shestakov
0236309d25
CArtifactsOfHero: use shared_ptr for SCommonPart
2016-08-30 07:05:31 +03:00
AlexVinS
b8f4fdc2f2
fixed memory leak in CTradeWindow::initItems
2016-08-30 05:55:51 +03:00
AlexVinS
e4091c05ec
fixed unitialized value field
2016-08-17 09:49:43 +03:00
Arseniy Shestakov
10dbbead2d
Fix indentation of logging code and around it
...
That wouldn't be as big issue if problem affected few files, but it everywhere in codebase.
Fixed it everywhere since in most files that is the only code with wrong indentation.
2016-03-12 04:46:21 +03:00
Arseniy Shestakov
faae305ec0
CTradeWindow: avoid crash when right click on artifact
...
Fix suggested by @argarak in PR #199
2016-03-12 03:19:38 +03:00
AlexVinS
3873e5047e
Attempt to fix 2293
2016-03-01 13:24:46 +03:00
Vadim Markovtsev
bdd87be10d
Try to fix http://bugs.vcmi.eu/view.php?id=2362
2016-02-02 11:46:33 +03:00
Vadim Markovtsev
32ece9513d
Fix 2331 save menu keyboard event leak
...
The control flows the following way:
- we receive SDL_KEYDOWN with letter 's' in the adventure map interface
- save dialog opens
- text input receives focus
- text input enables receiving SDL_KeyboardEvent-s which go between DOWN and UP
- the button on keyboard becomes UP (the menu opens very fast)
- text input receives SDL_KeyboardEvent and inserts 's'
- text input receives SDL_KEYUP
So the apparent fix is to open the save dialog on SDL_KEYUP event
2016-01-28 10:26:40 +03:00
Vadim Markovtsev
9f3313524e
Fix 2160 dismissing a VIP hero
2016-01-27 17:10:19 +03:00
Vadim Markovtsev
afa95312ba
Fix 2139 captured spell scroll descriptions
2016-01-25 08:49:26 +03:00
Arseniy Shestakov
cacc811ed8
CAdvMapInt: keep old path if non-accessible tile clicked. Fix issue 2380
2016-01-17 07:48:21 +03:00
Arseniy Shestakov
530fe04c75
CAdvMapInt::updateMoveHero: proper indeterminate check. Fix issue 2074
2016-01-15 19:30:43 +03:00
Arseniy Shestakov
a39e61373c
Deactivate CAdvMapInt while quick combat is going. Fix issue 2354
...
If quick combat calculation take a while it's possible to give hero movement command before battle is finished. This will lead to client freeze or crash. To avoid this we must lock adventure interface until battle calculation is finished.
2016-01-10 18:00:24 +03:00
Arseniy Shestakov
46e3d849af
Avoid crashes caused by mouse events. Fix issue 1955
...
Mouse handling code need refactoring, but for now we at least shouldn't crash.
2016-01-09 15:32:42 +03:00
Arseniy Shestakov
9fd1cff090
Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
...
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.
This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
Arseniy Shestakov
29a7934a99
Refactoring: avoid using namespace when it's not absolutely needed
2015-12-29 02:14:08 +03:00
Arseniy Shestakov
6f5c52a229
Refactoring: use cleaner CCreatureSet::stacksCount everywhere
2015-12-24 21:30:57 +03:00
Ivan Savenko
a051a08a46
Merge remote-tracking branch 'origin/issue/2306' into develop
2015-12-18 22:21:11 +02:00
ArseniyShestakov
ab92123da3
CPathfinder: improve support for visits and battles in teleports
...
Related movement code for client and AI is plumbed as well. Though at moment code still not finished because it's not teleport hero to the exit tile if he won battle.
2015-12-11 09:42:30 +03:00
ArseniyShestakov
07807fb044
Client: slience visibility error on shipyard in non-coastal town
2015-12-08 07:33:13 +03:00
ArseniyShestakov
03e9dd3bab
Add hero gold cost to GameConstants
2015-12-07 00:13:58 +03:00
ArseniyShestakov
807fd6391b
CAdvMapInt: block spellbook button when no hero selected
2015-12-06 03:12:39 +03:00
AlexVinS
0fab319c73
Merge remote-tracking branch 'remotes/origin/develop' into issue/2306
...
s reverts commit fa8a282696
.
Conflicts:
AI/VCAI/VCAI.cpp
Conflicts:
AI/VCAI/VCAI.cpp
client/windows/CAdvmapInterface.cpp
lib/CPathfinder.cpp
lib/CPathfinder.h
2015-12-05 12:56:12 +03:00
ArseniyShestakov
c83f15e413
Merge branch 'develop' into feature/tavernRumors
...
Conflicts:
lib/CGameState.h
2015-12-05 01:01:26 +03:00
ArseniyShestakov
2a63ba148a
Thieves Guild: fix tavern map object, lvl 0 when no taverns owned
...
We also now check not number of towns, but only towns that has tavern built. Also according to original mechanics all taverns always display information based on your number of taverns and not number of taverns of object owner.
2015-12-04 18:38:57 +03:00
Ivan Savenko
c3ce4b25df
Removed all #include's of CMap.h from headers.
...
To all - please, avoid #include's in headers as much as possible
This kills incremental build compile times
2015-12-02 21:05:10 +02:00
ArseniyShestakov
6704ea0cff
Rumors: rename getTavernGossip to getTavernRumor for consistency
...
Original game used "Rumors" and not "Gossips" and we already using rumor in CMap.
2015-11-30 17:51:28 +03:00
ArseniyShestakov
def0f0ef0a
CTerrainRect::mouseMoved: don't pass curHoveredTile by reference
...
This does cause problems because curHoveredTile can change while reference still being used by CAdvMapInt::tileHovered.
2015-11-18 03:14:58 +03:00
ArseniyShestakov
ab9680a7d9
CPathfinder: handle event object properly everywhere
...
Also add forgoted check for AdvmapInterface to avoid possible crash.
2015-11-17 07:09:01 +03:00
ArseniyShestakov
5106738160
Merge branch 'develop' into feature/pathfinderLayers
2015-11-09 19:20:13 +03:00
ArseniyShestakov
a49950e958
Fix 2292. Fix chat on adventure map, increase maxOutputPerLine
2015-11-08 22:16:58 +03:00
ArseniyShestakov
4973a1ec90
CGPathNode: get rid of land member as it's now obsolete
...
CTerrainRect::showPath behaviour changed so it's will only add cross path graphics on embark/disembark and path ending.
We want continuous paths for flying and water walking even when land<-> water transition occur.
2015-11-08 04:01:58 +03:00
ArseniyShestakov
842da69a3e
CAdvMapInt::tileHovered cleanup function a bit more
2015-11-08 03:33:01 +03:00
ArseniyShestakov
160fa38254
Client: change cursor using node action information of pathfinder
2015-11-08 03:10:48 +03:00
ArseniyShestakov
2b6e1498d2
Pathfinding: change argument order for getPath and AUTO layer as default
...
This still need investigation, but likely most of external code shouldn't be aware of layers in order to work properly because only LAND and SAIL can be targeted and single tile can't have both of these layers.
2015-11-02 11:14:32 +03:00
Vadim Markovtsev
e6e975e9ef
Fix adventure map movement segfault in some scenarios
2015-10-31 20:23:13 +03:00
ArseniyShestakov
c3c31e90ff
Castle gate: only allow teleport to own Inferno towns
...
This is how that works in H3. And on server side it's checked already anyway.
Though it's must be possible to teleport from ally Inferno to your own if both have Castle Gate.
2015-10-15 05:28:28 +03:00
Vadim Markovtsev
e4b1ef1405
Add "override" to virtual overriden methods
2015-10-13 21:05:36 +03:00
AlexVinS
1510f1f14c
CQuestLog: boost::bind->std::bind
2015-09-02 20:00:56 +03:00
Sandy Carter
219ce45866
CastleInterface: Fix tooltip saying Empty after swapping armies
2015-08-25 09:22:25 -04:00
AlexVinS
68e3948242
Fix mantiss 1965
2015-08-25 12:16:47 +03:00
Sandy Carter
ae6d3c9138
CCastleInterface: Enable right click on Hero Info
2015-08-24 13:31:03 -04:00
Sandy Carter
bf353a4f5b
windows: Replace CToggleGroup volume widget with CVolumeSlider
2015-08-22 12:40:14 -04:00
Sandy Carter
bdee647525
CastleInterface: Exclude previous building upgrade in reqs
...
Hide CityHall from Capitol prerequisites in Capitol build window
2015-08-19 12:05:43 -04:00
AlexVinS
a8c45df732
Merge branch 'SDL1Wipe' into develop
2015-06-22 14:24:00 +03:00
AlexVinS
f81116e04d
Fix mantiss #2208
2015-06-21 20:30:19 +03:00
AlexVinS
ed281a3cc6
SDL1 wipe, part 4. Codebase cleanup finished. Untested.
2015-06-21 01:59:32 +03:00
AlexVinS
b6a2323e01
SDL1 wipe, part 2. Untested.
2015-06-21 01:59:31 +03:00
AlexVinS
dca1e28bc1
SDL1 wipe, part 1. Untested.
2015-06-21 01:59:30 +03:00
AlexVinS
2cb6cb7baa
Remove useless durationType selector
...
* duration is a mask, equality comparison is not enough
2015-06-02 07:12:02 +03:00
AlexVinS
3c9e4916b6
Fix printing stack stats in battle
2015-04-11 14:05:00 +03:00
AlexVinS
a061e3c2f7
Fix use-after-free in spell window
2015-04-11 10:18:40 +03:00
AlexVinS
6c334174d9
Use and check movement points in town portal.
...
* fixes mantiss 0002031
2015-04-01 04:48:50 +03:00
AlexVinS
d564520f04
Allow town portal to ally town.
...
fixes mantiss 0002064
2015-04-01 04:04:02 +03:00
ArseniyShestakov
4f3eb919e5
CHeroWindow: block dismiss button if there no other heroes and no towns
...
This one resolve mantis issue 530.
2015-03-12 23:47:46 +03:00
AlexVinS
f4c683cd5e
Move VievXXX logic to server side (except expert ViewEarth)
2015-02-26 17:15:17 +03:00
AlexVinS
b846b717a1
implemented VISIONS spell (partially)
...
(-) todo: agressivnes
2015-02-26 08:39:56 +03:00
AlexVinS
36cdb2968b
Refactoring
2015-02-26 08:39:54 +03:00
AlexVinS
f6e83685e7
Initial implementation of VIEW_AIR & VIEW_EARTH
2015-02-26 08:39:52 +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
c7c235c0ca
Rename afterCast to applyBattle
...
* afterXXX will be used in future event-driven mechanics
2015-02-26 08:39:47 +03:00
AlexVinS
66ca4bc0c2
TOWN_PORTAL callback is too specific to ba part on spellwindow class
2015-02-26 08:39:46 +03:00
AlexVinS
33f22bf2fc
More flixible way of spell cast on client side
...
(+) more support for custom adventure spells
2015-02-26 08:39:45 +03:00
AlexVinS
a3f2667376
Remove some deprecated fields from CSpell
...
* now only new SpellScholl API is used
(!) untested
2015-02-26 08:39:43 +03:00
ArseniyShestakov
00de870f17
Check input destination position when moving using arrow keys
...
This one fix crash I reported in 2085
2015-02-22 10:05:24 +03:00
ArseniyShestakov
a6ce45e867
Cursor: show battle cursor for garrison if there creature behind
...
This one fixed issue 1563
2015-02-22 09:34:02 +03:00
AlexVinS
c4cbda88ac
Fix "reorder" warnings
2015-02-21 12:39:10 +03: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
5d1fbedf85
Merge pull request #91 from Fayth/fix-advmap-restoring
...
Short and clear code is always welcome.
2015-02-18 07:59:00 +01:00
ArseniyShestakov
536015f1c2
Quest Log: move slider to start when blocked
...
Partially fixes problem mentioned in issue 2093
2015-02-18 00:07:03 +03:00
DjWarmonger
200bcd7da6
Merge pull request #88 from ArseniyShestakov/improvedQuestLog
...
Awesome, thanks!
2015-02-17 06:44:38 +01:00
ArseniyShestakov
c0b78de6b4
Quest Log: block hide complete button when it useless
...
We only want to to be checkable when there is actually any complete quests in list.
2015-02-17 06:08:35 +03:00
ArseniyShestakov
ae20499854
Quest Log: implement option to hide complete quests
2015-02-17 05:47:49 +03:00
Fay
116e1d62a1
Makes player interface recreate advmap instead of reusing existing instance;
2015-02-16 21:45:16 +01:00
ArseniyShestakov
c865055803
Hero Exchange: fix quest log button
2015-02-16 01:33:05 +03:00
ArseniyShestakov
df2894b798
Quest Log: implement support Seer names
2015-02-16 00:44:48 +03:00
ArseniyShestakov
9665c50f3f
Quest Log: clanup code that is not needed anymore
...
As far as I understand once object capturing used it's no longer needed to manually call Show.
Currently CIntObject::show and CIntObject::showAll automatically call it for all children.
2015-02-14 21:35:11 +03:00
ArseniyShestakov
8beed60815
Quest Log: cleanup minimap code
...
Usage of shared_ptr suggested by @alexwins
2015-02-14 21:31:56 +03:00
ArseniyShestakov
5a5c126f0e
Quest Log: fix background resource name
...
Currently it's not PCX, but PNG
2015-02-14 20:39:53 +03:00
AlexVinS
a5ebcd0f60
fix #2080 . No more articaft exchange between heroes in kingdom overview.
2015-02-14 20:24:18 +03:00
AlexVinS
0b546a9b9f
Correct placement for hero misc artifacts in kingdom overview
2015-02-14 18:59:33 +03:00
ArseniyShestakov
d06bba422a
Quest Log: display components under quest description
...
This commit add CComponentBox under text. If quest have components description height will be changed to avoid conflicts.
Though it's would be much better if VCMI had something like QScrollArea in Qt so both text and components was using shared slider.
2015-02-14 04:21:31 +03:00
ArseniyShestakov
c978bc862d
Quest Log: fix position of selection box on labels
2015-02-14 03:47:31 +03:00
ArseniyShestakov
c046f8ddc6
Quest Log: update code for new graphics and fix bugs
...
This one should fix issues 1988 and 2022
2015-02-14 03:38:28 +03:00
ArseniyShestakov
8648081f0a
Quest Log: change minimap level when quest selected
...
There also no need in own setLevel as one from CMinimap works fine.
2015-02-14 02:13:17 +03:00
ArseniyShestakov
fd99f0b9f3
Quest Log: decrease number of displayed quests
...
New graphics only have 6 slots
2015-02-14 01:34:53 +03:00
ArseniyShestakov
0704e38697
Fix Quest Log button in hero window
2015-02-14 01:10:32 +03:00
ArseniyShestakov
dae03fdf92
Blick Quest Log button if map have no quests
2015-02-14 00:52:00 +03:00
Fay
f30cb0fa5b
Fixes crash when loading game (if path was visible previously);
2015-02-13 11:20:13 +01:00
Fay
cbb75d1c7a
Support for fading heroes/boats (+flags);
...
Disabled map movement requests during fade;
2015-02-09 16:03:24 +01:00
Fay
3c3fb0e21d
Added advmap config options to enable/disable fading;
2015-02-02 19:38:30 +01:00
Fay
5a7a208617
Minor fixes (possible surface leak);
2015-02-02 17:42:42 +01:00
Fay
4c636c15e9
Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading
2015-02-01 19:12:03 +01:00
AlexVinS
594295da32
Merge branch 'feature/worldView' into develop
2015-02-01 20:49:14 +03:00
Fay
447c4603a2
Fade-in fixes;
...
Added more map object fading cases (teleports/(dis)embarking)
2015-01-31 18:36:57 +01:00
Fay
e56488d700
Fixed gems redrawing after world view scale change;
...
Fixed hotkeys to start world view mode;
2015-01-31 10:57:13 +01:00
Fay
5e78a3147a
Abstracted fading into separate class;
...
Smoother fade animations;
Added fading when recentering hero after switching levels;
2015-01-30 23:37:28 +01:00
Fay
df419e23c0
Fixed recoloring filler background to correct player color after game reload;
2015-01-29 20:34:53 +01:00
Fay
794c03792a
Added empty background below world view panel for better compat with higher resolutions;
2015-01-29 18:39:46 +01:00
Fay
8adc209366
Fixed setting adventure map underground button state after game load;
2015-01-19 21:48:52 +01:00
Fay
beaf1a62c5
Added puzzle view button to world view gui;
2015-01-19 20:46:03 +01:00
Fay
01029779d7
World view mode drawing: refactoring, part 2 (further merging of common functionalities; abstracted puzzle view to separate blitter);
2015-01-19 20:08:19 +01:00
Fay
97d89d1d6c
World view mode drawing: refactoring, part 1 (merged main drawing method);
2015-01-18 18:53:40 +01:00
Fay
103f2ed627
(auto whitespace fix)
2015-01-18 18:23:23 +01:00
AlexVinS
a90d603c16
fix modded spell effect not showing
2015-01-18 19:38:35 +03:00
Fay
e3dc37fece
Fixed hotkeys in world view mode (added missing hotkeys + disabled non-world-view hotkeys);
...
Fixed minimap radar calculation for world view mode;
2015-01-17 13:41:59 +01:00
Fay
447119e2f5
Changed zoom factors to resemble OH3 as closely as possible;
...
Minor refactoring;
2015-01-17 11:56:12 +01:00
Fay
3823631a57
Fixed recoloring world view panel info icons after current player change;
...
Refactored ui objects handling in CAdvMapInt to slightly reduce clutter;
Minor other improvements;
2015-01-15 00:22:20 +01:00
Fay
4b248c2762
World view impl -- initial;
2015-01-13 20:57:41 +01:00
ArseniyShestakov
af8b030810
Fix skills learning in Universities
...
This one fixes 1945 and 1991
2015-01-07 18:33:09 +03:00
ArseniyShestakov
3466457d69
Fix crash on opening of Hill Fort window and attempt to upgrade one stack
...
This one fixes issue 1899
2015-01-07 13:10:48 +03:00
ArseniyShestakov
ceb5da44d1
This fixes crash in battle I introduced in 8a697f2
...
dismissInfo do not present when createButtonPanel used inside the battle.
2014-12-27 06:29:09 +03:00
DjWarmonger
9962623220
Merge pull request #72 from ArseniyShestakov/fixTradeWindow
...
Small fixes for CTradeWindow
2014-12-26 09:57:40 +01:00
ArseniyShestakov
6ab807f694
Put artifact in different slot if selected is used
...
This one fixes issue 2002.
2014-12-26 01:42:50 +03:00
ArseniyShestakov
27705e1ac6
Fix removal of fully sacrificed stacks from heroes garrison slots
...
This one fixes issue 2010. Though CAltarWindow need proper refactoring.
2014-12-26 01:18:58 +03:00
ArseniyShestakov
aca0eeed86
Fix position of selected unit count in Freelancer's Guild
...
This one fixes issue 2009
2014-12-25 22:03:19 +03:00
ArseniyShestakov
f71cfdf173
Check if slot locked before pick on Artifact Merchants
...
This one is fixes issue 2007
2014-12-25 19:24:28 +03:00
ArseniyShestakov
54437a3b19
Fix check of locked artifacts for Altar of Sacrifice
...
This one is explained in issue 2001
2014-12-25 06:27:39 +03:00
ArseniyShestakov
046a6fc45a
Visible blocked button for good and evil heroes on Altar of Sacrifice
...
This is expected behaviour as explained in issue 558
2014-12-25 06:20:40 +03:00
ArseniyShestakov
3371cd36c9
Fix check of 22 artifacts limit on Altar of Sacrifice
...
Partially fix for issue 558
2014-12-25 06:17:26 +03: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
ArseniyShestakov
edccd60564
Tiny improvement for resources selection boxes
...
This one is related to issue 562
2014-12-24 03:22:48 +03:00
ArseniyShestakov
36e05402d8
Fix text label and location on sell articacts windows
...
This one fixes issue 1998
2014-12-24 03:21:28 +03:00
ArseniyShestakov
150c8425f5
Fix town income on View Towns screen
...
This is fix issue 1996
2014-12-24 00:39:48 +03:00
ArseniyShestakov
94d0e5486a
CSplitWindow: added input check
...
This one fixes issue 1952
2014-12-23 07:38:58 +03:00
ArseniyShestakov
8a697f2ba3
Fix disabling of dismiss button for last troop
...
Fix issue 1994
2014-12-23 07:12:42 +03:00
ArseniyShestakov
79cdabe3aa
CCreatureWindow: correct caption for "Ok" button
...
This one is fixes issue 1396
2014-12-23 07:10:33 +03:00
AlexVinS
85a4b725f5
[Creature window] 2-line bonus description
2014-11-24 12:44:45 +03:00
AlexVinS
885b495cf4
[Creature window] Fix creature art dismount possibility
2014-11-15 21:54:45 +03:00
AlexVinS
c43b218d64
Fix duplicate MR bonus display
2014-11-15 20:39:21 +03:00
AlexVinS
68d1105233
Fix creature window not showing bonus description
2014-11-15 20:22:50 +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