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
|
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 |
|
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 |
|
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 |
|
DjWarmonger
|
d118fbffe8
|
Correct placement of subterranean gates.
|
2014-07-03 17:24:28 +02:00 |
|
DjWarmonger
|
60a5c764b8
|
Correct zone placement & sizing for underground maps.
|
2014-07-03 12:28:51 +02:00 |
|
DjWarmonger
|
cc8d484775
|
Refacoring, tweaks.
|
2014-07-03 09:39:26 +02: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 |
|
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 |
|
DjWarmonger
|
383280f72a
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
|
2014-06-27 18:26:43 +02:00 |
|
Ivan Savenko
|
52b17334a0
|
Added object for scrolls and hero placeholders. Typo fix
|
2014-06-27 19:15:47 +03:00 |
|
Ivan Savenko
|
f01e30a3b1
|
Added random objects to configs. For now as separate "random handlers", should be merged into main handlers later
|
2014-06-27 19:15:47 +03:00 |
|
AlexVinS
|
f63b1256d3
|
[ERM] Fix build
* update project
|
2014-06-27 12:12:45 +04:00 |
|
DjWarmonger
|
ccb475b699
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
|
2014-06-27 06:24:05 +02:00 |
|
Ivan Savenko
|
bac83d8bd0
|
Compatiblity for last version of Cove (and likely any other town mods)
|
2014-06-27 00:07:09 +03:00 |
|
DjWarmonger
|
57fa905a2b
|
Something that compiles.
|
2014-06-26 22:05:27 +02:00 |
|
Ivan Savenko
|
20b0dd6211
|
Renamed readme to readme.md to enable formatting in github UI
|
2014-06-26 21:23:00 +03:00 |
|
DjWarmonger
|
e51e2190fd
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
|
2014-06-26 20:12:37 +02:00 |
|
AlexVinS
|
aea5a7ba75
|
add comment. no code changes.
|
2014-06-26 20:49:18 +04:00 |
|
AlexVinS
|
c28b5f6633
|
fix mingw build
|
2014-06-26 20:41:27 +04:00 |
|
Ivan Savenko
|
00b6232ff6
|
Replaced usage of DLL_LINKAGE with ELF_VISIBILITY in netpacks. Please make sure that compilation now works on all platforms
|
2014-06-26 18:34:54 +03:00 |
|
Ivan Savenko
|
af1ce59ab4
|
Fixed path to header in ERM module
|
2014-06-26 18:16:16 +03:00 |
|