upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,668 Commits 60 Branches 374 Tags
Commit Graph

121 Commits

Author SHA1 Message Date
Jérémy Rosen
320ada7edf more refactoring, get rid of forest.cfg 2010-05-30 10:56:51 +00:00
Jérémy Rosen
259ba9d52e move more macros to the deprecation file 2010-05-28 21:31:25 +00:00
Jérémy Rosen
7da5b9c08f provide all macro variations for villages 2010-05-28 20:48:38 +00:00
Jérémy Rosen
d0ddeaacf5 provide all macro variations for base terrains 2010-05-28 20:44:42 +00:00
Jérémy Rosen
8da579442f provide all variations of base macros for keeps 2010-05-28 19:56:49 +00:00
Jérémy Rosen
b824ad2013 generalize the overlay macros, 
...now all combination of _ROTATION_ _RESTRICTED[23]_ exist and work
in similar ways
 2010-05-28 19:46:48 +00:00
Jérémy Rosen
1125ee2b17 more terrain renaming/simplification 2010-05-28 19:09:51 +00:00
Jérémy Rosen
6462398289 add forgotten new file 2010-05-26 19:56:09 +00:00
Jérémy Rosen
52b41a6c65 thx to a few renaming, simplify the forest macros a lot. 
this could easily be changed into some generic overlay macros at some
point
 2010-05-26 19:55:42 +00:00
Jérémy Rosen
e343dc13de more macro reorganisation/generalization. 
ROTATION_RESTRICTED will have to wait before being generalized
 2010-05-26 18:32:40 +00:00
Jérémy Rosen
b631191992 move some macros from util.cfg to compat.cfg... 
...since we have better way to do that now. They are unused in mainline
 2010-05-25 21:43:14 +00:00
Jérémy Rosen
4fecf7396e remove macros marked for removal since 1.5.x 2010-05-24 21:05:33 +00:00
Jérémy Rosen
696aa1d222 reorganize single hex drawings (base, overlay, villages) 
to all derive from a common macro. Usage should be more
straightforward, all parameters and usage are similar. No expected
compatibility problems
 2010-05-24 20:53:21 +00:00
Jérémy Rosen
7420c59f24 generalize village macros using meta-macros 2010-05-24 18:39:30 +00:00
Jérémy Rosen
347dc8f816 change some terrain macros to more meaningful names 2010-05-24 17:47:02 +00:00
Lari Nieminen
3d4efe5687 Added latest version of Alarantalara's mine cart tracks. 2010-05-20 10:58:59 +00:00
Eric S. Raymond
2f971d999c More wmllint/wmlscope cleanups. 2010-05-16 12:41:44 +00:00
Jérémy Rosen
0357595dc0 merge all from the water animation branch... 
...except for the animated water which is not ready for mainline yet...
 2010-03-28 21:09:37 +00:00
Jérémy Rosen
cb526b0dae add special cases for tropical tree in water and great tree in water 2010-03-28 20:46:29 +00:00
Steven Panek
ee3d7b7305 Ran wmlindent on some things in the water_animation branch. 2010-03-07 10:12:35 +00:00
Jérémy Rosen
8c9690cc7c remove some useless anim modifications 2010-03-03 21:38:26 +00:00
Jérémy Rosen
bd908fd49a new terrain type: snowy terrain Cha and Kha 2010-02-26 15:49:42 +00:00
Lari Nieminen
e2af507b4b Changed the FLAG_IF_ADJACENT macro to be more comprehensible. 
Breaks existing usage, but probably there isn't any.
 2010-02-26 14:41:08 +00:00
Jérémy Rosen
69c49c1386 made all animated terrain use the new macro system 2010-02-21 09:01:03 +00:00
Jérémy Rosen
d1585ab7af add torch-lit stone walls as a new terrain Xol. 
also rework the macros to make it easier to have animations. Will port
existing animated terrains to the new system soon
 2010-02-20 11:54:34 +00:00
Jérémy Rosen
6b2d10cb91 add water animations in their current stage (which is still very primitive) 2010-02-17 21:43:02 +00:00
Eric S. Raymond
d236a9db2e All mainline macros are now type checked. 
mog, if you're watching, we should talk about this chamge. I had to
modify some code generated by meta-macros, and want to make sure the
meta-macros get tweaked in whatever way is needed to preserve the
changes.
 2010-02-16 16:00:26 +00:00
Eric S. Raymond
40198d42fe More macro argument type checking. 2010-02-16 03:12:00 +00:00
Eric S. Raymond
c4374f87e3 More macro argument type checking. No mismarches in mainline. 2010-02-15 21:46:31 +00:00
Eric S. Raymond
380c8e86e7 More macro argument type checking. No mismatches in mainline. 2010-02-15 14:32:20 +00:00
Eric S. Raymond
2794e6c9ba Yet more macro argument type checking. No mismatches in mainline. 2010-02-14 22:24:31 +00:00
Eric S. Raymond
01c943aca6 More typechecking for macro arguments. No mismatches in mainline. 2010-02-12 14:10:51 +00:00
Eric S. Raymond
1ba88575e2 More macro argument type checking. No mismatches in mainline. 2010-02-12 13:19:30 +00:00
Eric S. Raymond
10d109876f More macro argument type checking. No mismatches in mainline. 2010-02-12 03:39:42 +00:00
Eric S. Raymond
8992dccdbd More macro argument type abnnotations. No conflicts in mainline. 2010-02-11 14:57:19 +00:00
Eric S. Raymond
1ffaf699f7 More macro-formal-argument tweaks to enable type checking. 2010-02-07 13:32:13 +00:00
Jérémy Rosen
4393da63eb correct a typo in terrain code that probably was unnoticed since the 1.3 era 2010-01-27 21:04:56 +00:00
Lari Nieminen
130400c060 Fixed bug #14429 by tweaking KEEP_BASE a bit and using it... 
...instead of TERRAIN_BASE for castle and keep floors.
 2009-12-27 17:58:42 +00:00
Lari Nieminen
14e1eb0739 Wrote new simpler custom terrain graphics macros for forests... 
...and removed the directional next-to-castle variant images in favour
of non-directional small variants. Removed unused
TERRAIN_ADJACENT_VERTICAL and TERRAIN_ADJACENT_VERTICAL_FL macros. The
small pine and tropical tiles need work.
 2009-03-20 23:25:27 +00:00
Lari Nieminen
1cd8d4b416 Fixed layering issues with the 2x4 and 1x3 mountain tiles. 
The 1x3 mountains still don't work perfectly with forests, but at
least a bit better.
 2009-02-28 23:25:40 +00:00
Lari Nieminen
7de22f4645 Fixed layering problems with some mountain tiles (and trimmed some whitespace). 2009-02-28 22:12:27 +00:00
Lari Nieminen
3d3e267242 Made the mountains not layer on top of units... 
...except where it makes sense. Also tried to simplify some of the
mountains WML a little bit.
 2009-02-21 22:32:59 +00:00
Patrick Parker
c75b5b3d20 replace ##enddef with #!enddef... 
...so that it will be a comment instead of a directive.
 2008-11-02 05:44:06 +00:00
Eric S. Raymond
318486ce4b Reindent most of the data tree in preparation for making wmlindent smarter. 2008-08-28 17:57:00 +00:00
Eric S. Raymond
1f1fc2164f Re-enable macro argument type checking, and fix some glitches it turns up. 
Most changes in this diff just rename macro formal args so they match
what the type checker expects.
 2008-06-09 16:25:13 +00:00
Moritz Göbelbecker
9631f90b96 Move terrain-graphics/_final.cfg to terrain-graphics.cfg... 
...and include it after the campaigns.

This makes campaign specific terrains work without ugly workarounds.
 2008-05-18 21:40:55 +00:00
Moritz Göbelbecker
0a09602dea Fix collision of macro names. 2008-05-17 15:49:59 +00:00
Tommy
1765feaacd update indoor walls to use new image centering 2008-05-04 05:48:06 +00:00
Moritz Göbelbecker
9778e8f9a9 Added cave path terrain from musketaquid. string=Ur, currently aliased to flat. 2008-05-03 18:24:07 +00:00
Moritz Göbelbecker
7819881877 Fix z-layering of overlays 2008-04-30 15:34:49 +00:00