upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 06:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,648 Commits 52 Branches 374 Tags
Commit Graph

227 Commits

Author SHA1 Message Date
Simon Forsyth
45c2e972ad Add gray and tropical water reefs 2011-08-13 00:24:35 +00:00
Anonymissimus
556638a3b4 let units submerge in swamp merfolk village (fix for bug #18140) 2011-08-04 18:13:46 +00:00
Ignacio R. Morelle
02788547c6 Hide deprecated terrains from the editor palette... 
...while someone decides when to kill them
 2011-06-27 07:19:40 +00:00
Ignacio R. Morelle
abb1fb6705 Re-rationalization of terrain names, part 2 
Interested people look at the full commit message in SVN instead of
CIA's crappy notifications.

* All nameless terrains were given generic-enough names.

* "Aquatic Village" became simply "Village"; "Sunken Castle/Keep" is
  "Ruined Castle/Keep"

* "Encampment" and "Encampment Keep" are special cases, discuss.

* "Snow Hills" etcetera are just "Hills" now
 2011-06-27 06:57:47 +00:00
Ignacio R. Morelle
52ae413bd1 Re-rationization of terrain names, part 1 
Eleazar's "rationalization" of terrain names in 2010-10-22T20:51:37Z!me@jwbjerk.com,
2010-10-22T21:27:44Z!me@jwbjerk.com left quite a bunch of terrains with editor_name
attributes but no name attribute. While it may theoretically make
sense to inherit the name attribute from an aliased terrain, this
creates new problems of its own when a terrain is aliased to more than
one type (which one to choose for name inheritance?). In my opinion it
is best to solve this in WML and not add more layers (heh) of
convolutedness to the terrain engine.
 2011-06-27 06:33:30 +00:00
J.W. Bjerk
7046e9e067 Adding a dead great elvish tree by homunculus. 2011-05-14 18:24:47 +00:00
Nils Kneuper
b2f79b2472 apply wmlindent on basically all of mainline 2011-05-04 10:04:57 +00:00
J.W. Bjerk
a530c5d475 New igloo village by doofus. 2011-04-15 18:15:26 +00:00
Thibault Févry
43f9d2845d Fix a whitespace problem 2011-03-05 23:25:45 +00:00
J.W. Bjerk
0b90199964 new water lilies by Atz. 2011-03-02 19:33:29 +00:00
J.W. Bjerk
836cda5710 Added the new tall encampment keep by Doofus. 
Has a transition glitch with some terrains that i'm not sure how to
fix.  Adjacent grass (and probably other terrains) can overlap the
wood floor.
 2011-02-26 22:20:40 +00:00
Steven Panek
55538d3cd2 Updated comment. 2011-02-24 00:49:00 +00:00
Steven Panek
91ebb2b66c Use 'Gray' in terrain names. 2011-02-24 00:46:35 +00:00
Steven Panek
2e57db1f49 Update comment. 2011-02-24 00:26:40 +00:00
Steven Panek
ae35c1c68e Use 'Wooden' for consistency. 2011-02-24 00:22:16 +00:00
Steven Panek
d84bd2675e Added the ruined desert keep. 2011-02-23 22:32:08 +00:00
Steven Panek
e6a8dadb32 Added a stones with sand drifts embellishment. 2011-02-23 22:13:04 +00:00
Steven Panek
e8ce5ecada Moved the ruined desert castle to core. 2011-02-12 21:15:27 +00:00
Lari Nieminen
3edd7f940e Used a very crude hack to fix some tree-hill combinations... 
...not functioning as forested hills. Still doesn't cover every
possible combination.
 2010-12-18 23:10:47 +00:00
Alexander van Gessel
f35e0d1738 Add a village-overlay terrain to go with castle-overlay and keep-overlay 2010-12-12 02:52:09 +01:00
Lari Nieminen
ffe4997c62 Added lurker's new fence embellishment. 2010-11-29 12:32:15 +00:00
J.W. Bjerk
bf265cf23b Added ruined cottage and ruined hill village by Doofus. 2010-11-12 17:53:18 +00:00
J.W. Bjerk
c8c882fddc added ruined variant of human city village by Doofus. 2010-10-31 16:28:18 +00:00
Lari Nieminen
1e4eab72fc Changed aliasing of villages from Vi,_bas to _bas,Vi 
...which seems to fix an issue with villages on snow and sand hills
using worst instead of best movement.
 2010-10-31 08:26:28 +00:00
J.W. Bjerk
8573cb0317 a bit more terrain name rationalization. 2010-10-22 21:27:44 +00:00
J.W. Bjerk
d4a50b4499 further rationalization of terrain names. 2010-10-22 20:51:37 +00:00
Steven Panek
06829acc9a 'Lava chasm' -> 'Lava Chasm'. 2010-10-19 22:00:49 +00:00
Steven Panek
9f1003f2f6 Made the deprecated volcano's name string untranslatable. 2010-10-19 21:20:12 +00:00
J.W. Bjerk
ada69446ac further fixes to editor names, 
...and switching the tent village to not look like the encampment
village.

Part 2.  Done.
 2010-10-19 16:23:01 +00:00
J.W. Bjerk
fe2cfbbc71 giving proper editor names to most terrains. 2010-10-18 22:54:52 +00:00
Lari Nieminen
2177f66403 Added missing default_base=Qxu for the north-south chasm bridge. 2010-10-18 13:43:15 +00:00
J.W. Bjerk
7838170877 adding 'off-map' to the 'obstacles' editor group. 2010-10-06 03:03:23 +00:00
J.W. Bjerk
e0e2426052 reactivation one of my test terrains. 2010-09-28 02:51:30 +00:00
J.W. Bjerk
e2af692104 converting the ocean variants to auto-recolor... 
...and adding a third ocean variant (Wog).
 2010-09-24 23:58:34 +00:00
J.W. Bjerk
b51d1204f1 cleaning up after the auto-colored water change. 2010-09-24 18:38:06 +00:00
Eric S. Raymond
e7d337a676 Reindent mainline. 2010-09-23 13:04:56 +00:00
J.W. Bjerk
965ebc7bc6 Making the standard shallow water color-shifted from tropical. 
Removed extra water terrain.
 2010-09-19 15:58:48 +00:00
Lari Nieminen
478c88a1e7 Made the shallow water terrains appear in order of saturation... 
...(from most saturated to least saturated) in the editor.
 2010-09-19 12:21:31 +00:00
J.W. Bjerk
43fb7e53ad refinements to the auto-color water variations. 
Note this is probably a speed regression due to previously disabled
animations being re-enabled.
 2010-09-19 11:37:18 +00:00
Lari Nieminen
2bb50e539b Added two new macros to internal-generic.cfg... 
...for creating IPF-capable animated water terrains and transitions,
changed all water transitions to use them and added two new
colour-shifted water variant terrains.
 2010-09-19 10:28:56 +00:00
J.W. Bjerk
f72a82b678 converted volcanoes from 'Qv' to 'Mv' for saner and easier wildcarding. 
Think i got all the maps that used it too.
 2010-09-19 02:11:56 +00:00
Lari Nieminen
d375903a1f Changed the default base of snowy human city village from cobbles to snow. 2010-09-17 22:36:26 +00:00
Lari Nieminen
ee41249f68 Added swamp as the default base of the non-aquatic swamp village. 2010-09-15 16:48:42 +00:00
Lari Nieminen
060a150a6c Allowed the chasm bridges to be placed on any terrain, 
...removed the lava chasm bridge terrains and made the chasm bridges
simply use the lit-by-lava images when placed on top of lava.
 2010-09-15 16:47:40 +00:00
Ali El Gariani
c7ee3061a2 Remove tiny negative height for water hexes. 
This was barely visible and looked silly for big unit north of land
(feet sometimes visible there)

But the main reason is that this helps perfomance by keeping unit in their hex.

PS: I will maybe reactivate this later with another implementation of
the submerge effect
 2010-09-15 05:24:55 +00:00
Lari Nieminen
e9a0764584 Added a WIP of a new experimental fake map edge terrain. 2010-09-14 08:44:28 +00:00
Lari Nieminen
825b03c4e2 Removed the new obsolete village terrain variants. 2010-09-13 16:57:46 +00:00
Eric S. Raymond
4147c6c77f Village-code changes requested by zookeeper, 
...and wmllint code to perform them.
 2010-09-13 16:43:50 +00:00
Lari Nieminen
641523dbc4 Allowed the Ss^Vhs swamp village to be placed on different base... 
...terrains. Also a bunch of trailing whitespace trimming.
 2010-09-13 15:08:36 +00:00
Lari Nieminen
3387bf7d21 Made all villages except for water and swamp villages alias to village,base. 2010-09-12 22:43:38 +00:00