upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-17 02:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,332 Commits 52 Branches 374 Tags
Commit Graph

261 Commits

Author SHA1 Message Date
Charles Dang
a6dd6c668c Ran wmlindent and fixed badly formatted code 2016-08-05 13:46:39 +11:00
ln-zookeeper
c3bf0ee816 Improved on some glitchy 3-way corners involving beach waves 
Corners where water, sand and anything that sand transitions over (such as roads) exhibited the problem. This fix isn't perfect as the convex and concave shore waves don't completely match, but it's a clear improvement.
 2016-03-30 19:16:10 +03:00
ln-zookeeper
03a2a5177a Changed * to . in small forest flag placing rule 2016-03-19 11:47:58 +02:00
ln-zookeeper
b7edf367c3 Made water overlay transitions use NEW:GENERIC_CORNER_TRANSITION 2016-03-19 11:45:58 +02:00
ln-zookeeper
40d5487765 Decreased the amount of images placed by NEW:GENERIC_CORNER_TRANSITION 2016-03-19 11:43:23 +02:00
ln-zookeeper
e5b3d8139b Slightly improved the beach waves rules 2016-03-18 18:41:11 +02:00
ln-zookeeper
16b3cd6127 Made NEW:GENERIC_CORNER_TRANSITION take arguments for mask and mask IPF 2016-03-06 23:35:55 +02:00
ln-zookeeper
4b5d0734e8 Renamed the "long" terrain masks 2016-03-06 23:30:39 +02:00
ln-zookeeper
d9326e13bf Added an "Animate water" toggle to display preferences 2016-03-02 13:42:11 +02:00
ln-zookeeper
e85d504fbc Replaced feathered beach wave masks with hard-edged ones 
This both improves performance slightly and eliminates glitches resulting from the feathered masks overlapping.
 2016-02-22 14:19:18 +02:00
ln-zookeeper
df9cecd558 Changed gray and tropical water to work by overlays, not color-shift 
This heavily decreases memory use, with relatively little impact on visuals, which can be refined further still.
 2016-02-15 23:38:49 +02:00
ln-zookeeper
b6d2a685d3 Streamlined the WML for the basic terrain base and transition rules 2016-02-10 20:33:46 +02:00
ln-zookeeper
e7188fbfa8 Replace water->void transition with a simpler void->water transition 2016-02-09 09:19:15 +02:00
ln-zookeeper
15a235232a Some small optimization of water rules 2016-02-09 09:04:18 +02:00
Lari Nieminen
72100d866f Remove some unnecessary uses of * in rule maps 2016-02-07 14:51:19 +02:00
ln-zookeeper
6f9a6271a0 Fixed several forest<->mountain layering glitches 
This did necessitate changing the base coordinates in a way which does introduce a few undesirable cases of forests overlapping walls to their sw/se, but to me they seem less irritating than the problems with mountains.
 2016-01-30 16:32:14 +02:00
ln-zookeeper
597ca071c4 Updated Adobe Village and new Ruined Adobe Village, from doofus-01 2016-01-24 14:04:08 +02:00
ln-zookeeper
247955f122 New animated water 2015-07-28 19:32:02 +03:00
ln-zookeeper
ae7e469d52 New beach waves animation 2015-02-03 14:37:16 +02:00
Ignacio R. Morelle
e56f8e6aa5 Add ANIMATION_08_140 terrain graphics macro 2014-11-13 20:25:12 -03:00
Bär Halberkamp
10eb2bd986 ran wmlindent 2014-02-22 16:35:31 +01:00
Ignacio R. Morelle
a21d13f1f4 Refactored trash terrain gfx macros into a separate file, removed TRI prefix 
The macro-less portions of these terrain graphics rules are now the
TRASH_A and LITTER_BASE macros. I tried to the best of my ability to
understand how they are supposed to work together, so this is the naming
scheme and parameter set I found to be the most optimal:

    #define TRASH_A TERRAIN PROB IMAGESTEM
        Covers the first and second rules, which are used on a single
        terrain pattern.
    #define LITTER_BASE TERRAIN IMAGESTEM
        Covers the third rule, which affects both trash terrains.
 2014-02-13 22:54:06 -03:00
Alexander van Gessel
38b224c1ff Revert "Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old"" 
This reverts commit 23b72d6956e6316f8b50a6accba607f66cf197a7.
 2013-08-09 00:13:46 +02:00
Thibault Févry
23b72d6956 Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old" 
This reverts commit 5fa5c034110c3c942d299c8fd440297c89aca037, reversing
changes made to 06374c64ba00977a4f720a44108593fc43d5c787.
 2013-08-08 18:50:46 +02:00
Alexander van Gessel
0738a4e59c make reindent minus some wmlindent issues 2013-08-04 23:22:56 +02:00
Eric S. Raymond
8c044a01db Mainline campaigns are wmllint/wmlscope clean again. 
Unfortunately, this required telling wmlscope to ignore all present
instances of new-style animation wildcarding. Some rather messy changes
to wmlscope will have to be considered if it gets more widely used.
 2013-03-28 11:33:43 -04:00
Eric S. Raymond
31376d4f70 Change some names of formal arguments to suppress wmlscope warnings. 2013-03-28 10:42:16 -04:00
Eric S. Raymond
45cdd236db wmllint/wmlscope glitch fixes. No substantive changes. 2013-03-27 22:33:14 -04:00
Jérémy Rosen
857e53f001 apply patch #3656 by coffee to simplify terrain WML 2013-02-02 13:02:37 +00:00
Jérémy Rosen
dc02698fa8 change syntax of square bracket animations, ~ is not used for range 2013-01-30 21:37:44 +00:00
Jérémy Rosen
5662cbcc38 new syntax for animation lines, simplifies mainline WML quite a bit. 
patch by Coffee
 2013-01-26 22:33:51 +00:00
Simon Forsyth
8a8c7a9cf3 Apply latest bridge update by lurker 2012-11-04 21:40:37 +00:00
Simon Forsyth
259276c040 Redefine old terrain macro in terms of another. 
Would like a way to mark it as deprecated.
 2012-06-28 02:03:00 +00:00
Simon Forsyth
36b2f08f97 Modernize Dark Castle terrain graphics. 
It is now usable adjacent to any terrain.

Adds new macro to core likely to be useful for UMC castle developers.
 2012-06-28 01:55:12 +00:00
Simon Forsyth
2b40ba62f0 add three new bridges 
there are some issues preventing the plank bridge from being used
adjacent to walkable areas but it is still useful enough to be worth
adding and it is likely that either the artist or I can resolve these
problems
 2012-03-31 02:27:31 +00:00
Simon Forsyth
5f1fb50b8d move campfire terrain from Under the Burning Suns to core 
now in Embellishments group

does not deprecate ANIMATED_CAMPFIRE macro

- needed in case the terrain on the map already includes an overlay

other maps using campfire not yet updated
 2012-03-10 19:09:59 +00:00
Simon Forsyth
69b001525c lower keep layer to allow rubble to be drawn above it 2012-03-10 16:28:33 +00:00
Simon Forsyth
c295384fea reduce the number of unique terrain flags 2012-03-10 15:11:46 +00:00
Simon Forsyth
8c87c87c2d Reenable animated water transitions - needed for Under the Burning Suns 2012-03-03 18:46:45 +00:00
Simon Forsyth
057a2e65a0 Display invisible overlays on main map in map editor 2012-02-23 00:31:17 +00:00
Simon Forsyth
fde98f1884 Reduce animation overhead for animated walls 2012-02-03 02:03:00 +00:00
Simon Forsyth
be3115da85 Draw fallback small images if large images not available for OVERLAY_COMPLETE. 
Fixes unreported bug affecting reeds in swamp terrain.
 2012-01-12 00:13:56 +00:00
Simon Forsyth
381b6981ae Remove tags ignored by engine 
(as reported by lipk in http://forums.wesnoth.org/viewtopic.php?f=21&t=35832
 2012-01-09 03:36:11 +00:00
Simon Forsyth
7784272c65 Allow 2x2 mountains/volcanos to be drawn at right map edge. Fixes bug #19024 2011-11-19 17:24:14 +00:00
Simon Forsyth
b7ef47690b Correct high neighbour count track macros 2011-11-02 01:29:26 +00:00
Simon Forsyth
92480570ae Allow variant images for tracks 2011-11-02 01:25:22 +00:00
Simon Forsyth
512d38345a Kill the unused CANYON macro and accoutrements. 
The only add-on I have seen using it redefined it anyway
 2011-10-29 02:47:30 +00:00
Simon Forsyth
4a0df3b19b adjust base values for narrow long mountains. Fixes bug #18874 2011-10-28 02:20:05 +00:00
Simon Forsyth
dd2ba82677 New macro: MOUNTAIN_SINGLE_RANDOM. Allows removal of 6 terrain_graphics rules 2011-10-24 03:11:25 +00:00
Simon Forsyth
8355eb92bc New WALL_ADJACENT_TRANSITION macro 
like WALL_ADJACENT but avoids declaring base terrain inside it
this matches the other wall macros (e.g. NEW:WALL)
the two instances of this in terrain-graphics are switched to the new macro
incidentally reduces number of terrain_graphics rules by 1
 2011-09-28 00:43:36 +00:00