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,022 Commits 19 Branches 62 Tags 112 MiB
742f244426
Commit Graph

2084 Commits

Author SHA1 Message Date
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
AlexVinS
18f34e14f8 set scale to off by default 2014-07-08 22:01:01 +04:00
AlexVinS
0efb6e2890 Use scaling 
(*) into - fullscreen
(*) spellbook - no scaling
 2014-07-08 18:20:22 +04:00
AlexVinS
61b31e5c60 add api to enable|disable scaling (unimplemented) 2014-07-08 17:39:47 +04:00
AlexVinS
c71237bba3 Mingw build with ffmpeg 
(*) get rid of BIK SMK dlls
(-) missing sound
(-) spellbook is scaled to fullscreen
 2014-07-08 16:40:25 +04:00
Ivan Savenko
1ae7a77246 Cleanup of stack artifacts code 2014-07-05 11:48:03 +03:00
Ivan Savenko
60e5815014 Implemented stack artifact handling, no tested yet 2014-07-05 01:22:56 +03:00
AlexVinS
0edd10078f Fix usage of fillRect. 
* proper fix for slider drawing
 2014-07-05 01:52:11 +04:00
Ivan Savenko
ac6cfdfb92 Extracted too big lambda into a separate helper method 2014-07-04 20:58:18 +03:00
Ivan Savenko
20f7071d11 Implemented stack experience/commander experience display for window 2014-07-04 12:48:09 +03:00
AlexVinS
e70e68a56b Fix puzzle map fade. 2014-07-03 23:06:11 +04:00
AlexVinS
74d3effa98 More safe way of update locking 2014-07-03 22:30:56 +04:00
Ivan Savenko
e4e9d71143 Fixed texts: 
- added new texts to translate.json
- implemented texts for abilities

Remaining TODO's:
- handling of stack artifact
- handling of commander artifacts
- stack experience
 2014-07-03 21:09:17 +03:00
AlexVinS
9b8ad51cd3 Run all rendering with pim lock if possible 2014-07-03 22:05:59 +04:00
AlexVinS
30d6eab20b Do not render fully hidden tiles 2014-07-03 20:41:42 +04:00
Ivan Savenko
079866d99d Implemented leveling up abilities. TODO: implement visible selection/descriptions 2014-07-03 19:05:19 +03:00
AlexVinS
8a488aeb86 Cleanup 2014-07-03 19:57:21 +04:00
AlexVinS
57f82f2bed Add a comment. 2014-07-03 18:46:23 +04:00
AlexVinS
f3067878dd Force full redraw for sliders. This fixes backgroung glitches with SDL2. 
(!) there should be better fix
 2014-07-03 18:44:25 +04:00
AlexVinS
ecc7b8e05a Draw cursor on each frame. Fix TTF rendering under cursor. 2014-07-03 18:05:07 +04:00
AlexVinS
e521e6687a centralize cursor drawing 2014-07-03 15:10:01 +04:00
AlexVinS
022f71c26e fix deletion in in-game console 2014-07-03 14:58:56 +04:00
AlexVinS
397f4cf8b6 Workaround for TFF font glitches under cursor in pregame 2014-07-03 14:10:15 +04:00
AlexVinS
c948891fc6 Fix threaded handlers initialization, cleanup 2014-07-03 12:26:15 +04:00
Ivan Savenko
328944e111 Fixed levelling up of commander 2014-07-03 01:00:16 +03:00
AlexVinS
dbb7526040 fix uninitialized flag 2014-07-02 23:53:49 +04:00
AlexVinS
5a029c88d1 cleanup 2014-07-02 23:53:23 +04:00
AlexVinS
3e4e810888 More ColorKey cleanup 2014-07-02 22:41:11 +04:00
Ivan Savenko
b58bbcbdd8 Leveling up commander skills seems to be working. Optimized some png's to decrease size 2014-07-02 21:38:38 +03:00
Ivan Savenko
617ea79d3c Button overlays are now more generic (not necessarily text), removed old version of creature window 2014-07-02 21:38:38 +03:00
Ivan Savenko
7a9547bb44 New creature window made without use of H3 graphics 
This is import of ancient unfinished branch from svn. As of now window is largely finished but commander-related elements are still TODO.

Note that I also uploading graphical content - this is intended and necessary for final goal - to make VCMI functional without any additional graphical pack.
 2014-07-02 21:38:38 +03:00
AlexVinS
638dac90af centralize key color management 2014-07-02 22:20:54 +04:00
AlexVinS
082c9a506e Fix battle absolute obstactes rendering 2014-07-02 21:38:15 +04:00
AlexVinS
7b75b19d1a Fix hero flags rendering 2014-07-02 21:09:49 +04:00
AlexVinS
9606aed4a3 Using int3 for color is weird 2014-07-02 20:12:15 +04:00
AlexVinS
e57dbbde15 Extract startTextInput & stopTextInput 
(*) these functions do nothing with SDL1 - this is by design - less ifdef`s
 2014-07-02 19:41:30 +04:00
AlexVinS
9797372dbe Implement Unicode support for ingame console 2014-07-02 19:16:05 +04:00
AlexVinS
195eae48ca Merge branch 'develop' into SDL2 
Conflicts:
	client/CPlayerInterface.cpp
 2014-07-02 17:15:12 +04:00
Ivan Savenko
c956b3f02a Fixed #1820, better detection of object below cursor that uses same logic as renderer 2014-07-01 17:19:08 +03:00
AlexVinS
50dfe05cd1 [C::B] Small projects fix 2014-06-30 11:19:55 +04:00
DjWarmonger
57fa905a2b Something that compiles. 2014-06-26 22:05:27 +02:00
DjWarmonger
e51e2190fd Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-26 20:12:37 +02:00
Ivan Savenko
32240da34e Reduced number of #include's in headers. May break compilation on Win 
since some net packs now need DLL_LINKAGE
 2014-06-25 17:11:07 +03:00
Ivan Savenko
a0689fa377 Refactoring of hoverText from objects: 
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
 2014-06-24 20:39:47 +03:00
Ivan Savenko
ad632d1e8a Moved FoW management from CGObjectInstance to callback 2014-06-24 20:39:47 +03:00
Ivan Savenko
5ebc0e8614 First part of object instance API cleanup 
- removed passability() method in favour of passableFor(PlayerColor)
- moved operator < code to map handler
- updated class documentation
 2014-06-24 20:39:47 +03:00
AlexVinS
4e4ba6654c fix Eye of magi, also fix #1608 
Conflicts:
	lib/CObjectHandler.cpp
 2014-06-24 18:20:28 +04:00
AlexVinS
3b8d0e44d4 Merge branch 'develop' into SDL2 2014-06-24 14:09:44 +04:00
DjWarmonger
79036484dd Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02:00
Ivan Savenko
47639832b1 Probably fixed bug with map border rendering in rectangular maps 2014-06-23 20:47:09 +03:00
DjWarmonger
3ac306f501 Merge pull request #19 from vcmi/feature/mapObjects 
Feature/map objects
 2014-06-22 14:49:42 +02:00
AlexVinS
2ec8c31558 Partial fix for hero flag rendering 
(-) blue & teal heroes are still gitchy. IDN why ...
 2014-06-21 14:54:41 +04:00
AlexVinS
ac7703ffb0 Fix hero movement rendering 2014-06-21 12:13:19 +04:00
AlexVinS
8cc5363882 fix warning, cleanup 2014-06-21 11:35:08 +04:00
AlexVinS
13bd4ddcb2 Now movement can be canceled 
(-) rendering still missing
 2014-06-21 10:49:27 +04:00
AlexVinS
5fa5ba622f Start preparation for moveHero threaded implementation 2014-06-18 14:31:11 +04:00