1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

4176 Commits

Author SHA1 Message Date
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
DjWarmonger
d118fbffe8 Correct placement of subterranean gates. 2014-07-03 17:24:28 +02: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
DjWarmonger
60a5c764b8 Correct zone placement & sizing for underground maps. 2014-07-03 12:28:51 +02: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
DjWarmonger
cc8d484775 Refacoring, tweaks. 2014-07-03 09:39:26 +02: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
abd6fe73dd Version 0.96 release. 2014-07-01 19:32:31 +02: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
DjWarmonger
bda71bed83 Uploading misc tweaks. 2014-07-01 07:07:40 +02:00
Ivan Savenko
db221829aa Modding-related bugfixes:
- hero classes will be loaded correctly
- objects without index will have correctly assigned ID's
2014-06-30 17:13:01 +03:00
AlexVinS
50dfe05cd1 [C::B] Small projects fix 2014-06-30 11:19:55 +04:00
DjWarmonger
a556ef64e9 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-30 06:45:35 +02:00
Ivan Savenko
a1fff864e6 Fixed missing names for dwellings and creature banks 2014-06-30 00:16:45 +03:00
Ivan Savenko
f01ab0d48f Fixed rest of reported on forums bugs in rewardables 2014-06-29 20:13:25 +03:00
Ivan Savenko
1157111fcf More bugfixing:
- Fixed compile in VCAI (precompiled headers should not include VCMI headers)
- Fixed crash on visiting observatories, including shroud of darkness
2014-06-29 17:23:06 +03:00
DjWarmonger
7dbe2f5c40 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-28 16:31:06 +02:00
Ivan Savenko
917b1ffca8 Bugfixing:
- Added missing types for serialization
- Fixed possible crash in removable objects (campfire)
- Fixed typo in bank config
2014-06-28 17:21:38 +03:00
DjWarmonger
920f56969b Create random obstacles that match terrain. 2014-06-28 09:46:32 +02:00
DjWarmonger
7aa8213cd5 Tweaked templates to allow all map sizes.
To be released as 0.95c.
2014-06-27 21:48:17 +02:00
DjWarmonger
90b72a7856 Workaround with Obelisks. Kill me later. 2014-06-27 20:28:21 +02:00
DjWarmonger
05d172ccb8 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-27 20:07:08 +02:00
Ivan Savenko
0f5826802d Defined templates for objects with incorrect info in objects.txt:
- random arts
- random resources
- random creatures
- spell scroll
2014-06-27 20:36:50 +03:00