Michael Pavlyshko
|
c935193558
|
disable WIN32 flag for executables, fix previous commit
|
2014-07-10 00:47:22 +03:00 |
|
Michael Pavlyshko
|
ce5f59e8b6
|
Fix windows linkage, also, use SYSTEM_LIBS variable for OS-dependent libraries
|
2014-07-10 00:41:31 +03:00 |
|
Michael Pavlyshko
|
11d73f2ac9
|
fix CVideoHandler compilation
|
2014-07-09 18:01:12 +03:00 |
|
Michael Pavlyshko
|
24af413d61
|
define M_PI
M_PI isn't a part of standard and may be undefined.
|
2014-07-09 17:42:22 +03:00 |
|
Michael Pavlyshko
|
afc6530084
|
fix vcmiclient linkage
|
2014-07-09 17:37:08 +03:00 |
|
Michael Pavlyshko
|
7405066cbd
|
Link with wsock32 lib
|
2014-07-09 17:36:01 +03:00 |
|
Michael Pavlyshko
|
3443ba5bb3
|
fix libvcmi linking
|
2014-07-09 01:43:13 +03:00 |
|
Michael Pavlyshko
|
e0134aed0b
|
Delete unused include
|
2014-07-08 02:00:11 +03:00 |
|
Michael Pavlyshko
|
820eceb8ad
|
Add VCMI_DLL flag for libvcmi
|
2014-07-08 01:50:44 +03:00 |
|
Michael Pavlyshko
|
2957377360
|
Fix *_DIR variables for windows
|
2014-07-07 23:21:59 +03:00 |
|
Ivan Savenko
|
ca86416953
|
Fixed compilation with gcc 4.7
|
2014-07-07 11:02:55 +03:00 |
|
Ivan Savenko
|
142272d588
|
Debian/Ubuntu builds will use SDL1.2
|
2014-07-07 09:16:28 +03:00 |
|
Ivan Savenko
|
aaf314baf4
|
Source ID from bonusing objects is not object index but object type. Fixes at least partially #1822
|
2014-07-07 08:29:07 +03:00 |
|
AlexVinS
|
ec7e58786d
|
Merge branch 'SDL2' into develop
|
2014-07-06 21:34:04 +04:00 |
|
Alexander Shishkin
|
b761645a50
|
Merge pull request #24 from Mixaill/cmake
CMake/SDL2: add ability to find SDL2 without pkg-config
|
2014-07-06 21:32:06 +04:00 |
|
Michael Pavlyshko
|
476c7c32dc
|
CMake/SDL2: add ability to find SDL2 without pkg-config
|
2014-07-05 21:47:03 +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
|
9437bc52c1
|
Merge remote-tracking branch 'remotes/origin/develop' into SDL2
|
2014-07-02 22:42:10 +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 |
|
Ivan Savenko
|
150933d1a1
|
Updated WoG files to 0.96
- converted remaining bank configs to object format
- implemented missing dwellings from wog, fixes #1819
|
2014-07-02 20:57:57 +03: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
|
4441bd12db
|
(linux) version set to 0.96
|
2014-07-01 21:02:03 +03:00 |
|
DjWarmonger
|
cc294b3ae7
|
Version 0.96 release.
|
2014-07-01 19:30:31 +02:00 |
|
Ivan Savenko
|
cc349fa64f
|
Fixed Faerie Ring bonus, removed unused code
|
2014-07-01 18:19:51 +03: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 |
|
DjWarmonger
|
bae9f2083f
|
Workaround for hero & town issue. Game still crashes elsewhere, though.
|
2014-07-01 12:07:53 +02:00 |
|
DjWarmonger
|
dc98f14884
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
|
2014-07-01 09:13:42 +02:00 |
|
DjWarmonger
|
bf567c9e50
|
Fixed crash caused by hiding tiles around AI heroes.
|
2014-07-01 09:13:19 +02:00 |
|
DjWarmonger
|
54390ea81c
|
Merge branch 'develop' into RMG
|
2014-07-01 08:25:53 +02:00 |
|
DjWarmonger
|
e3303326fc
|
Merge branch 'develop' into RMG
|
2014-07-01 07:52:58 +02:00 |
|