games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
5,732 Commits 19 Branches 62 Tags 112 MiB
150fcc9422
Commit Graph

2239 Commits

Author SHA1 Message Date
ArseniyShestakov
078bf6c69c CSelectionScreen: always use isHost and isGuest when suitable 2015-03-15 19:33:58 +03:00
ArseniyShestakov
c4000f2ac7 Multiplayer: always display flags in lobby, but block them for guest 2015-03-15 19:24:03 +03:00
ArseniyShestakov
eeff8f3ea4 Multiplayer: add sync for RMG options in lobby 
Sadly I'm not yet find proper way to block all buttons in CToggleGroup without make them invisible so it's still possible to press buttons for guest. Though CRandomMapTab::updateMapInfo is now disabled for guest so even if guest going to press multiple buttons it's not going to cause crash for him.
 2015-03-13 23:33:46 +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
ArseniyShestakov
1f1f61cf15 Custom campaigns list: redraw parent as we use it's background 
This one fix issue 2057
 2015-03-13 18:06:19 +03:00
ArseniyShestakov
f8747a1f16 Multiplayer: don't add newly joined players to CPU-only slots 2015-03-13 15:05:12 +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
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
DjWarmonger
f7f3c2f21a Migrated to SDL2. It also fixes animation speed in combat. 
Library package coming soon.
 2015-03-10 08:57:45 +01:00
ArseniyShestakov
5233b60243 CPlayerInterface: all new code for automatic teleport usage 2015-03-08 17:17:24 +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
f4c683cd5e Move VievXXX logic to server side (except expert ViewEarth) 2015-02-26 17:15:17 +03:00
AlexVinS
025a00362b Simplify CBattleInterface::spellCast 2015-02-26 08:39:58 +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
Fay
9034a9d873 Fixed crashes due to invalid ptrs during advmap objects fadeout; 2015-02-20 23:19:16 +01: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
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
007f95fa44 Fix valgrind warning about uninitialised value 2015-02-16 13:28:10 +03: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
37a5930f84 CSoundHandler: fix memory leak and implement cache 
This one fix issue 2091 and add caching that actually works.
 2015-02-15 22:51:33 +03:00
AlexVinS
c46999bcb8 Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect 2015-02-15 04:53:01 +03:00
AlexVinS
b71d985d49 cleanup 2015-02-15 01:46:47 +03:00
AlexVinS
aa5e9fc959 get rid of global debug macros. 2015-02-14 22:43:16 +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
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
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
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
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
1c6a7a923d Fixes color-keying after scaling bitmaps for world view display; 2015-02-09 20:16:42 +01:00
DjWarmonger
71bcacaa60 Partial fix for #2053 2015-02-09 16:23:29 +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
Fay
cbb75d1c7a Support for fading heroes/boats (+flags); 
Disabled map movement requests during fade;
 2015-02-09 16:03:24 +01:00
Fay
485a8b5c9a Fixed updating camera position after teleportation (gate/teleport/spells); 2015-02-06 19:11:04 +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
DjWarmonger
1d34d15983 Compilation fixes. 2015-02-01 19:25: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
b59189ae6f Minor fix to resolve clipping rect issue from previous commit; 2015-01-31 19:05:25 +01:00
Fay
dbedf245a0 Fixed some calculation to resolve edge tiles being partially cut-off in advmap world view mode; 2015-01-31 19:00:41 +01: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
Mikhail Paulyshka
9b76ca0b27 Fix compilation with some versions of libavutil 2015-01-28 22:46:28 +03:00
Fay
e64c08df27 Initial; 2015-01-28 20:07:57 +01:00
AlexVinS
ba51de8b5f Merge remote-tracking branch 'remotes/Fayth/mantis-2011' into develop 2015-01-28 09:41:09 +03:00
Fay
4b5b6edd44 Added space between both text entries; 2015-01-26 17:16:39 +01:00
Fay
413523956f Fixed missing info about dealt damage in combat log when there were casualties; 
Fixed blank row in combat log in the same case;
 2015-01-25 18:03:34 +01:00
Fay
b03eb56706 Possibly fixes looping videos; 2015-01-25 14:28:11 +01:00
DjWarmonger
86fde2ba54 Merge pull request #76 from Fayth/mantis-2016 
Looks much better now :)
 2015-01-25 07:49:46 +01:00
Fay
551925b6d7 Added comments; 2015-01-24 23:12:17 +01:00
Fay
ad8a6c55d7 Fixes #2016 (heroes not possible to be chosen in pregame after switching town selection); 
Fixes skipping first hero selection when switching them with left arrow;
Fixes redrawing random hero portrait correctly after switching that player to AI;
 2015-01-24 21:24:23 +01:00
Fay
72f34a7799 Fixes crash on dropping an artifact on an empty garrison slot; 2015-01-24 00:21:18 +01:00
Fay
77908dcf76 Added missing deletes in map handler dtor; 2015-01-20 20:51:09 +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
9b3b69b108 Fixed incorrect display of scaled+rotated map images in world view mode; 
Fixed miscalculated viewport sizes in somee cases;
 2015-01-16 23:49:15 +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
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
DjWarmonger
84b2510aa4 Merge pull request #62 from vcmi/SpellsRefactoring4 
OK
 2014-12-26 08:46:29 +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
AlexVinS
eebf65e88f Merge branch 'develop' into SpellsRefactoring4 2014-12-24 00:15:27 +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
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
AlexVinS
2b88a914ff Fix client build 
* use regular overloaded methods for client serialization.
(serialize template not needed if connection.h already included and save/load code is different)
 2014-12-21 22:33:20 +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
AlexVinS
65ed0ec356 Trying to fix random freeze 2014-11-28 02:47:14 +03:00
AlexVinS
d94f15bdf4 Added configurable animation for SPELL_LIKE_ATTACK 2014-11-28 00:36:14 +03:00
AlexVinS
943a5bf0d3 cleanup 2014-11-27 22:10:36 +03:00
AlexVinS
0612042928 Tweak creature spell projectile start position 
* need more finetuning
 2014-11-27 21:33:57 +03:00
AlexVinS
04202eb030 Shoot spell projectile from creature 2014-11-27 21:06:11 +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
c67f52732a Fix CSpellEffectAnimation call parameters 
(!) need check areaEffect usage
 2014-11-27 17:39:37 +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
256894d18a Use configuration for spell projectile 2014-11-27 00:27:38 +03: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
0e346a4f0d Reset mapDescription scrolling position on change of map / save 
This one fixes bug #1974
 2014-11-24 15:56:33 +03:00
ArseniyShestakov
53c7a3cfcb Added function CSlider::moveToMin 2014-11-24 15:24:03 +03:00
AlexVinS
a71c452fc6 Merge branch 'develop' into SpellsRefactoring4 2014-11-24 12:45:34 +03:00
AlexVinS
85a4b725f5 [Creature window] 2-line bonus description 2014-11-24 12:44:45 +03:00
AlexVinS
f7ff61ce4f Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4 2014-11-24 12:41:17 +03:00
ArseniyShestakov
6fd0f76547 Fix invisible save select when click on save name area 2014-11-23 08:51:48 +03:00
DjWarmonger
c094e70784 Replaced legacy sprintf with boost::format. 2014-11-22 12:45:13 +01:00
KroArtem
82b278307f fixed typo 2014-11-17 23:08:08 +03:00
KroArtem
e73c60740c corrected text in vcmibuilder, corrected errors and warnings from cppcheck 2014-11-16 20:48:29 +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
AlexVinS
752965ff69 Merge branch 'develop' into SpellsRefactoring4 
Conflicts:
	lib/CSpellHandler.cpp
 2014-11-14 05:28:23 +03:00
AlexVinS
81fb2ae584 Fix crash when casting firewall-like spells after creature casting 
#1910
 2014-11-14 04:12:50 +03:00
AlexVinS
9e8b09d747 Use clearAffected flag 2014-11-13 15:00:45 +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
Ilya Zhuravlev
b22973e717 Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame. 2014-11-10 20:21:39 +03:00
Ilya Zhuravlev
62a3dfb086 Fixed "Hex grid" button crash, partially fixes 1907. 2014-11-04 15:34:30 +03:00
Ilya Zhuravlev
3eb3996241 Fix android build. 2014-11-02 16:19:14 +03:00
DjWarmonger
530a3e69bf Option to allow / ban certain types of town in a template. 2014-10-30 10:00:29 +01:00
Patrick Simmons
407755ee77 Minor multiplayer load bugfixes 2014-10-25 19:05:50 -04:00
Patrick Simmons
1dabdf7b3a Minor fixes to multiplayer load game support 2014-10-25 19:05:50 -04:00
Patrick Simmons
6aa3c11084 SUCCESS! 2014-10-25 19:05:49 -04:00
Patrick Simmons
7babdccd59 This is very wrong but works better than anything else I've tried. 2014-10-25 19:05:49 -04: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
Ilya Pomaskin
ff12aca83a bind -> std::bind 2014-10-25 19:05:49 -04:00
Mikhail Paulyshka
ab5e1f9109 don't use separate .rc files for MSVC and MinGW 2014-10-12 16:32:02 +03: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
DjWarmonger
01491f9f1e Fixed #1718 2014-10-01 14:20:00 +02:00
Ivan Savenko
6aef70eca1 Fixed animation order in lucky attacks. May fix 1891. 2014-09-23 17:30:36 +03:00
Ivan Savenko
a5c3ed080f Fixes 1892 - properly handle animation of dying clones 2014-09-23 16:02:30 +03:00
Ivan Savenko
33c0e24940 Fixes 1895 - Properly select upper army for recruitment 2014-09-23 14:28:55 +03: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
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
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
78709e223b Breaking things - trying to remove server-side knowledge of selected objects 2014-09-19 00:18:49 +03:00
Ivan Savenko
818a766fd6 Fixed 1888 - centering adv.map will also redraw minimap 2014-09-18 17:53:41 +03:00
Ivan Savenko
6cd3d1b30e Fixed 1889 - removed memory leak that caused multiple identical quest marks 2014-09-18 17:46:35 +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
DjWarmonger
a17e27bfc6 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-18 14:43:37 +02:00
DjWarmonger
495c39304d Fixed crash due to incorrect RMG options. 2014-09-18 14:29:57 +02:00
Ivan Savenko
9a4aa8749f Fall back to first available resolution if config contains invalid value. 
Fixes crash on starting game with unavailable resolution
 2014-09-18 14:20:53 +03:00
AlexVinS
22deb07b66 [c::b] update prejects, fix build 2014-09-11 17:53:25 +04:00
DjWarmonger
ec8476d43a Compile fixes for Visual. 2014-09-05 20:13:58 +02:00
DjWarmonger
a89512111c Updated visual files. 2014-09-05 16:38:19 +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
Ivan Savenko
de9c5b1af7 Merge branch 'develop' of github.com:karol57/vcmi into karol57-develop 2014-09-04 20:29:24 +03:00
Ivan Savenko
1647b3670c Merge pull request #35 from rhn/rhn 
Fixes to sound handling.
 2014-09-04 20:26:32 +03: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
37bd4790f7 VCMIDirs update #6 fix 
- Apple compilation fix
- Removed unnecessary macros
- Updated macros indent style
- Fixed 1. warning.
 2014-08-30 15:04:00 +02:00
Karol
53ab0593b7 VCMIDirs update #6 
- Minor fixes
- CLoadFile updated to boost::filesystem::path
 2014-08-27 12:31:58 +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
958839668c VCMIDirs update #5 
- Minor fixes
- string based paths -> boost::filesystem::path paths (I hope it's
final)
- New user data path on windows
- New moving dir method on windows.
 2014-08-21 22:26:28 +02:00
DjWarmonger
94832c743c Updated build configs. Everything works. 2014-08-14 16:07:40 +02:00
DjWarmonger
6656515395 Updated Visual for FFMPEG. Need to define environmental variable FFMPEGDIR for it to compile. Not functional yet, though. 2014-08-13 19:21:58 +02:00
Karol
2da6d9e7dd VCMIDirs update #4 fix 2014-08-11 21:24:31 +02: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
cc61ffca73 Removed debug output 2014-08-11 17:27:41 +03:00
Ivan Savenko
092df7a71c Fixed crash on stack-less creatures, e.g. war machines 2014-08-11 16:28:15 +03:00
Ivan Savenko
4092929b70 Fixed endianness 2014-08-11 16:21:23 +03:00
Ivan Savenko
8f1a4fcb56 Fixed crash on opening creature window in battle 2014-08-11 15:57:15 +03: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
Ivan Savenko
a115406fa3 Fixed data presence check 2014-08-10 10:58:56 +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
66c4d469f8 Possible fix for neutral palette (1867) 2014-08-07 19:53:07 +03:00
Ivan Savenko
d1dd7eef48 Proper fix for #1712 - Building requirement tests are now fixed 
- added minimize() method in logical expressions that will remove excessive elements
- replaced forEach() with morph() that allows replacing types in variant
 2014-08-07 19:53:07 +03:00
Ivan Savenko
4d6ab2c32d Fixed rendering of bitmap fonts shadow 2014-08-07 19:53:07 +03:00
rhn
c8929b364b fixed typo 2014-08-06 17:55:29 +02:00
rhn
e4fce8fc8f fixed object types playing sounds 2014-08-06 17:19:54 +02:00
rhn
a491c11305 Fixed sound effect when hero disappears 2014-08-06 17:19:53 +02:00
rhn
e9534603c2 Fixed sound on object pickup with dialog 2014-08-06 17:19:53 +02:00
beegee1
5139378319 - migrated boost::function/ref/bind to std:: variants 2014-08-04 20:33:59 +02:00
Ivan Savenko
00cda400a1 Miscellaneous improvements for Launcher UI: 
- Implemented "show intro" toggle in settings
- Install/Update/Enable buttons are now visible even when mod info is hidden
- Fixed behaviour of show mod info switch, added more obvious button to enable it
- Removed no longer used "Enable mods on install" switch
- Added buttons to open data, user data and temporary directories
 2014-08-04 14:03:57 +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
AlexVinS
76c3228afa Merge branch 'develop' into FFMpeg 
Conflicts:
	client/CVideoHandler.cpp
 2014-07-26 07:54:43 +04:00
DjWarmonger
a842068d54 Merge pull request #30 from vcmi/RMG 
Since there are no objections, I finally merge this branch.
 2014-07-23 08:06:51 +01:00
Ivan Savenko
4fca583062 Merge pull request #29 from Mixaill/nsis 
CMake: add NSIS generator settings
 2014-07-18 00:56:46 +03:00
DjWarmonger
e8580229dc RMG will now actually use all the settings from pregame. Till now it did not. 2014-07-15 16:44:07 +02:00
DjWarmonger
89c97a88bb Updated Visual projects for SDL2. 2014-07-15 12:26:18 +02: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
9f5704f8ba Uploaded recreated stack queue backgrounds 2014-07-14 22:38:13 +03:00
Ivan Savenko
52da593292 New resolution selection button 2014-07-14 21:49:52 +03:00
Ivan Savenko
5111bff6cc Implemented new button for commander window 2014-07-14 20:43:38 +03:00
Ivan Savenko
7f790f9d6a Quest window now uses new background, using same gfx sources as creature window 2014-07-14 18:07:57 +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
Michael Pavlyshko
6a23960642 CMake/WIN32 : add icon to client and launcher 2014-07-14 01:02:00 +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
Ivan Savenko
cec9161f8f Added missing files 2014-07-13 18:40:13 +03:00
Ivan Savenko
83099fdb78 Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree 2014-07-13 18:39:45 +03:00
Ivan Savenko
55ff933b7f Reducing size of GUI classes. Split trade windows into a separate file 2014-07-13 16:31:00 +03:00
Ivan Savenko
09bedf9aa9 Reducing size of GUIClasses. Moved Garrison Int into a separate file. 2014-07-13 16:11:25 +03:00
Ivan Savenko
7e76a5dd0e Moved some code from GUIClasses into two smaller files: 
- CArtifactHolder.*
- CComponent.*

Goal: reorganize artifacts UI to decrease dependency on CGHeroInstance class
 2014-07-13 14:56:30 +03:00
Michael Pavlyshko
bad7050096 spaces -> tabulation 2014-07-11 11:01:03 +03:00
AlexVinS
679dd64ff9 Make scale a parameter of "open" methods 2014-07-10 14:18:21 +04: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
Michael Pavlyshko
11d73f2ac9 fix CVideoHandler compilation 2014-07-09 18:01:12 +03:00
Michael Pavlyshko
afc6530084 fix vcmiclient linkage 2014-07-09 17:37:08 +03:00