AlexVinS
61e241308d
Logging cleanup
2017-08-10 19:52:05 +03:00
Fay
80f149e296
Better android input handling: sending notifications about CInputText changes to java so that we can display textinput overlay there; ( #354 )
2017-07-23 20:23:48 +03:00
Arseniy Shestakov
2da3d8a563
Code style: remove senseless comments
2017-07-18 00:04:00 +03:00
ArseniyShestakov
b2f74a93cf
Code style: add empty parameter list to all lambda expressions ( #345 )
2017-07-17 15:35:57 +03:00
ArseniyShestakov
a4c0ad94b1
Code style: remove default value hints in definitions ( #342 )
...
Some are outdated and this is something IDE are useful for.
2017-07-15 14:08:20 +03:00
Arseniy Shestakov
f1e5797834
Code style: move or add licensing information on top of every file
2017-07-14 01:26:03 +03:00
Arseniy Shestakov
dbcd79c48a
Code cleanup: remove double and unneded semicolons
2017-07-12 22:01:10 +03:00
Fay
65e88639a3
Minor: code format;
2017-06-08 21:07:09 +02:00
Fay
02fa478bfb
Refactor: unified logic for notyfing CIntObjs about left/right mouse click events;
...
Added support for middle-click;
2017-06-07 20:16:18 +02:00
AlexVinS
0190c9804e
formatting
2017-06-06 19:45:34 +03:00
AlexVinS
a31c28ec33
Unified war machine mechanics.
...
* it is possible to define new war machines
* added warMachine field to artifact configuration
2017-06-06 19:18:26 +03:00
AlexVinS
df3574b50f
Fixed https://bugs.vcmi.eu/view.php?id=2685
2017-05-27 17:07:11 +03:00
Piotr Wójcik
76acc29d6c
Correctly display visiting army in kingdom overview, fixes #1761
...
Do not modify CIntObject::pos, according to its doc
2017-05-22 22:34:05 +02:00
Piotr Wójcik
e4d3cdca09
Simplify
2017-05-13 16:57:15 +02:00
Piotr Wójcik
cc02001836
T hotkey select first town when last is active, fixes #1293
2017-05-11 20:49:17 +02:00
FeniksFire
cde8542475
Oversight.
2017-03-18 14:25:17 +01:00
FeniksFire
dd5660ff08
Simplifity code.
2017-03-18 14:21:41 +01:00
FeniksFire
d045f59a11
Little fix in braces #2 .
2017-03-18 07:58:40 +01:00
FeniksFire
68c618cb99
Little fix in highlight in CGarrisonSlot.
2017-03-17 21:24:55 +01:00
Arseniy Shestakov
d4091db172
CInfoBar: only pop up when adventure map interface is on top
2017-03-14 00:03:15 +03:00
AlexVinS
7d29365e4a
Fixed CID 1243197
2016-11-28 02:50:45 +03: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
c4ab962cc0
Fixed a few CWE-457
2016-11-27 17:48:18 +03:00
AlexVinS
f11c54b5e9
Wipe unused ClickableArea
2016-11-27 16:07:03 +03:00
AlexVinS
30663f15ea
Fixed CID 1288863
2016-11-26 22:12:52 +03:00
AlexVinS
ac8b618a42
Fixed CID 1366373
2016-11-25 19:17:37 +03:00
AlexVinS
db40e125eb
Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359
2016-11-24 21:56:30 +03:00
AlexVinS
33c0bc49f6
Merge branch 'CommanderArtifacts3' into develop
2016-11-13 15:31:16 +03:00
dydzio
b626f9a134
Fix CCommanderArtPlace localization + minor fixes
2016-11-08 17:26:24 +01: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 37f68713a74477b7c35d
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
AlexVinS
46196daa07
cleanup
2016-11-06 05:27:56 +03:00
dydzio
baeb3c9e55
Refactor CArtPlace + use it for commanders
2016-11-04 17:54:09 +01:00
Vadim Markovtsev
220e4d2030
Survive giving Commander's badge to stacks
...
Used to SEGFAULT
2016-10-30 14:27:53 +01:00
AlexVinS
365c64a345
use CAnimImage for world view legend
2016-10-27 16:34:10 +03:00
AlexVinS
ba5b65ff93
get rid of CDefHandler in CSpellWindow
2016-10-16 15:27:35 +03:00
AlexVinS
3a52a3c663
Allow CAnimImage to share animation object.
2016-10-16 12:58:18 +03:00
AlexVinS
63cbf960df
cleaned up spell window creation
2016-10-16 09:27:22 +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
abb875b400
cleanup
2016-10-16 03:52:11 +03: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
dydzio
68af6a0c19
Refactoring InfoAboutHero + GetHeroInfo
2016-09-28 13:22:33 +02:00
Arseniy Shestakov
0236309d25
CArtifactsOfHero: use shared_ptr for SCommonPart
2016-08-30 07:05:31 +03:00
AlexVinS
ef05a56e49
cleanup
2016-08-30 05:13:45 +03:00
Arseniy Shestakov
452e28d183
Remove some useless includes found by cppclean
...
This of course was tested and shouldn't break anything
2016-08-26 04:42:16 +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
Vadim Markovtsev
afa95312ba
Fix 2139 captured spell scroll descriptions
2016-01-25 08:49:26 +03:00
Vadim Markovtsev
9ffd0155e6
Fix 1810 suggest artifact assembly
2016-01-23 16:24:43 +03:00
DjWarmonger
b02bd61c83
Merge pull request #164 from vmarkovtsev/issue/1821
...
Fix 1821 artifact assembly statusbar text
2016-01-21 09:37:43 +01:00
Vadim Markovtsev
b1f3480c68
Fix 1821 artifact assembly statusbar text
2016-01-21 10:50:53 +03:00
Vadim Markovtsev
419bde8997
Fix 2358 swapped garrison <-> visiting status text
2016-01-21 09:59:39 +03:00
Vadim Markovtsev
74111b7689
Return missing building name instead of crashing in CComponent::getSubtitleInternal
2016-01-19 10:35:10 +03:00
Arseniy Shestakov
8eb4f14ff0
MoraleLuckBox: handle BLOCK_LUCK bonus. Fix issue 2130
2015-12-24 22:35:32 +03:00
Vadim Markovtsev
e4b1ef1405
Add "override" to virtual overriden methods
2015-10-13 21:05:36 +03:00
ArseniyShestakov
ffb8e6a696
Garrison: fix more issues introduced in pull #115
...
After 8cad23956c
2015-09-23 08:12:43 +03:00
AlexVinS
8cad23956c
Fix 2258
2015-09-19 17:16:09 +03:00
AlexVinS
d181d764bb
fix 2215
2015-09-15 10:02:27 +03:00
AlexVinS
8f2da66a18
fix mantiss 1967 + some refactoring
...
* remove TModDescr and realted APIs - they were only used in one place
2015-09-04 22:29:20 +03:00
Sandy Carter
a79ade7d44
Garrison: Move all but one creature when last slot
2015-08-26 08:44:23 -04:00
Sandy Carter
dafc40d896
Garrison: Fix selection behaviour when swapping with ally
2015-08-26 08:40:00 -04:00
Sandy Carter
a89ef88ce3
Garrison: Factor complex if statement to functions
2015-08-26 08:40:00 -04:00
Sandy Carter
cd13807115
Garrison: Clarify upg by turning into a class enum
2015-08-26 08:39:57 -04:00
Sandy Carter
b008d24c68
Garrison: Refactor Left Click
...
Restructure large nested if statements into more shallow blocks
Factor out contents of if statements to functions for better readability
* viewInfo
* hightlightOrDropArtifact
* split
2015-08-25 09:47:23 -04:00
Sandy Carter
3d327e650a
Garrison: Boyscouting: simplify clickLeft
2015-08-25 09:47:23 -04:00
Sandy Carter
c02700853a
Garrison: Disable split buttons when visiting ally
2015-08-25 09:47:23 -04:00
Sandy Carter
742f244426
Garisson: Documentation: Convert comments to doc
2015-08-25 09:47:23 -04:00
Sandy Carter
6ffb03cba3
Garrison: Documentation for our() and ally()
2015-08-25 09:47:21 -04:00
Sandy Carter
b2da2b8ef0
Garrison: Show "(in garisson)" for garissoned heroes' creatures
2015-08-25 09:22:25 -04:00
Sandy Carter
236492ed39
widgets: Cleanup musicButton specific hacks
2015-08-22 12:40:14 -04:00
Sandy Carter
9d62a2f0a1
Buttons: Add CVolumeSlider widget
...
New widget specifically for volume settings.
Replace previous implementation using 10 toggle buttons.
Enable indicator animation
Fix indicator ghosting when drag and releasing
Add scroll capability to volume
Volume now can be adjusted from 0 - 99 with the mouse or the scroll wheel
2015-08-22 12:40:14 -04:00
Sandy Carter
c6b51a7beb
Boyscouting: Fix doxygen format
...
Remove commas to separate param from description
Use three slashes-style
2015-08-22 12:40:14 -04:00
Sandy Carter
f28c33001c
Boyscouting: Fix typo in comment
2015-08-22 12:40:14 -04:00
Sandy Carter
a14711b3b4
Boyscouting: Fix backwards ternary operator
2015-08-22 12:40:14 -04: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
ArseniyShestakov
448fbe44e9
Improve CButton::block and fix CToggleGroup->selectedID
...
CToggleGroup. Originally when I added initialization for selectedID I didn't find out that -1 is used for "random" buttons. So as result I fixed uninitialized variable usage, but break initial button state change in RMG options because setSelected ignore state change request because it's see -1 button already marked as selected.
2015-03-16 15:55:36 +03:00
ArseniyShestakov
120301ecc8
Split army: dont highlight down garrison slots if there no visiting hero
...
Before UI always highlighted all slots in both town garrisons even if there no visiting here and you can't actually set army on these slots.
Now garrison slots only highlighted if they're owned by us or our ally. If there no visiting hero in town then only suitable upper garrison slots will be highlighted.
2015-03-16 02:04:18 +03:00
ArseniyShestakov
67aa869a33
Multiplayer: make chat history visible in lobby and improve CTextBox
...
Now we'll also play sound when new message added.
CTextBox::setText now will automatically change text height for slider.
2015-03-13 18:45:07 +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
c4cbda88ac
Fix "reorder" warnings
2015-02-21 12:39:10 +03:00
DjWarmonger
6ac00873b9
Compilation fixes - allow SDL1.
...
Please do not define class-specific constants that are static at same time.
2015-02-18 15:31:55 +01:00
DjWarmonger
200bcd7da6
Merge pull request #88 from ArseniyShestakov/improvedQuestLog
...
Awesome, thanks!
2015-02-17 06:44:38 +01:00
ArseniyShestakov
007f95fa44
Fix valgrind warning about uninitialised value
2015-02-16 13:28:10 +03:00
AlexVinS
420e5f055c
Fix warnings
2015-02-14 19:24:21 +03:00
AlexVinS
0b546a9b9f
Correct placement for hero misc artifacts in kingdom overview
2015-02-14 18:59:33 +03:00
AlexVinS
c135591f81
Add comments about getArtPlace - it is a bit dangerouse
2015-02-14 16:00:57 +03:00
AlexVinS
7086fdc730
Crash fixed, but bug still present
2015-02-14 16:00:56 +03:00
AlexVinS
a6c8dcbc36
Cleanup
2015-02-14 16:00:56 +03:00
ArseniyShestakov
ded4c18df9
CComponent: add option to choose image size
...
This option is used to choose small resource icons in Quest Log when there more than 4 of them.
2015-02-14 00:53:24 +03:00
DjWarmonger
1d34d15983
Compilation fixes.
2015-02-01 19:25:42 +01:00
AlexVinS
594295da32
Merge branch 'feature/worldView' into develop
2015-02-01 20:49:14 +03: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
72f34a7799
Fixes crash on dropping an artifact on an empty garrison slot;
2015-01-24 00:21:18 +01: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
