0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
57758 commits 51 branches 369 tags 4.7 GiB
Commit graph

242 commits

Author SHA1 Message Date
Ignacio R. Morelle
128171d716 Add ANIMATION_08_140 terrain graphics macro 2014-11-13 20:21:52 -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 23b72d6956.
 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 5fa5c03411, reversing
changes made to 06374c64ba.
 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
Simon Forsyth
efb70e1f54 Remove unneeded keys from singlehex macro 2011-09-24 12:02:12 +00:00
Simon Forsyth
f2b4eb2eff Expand GENERIC_SINGLEHEX_PLFB into TERRAIN_BASE_PLFB and variants 
Allows the single-hex macro to be used without directly accessing the
internal macros

terrain-graphics.cfg updated to use non-internal macros

Satisfies comment at start of internal-* files
 2011-09-23 22:11:59 +00:00
Simon Forsyth
ad9a382658 Move image tag inside tile. Fixes appearance part of buf 18723 2011-09-23 21:47:21 +00:00
Simon Forsyth
7c8adba978 Simplify ANIMATED_WATER_15 macro (aka remove references to adjacent tiles) 2011-09-23 21:39:51 +00:00
Simon Forsyth
a58b8ec108 Simplify GENERIC_SINGLEHEX_PLFB. Macro is currently unused in mainline 2011-09-23 20:59:26 +00:00
Simon Forsyth
3f2b9101b0 Fix bug #18587: 
restore old behaviour of drawing castle-cave wall transitions with
stone walls - reordered transitions to ensure stone walls appear above
cave transitions
 2011-09-04 16:46:49 +00:00
Simon Forsyth
70bea55dc0 Apply patch #2862: stone wall transitions. Fixes Bug #15940. 2011-08-12 22:19:15 +00:00
Lari Nieminen
f927c64c9a Moved the fence from layer 0 to -80. 2010-12-08 17:39:12 +00:00
Eric S. Raymond
bdf41495a3 wmlscope/wmllint cleanups. 
This caught one real bug in 6p_Team_Survival.cfg.
 2010-12-07 22:58:25 +00:00
Lari Nieminen
ffe4997c62 Added lurker's new fence embellishment. 2010-11-29 12:32:15 +00:00
Steven Panek
9936b58d27 Ran wmlindent. 2010-11-25 10:06:26 +00:00
Jérémy Rosen
7c3379e3fe commit a small bug in bridge macros, bug found by Lurker 
(and once again, sorry for reading your patch backward)
 2010-11-24 17:36:17 +00:00
Eric S. Raymond
62e6d23ab3 Suppress some irritating abd pointless warnings. 2010-11-24 01:09:24 +00:00
Lari Nieminen
cce073f209 Possible solution for some ugly beach corners. 
Introduces little fuzzy overlap glitches.
 2010-11-12 22:08:32 +00:00
Ali El Gariani
e2cce961c6 Test synchronization of waves animation. 2010-10-23 18:38:46 +00:00
J.W. Bjerk
62f082151d Wave animations on sand-- concave only for now. 2010-10-18 00:59:54 +00:00
Lari Nieminen
2b1f6ee244 Added a temporary custom macro for the animated beach waves... for real this time. 2010-10-17 21:36:32 +00:00
J.W. Bjerk
19145dcd83 Waves... monstruously ugly ones from only 1 direction 2010-10-17 21:13:08 +00:00
J.W. Bjerk
155548250c more work on the sand-to-water corner transitions. 2010-10-16 02:46:47 +00:00