Michael Pavlyshko
476c7c32dc
CMake/SDL2: add ability to find SDL2 without pkg-config
2014-07-05 21:47:03 +03:00
DjWarmonger
6b26f0675c
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG
2014-07-05 19:36:44 +02:00
DjWarmonger
0782557814
- Place all standard visitable objects
...
- Fixed some constructors
2014-07-05 19:36:12 +02:00
DjWarmonger
22f811ea52
Integrated and fixed object RMG configs by Kantor.
2014-07-05 15:58:10 +02:00
DjWarmonger
e63b05c82b
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG
2014-07-05 15:34:23 +02:00
DjWarmonger
3a1a1a0425
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG
2014-07-05 15:34:06 +02:00
DjWarmonger
a076277e2b
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
...
Conflicts:
Mods/WoG/mod.json
2014-07-05 15:27:47 +02:00
DjWarmonger
2b0b6cca61
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG
2014-07-05 15:25:47 +02:00
DjWarmonger
0494c24575
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG
2014-07-05 15:25:10 +02:00
DjWarmonger
9cfbbb2048
Merge underground maps with develop. There is a serious issue with rendering rock tiles, which may cause crash.
2014-07-05 15:22:53 +02: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
DjWarmonger
7c3233f4c9
Fixed gravity algorithm not attracting adjacent zones at all -.-
2014-07-04 18:50:29 +02:00
DjWarmonger
d942858ef9
Throw exception when there are not enough two-way monoliths available.
2014-07-04 14:46:02 +02:00
DjWarmonger
05c2a4e716
Better gravity-based algorithm.
2014-07-04 11:51:28 +02:00
Ivan Savenko
20f7071d11
Implemented stack experience/commander experience display for window
2014-07-04 12:48:09 +03:00
DjWarmonger
5fb07ded38
Correct underground terrains. More improvements for connection placement.
2014-07-04 10:45:00 +02:00
DjWarmonger
d4d3f1a568
More tweaks.
2014-07-04 09:54:55 +02:00
DjWarmonger
ab748ae221
Somewhat better gate placement, attempt to add rocky tiles to underground zones.
2014-07-03 23:11:24 +02: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
Ivan Savenko
3e9ad21ca9
Updated readme to with info on assets license, including link to not-yet-existing vcmi-assets repository
2014-07-03 19:49:42 +03: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
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
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
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
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
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
