Author: muggenhor
Date: Mon Oct 20 13:50:36 2008
New Revision: 6195
URL: http://svn.gna.org/viewcvs/warzone?rev=6195&view=rev
Log:
* Merged revisions r5539 and r5782 into the 2.1 branch via svnmerge from trunk
* Mark r5773 as backported (r5847 took care of that)
Addresses #17
........
r5539 | muggenhor | 2008-07-14 00:25:44 +0200 (ma, 14 jul 2008) | 3 lines
Read some scripts using their __lower-case__ name (as these file's names are
lower-case)
This might fix bug #12011
........
r5782 | per | 2008-08-07 18:02:22 +0200 (do, 07 aug 2008) | 4 lines
Fix bug #12121: Map: Highway broken with 2.1. Be more lenient with broken
maps, since we do not
have a map editor that we can fix: If the next feature in the map overlaps
another, remove the
already placed feature in favour of the new one.
........
Modified:
branches/2.1/ (props changed)
branches/2.1/data/mp/multiplay/script/cam2tech.vlo
branches/2.1/data/mp/multiplay/script/cam3tech.vlo
branches/2.1/data/multiplay/script/cam2tech.vlo
branches/2.1/data/multiplay/script/cam3tech.vlo
branches/2.1/data/script/data/cam2tech.vlo
branches/2.1/data/script/data/cam3-2tech.vlo
branches/2.1/data/script/data/cam3btech.vlo
branches/2.1/data/script/data/cam3tech.vlo
branches/2.1/data/script/text/tech.slo
branches/2.1/src/feature.c
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
