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
Fay
8e840d2c30
Changed map surface-cache key from int to intptr_t;
2015-01-15 17:17:26 +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
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
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
ArseniyShestakov
f2aedabcb3
Fix slider remain enabled when not needed for changed label text
...
This one fix issue with map description label #1977
2014-11-24 16:18:10 +03:00
ArseniyShestakov
53c7a3cfcb
Added function CSlider::moveToMin
2014-11-24 15:24:03 +03:00
KroArtem
e73c60740c
corrected text in vcmibuilder, corrected errors and warnings from cppcheck
2014-11-16 20:48:29 +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
66b022f93e
initializer lists part1
2014-10-02 19:43:46 +04:00
DjWarmonger
01491f9f1e
Fixed #1718
2014-10-01 14:20:00 +02:00
Ivan Savenko
fc16c8d207
Merge branch 'optimization/swiftAI' into develop
...
Conflicts:
lib/CGameState.cpp
2014-09-21 22:31:29 +03: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
ca47ddca5c
Miscellaneous fixes to creature window:
...
- implemented missing stack size indicator
- fixed detection of battle presence
- fixed placement of spell icons
2014-09-19 16:31:01 +03:00
Ivan Savenko
3939c70a81
Fixed 1277 - only 2 cursor buttons will be enabled for sliders, depending on its direction (horizontal/vertical)
2014-09-18 17:08:21 +03:00
Ivan Savenko
e692f3f520
Implemnted enemy turn speed selection:
...
- implemented switch in settings screen
- implemented "0 speed", animation-free. *may* also work for player-owned heroes
- removed no longer used creature window switch
2014-08-11 19:16:39 +03:00
Ivan Savenko
8838607669
Trying to fix Travis compilation issues
2014-08-11 17:58:41 +03:00
Ivan Savenko
1e5e02c7df
Compilation fixes caused by merge, replaced some remaining boost::bind with std's
2014-08-09 15:14:31 +03:00
Ivan Savenko
b1285bc506
Merged GUI refactoring into develop, fixed conflicts
2014-08-09 15:01:55 +03:00
Ivan Savenko
77a73fbaa9
Merge branch 'feature/freegfx' into refactoring/guiClasses
...
Conflicts:
client/windows/CHeroWindow.cpp
client/windows/CQuestLog.cpp
client/windows/GUIClasses.cpp
2014-08-03 18:50:59 +03:00
Ivan Savenko
7390647cd5
End of buttons refactoring:
...
- cleanup of slider API
- documentation fixes
2014-08-03 17:31:56 +03:00
Ivan Savenko
0882201b17
Miscellaneous fixes to toggle buttons
2014-08-03 16:19:16 +03:00
Ivan Savenko
10fc1892a8
Large refactoring of button classes:
...
- renamed CAdventureMapButton to more expectable CButton
- merged CButtonBase into CButton
- created more generic class for clickable elements
- created more generic class for selectable elements
- renamed CHighlightableButton to CToggleButton
- renamed CHighlightableButtonsGrous to CToggleGroup
- minimized differences between API of all these classes
- removed all but one contructors in buttons, with same parameters across all classes
2014-08-03 14:16:19 +03:00
Ivan Savenko
731aedf3a1
Split CIntObjectClasses into multiple smaller files. This should be the last change in files
2014-07-15 10:14:49 +03:00
Ivan Savenko
a69fcdd435
Fixed compilation issues caused by merge
2014-07-14 17:44:15 +03:00
Ivan Savenko
92d22bae63
Merge branch 'feature/creatureWindow' into refactoring/guiClasses
2014-07-14 17:23:24 +03:00
Ivan Savenko
2a0a0e81a7
Cleaning up includes
2014-07-14 17:19:44 +03:00
Ivan Savenko
647b9c683f
Reorganized client source tree:
...
- client/widgets for reusable GUI elements
- client/windows for independent windows
- client/gui for base GUI classes which should remain internal
2014-07-13 20:53:37 +03:00
