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
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
Michael Pavlyshko
6a23960642
CMake/WIN32 : add icon to client and launcher
2014-07-14 01:02:00 +03:00
Michael Pavlyshko
bad7050096
spaces -> tabulation
2014-07-11 11:01:03 +03: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
0edd10078f
Fix usage of fillRect.
...
* proper fix for slider drawing
2014-07-05 01:52:11 +04: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
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
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
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
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