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