Mark de Wever
423c1c6191
Added support to use custom village mouse-over texts...
...
...depending on the ownership. Small header cleanup.
2007-01-06 19:16:04 +00:00
Mark de Wever
d308cb5b0f
merge trunk 2007-01-05T19:19:37Z!koraq@xs4all.nl..2007-01-06T11:38:54Z!koraq@xs4all.nl
...
(This includes the store location bug fix, which caused the tutorial
to malfunction on my system)
2007-01-06 11:51:49 +00:00
Mark de Wever
a5776ea930
Updated the status documentation
2007-01-06 11:38:54 +00:00
Mark de Wever
53a86c736c
Converted utils to the new terrain format,
...
only releveant for the macro STARTING_VILLAGES
2007-01-05 23:56:49 +00:00
Mark de Wever
2bdf8315a5
Converted factions to the new terrain format
2007-01-05 23:50:04 +00:00
Mark de Wever
2144c246da
Converted abilities to the new format,
...
the ugly format specifier is a temp solution.
2007-01-05 23:46:27 +00:00
Mark de Wever
e8c63b14ef
merge trunk 2007-01-03T22:00:18Z!koraq@xs4all.nl..2007-01-05T19:19:37Z!koraq@xs4all.nl
...
(with small change due to missing header after the header cleanup in trunk)
2007-01-05 19:53:12 +00:00
Mark de Wever
376f9b6a61
Updated the status documents
2007-01-05 19:19:37 +00:00
Mark de Wever
9c1bcc7209
Fixed the unit_height_adjust upon Zookeeper's suggestions
...
...and removed the submerge from the keeps.
2007-01-05 19:10:49 +00:00
Mark de Wever
d1e561bc4b
Hide the old keep in the editor so it's can't be used anymore.
...
Fixed a stupid typo bug in the shift of KEEP.
2007-01-05 18:54:37 +00:00
Mark de Wever
69cef5d280
Tested the code and did some small cleanups
2007-01-05 17:03:57 +00:00
Mark de Wever
11d1bc7f15
Tested the codepath, so comment no longer true
2007-01-04 18:57:11 +00:00
Mark de Wever
29d5c3a113
Fixed a small typo, not a bug since the value is ignored
2007-01-04 18:12:36 +00:00
Mark de Wever
5c0a611315
merge trunk 2007-01-02T20:37:30Z!david@torangan.de..2007-01-03T22:00:18Z!koraq@xs4all.nl
2007-01-03 22:26:57 +00:00
Mark de Wever
79678dc770
merge trunk 2007-01-02T20:21:22Z!david@torangan.de..2007-01-02T20:37:30Z!david@torangan.de (manual merge due to conflicts)
2007-01-03 22:00:18 +00:00
Mark de Wever
aa7e2e373d
merge trunk 2006-12-28T17:56:12Z!koraq@xs4all.nl..2007-01-02T20:21:22Z!david@torangan.de
2007-01-03 21:36:38 +00:00
Mark de Wever
8deb5eab53
A lot of small changes
...
* code cleanups
* src/play_controller.cpp had an terrain user which avoided detection
so far
* no longer initialize things like t_list x = t_list(); since seems
to be a bug on my system
2007-01-03 20:46:57 +00:00
Mark de Wever
e0d9f139a6
Mark movement_costs() and defense_mods() as candidate for inlining
2007-01-02 23:21:57 +00:00
Moritz Göbelbecker
edba3ab972
Fixed some transition glitches with mountains and forests
2007-01-02 21:04:59 +00:00
Moritz Göbelbecker
a24a093ada
Fixed some transition glitches with the swamp castle
2007-01-02 01:29:49 +00:00
Moritz Göbelbecker
ad090ae0f8
Added icons for the various keeps
2007-01-02 01:27:58 +00:00
Moritz Göbelbecker
9ffc32391c
Ported changes in terrain-graphics wml from trunk
2007-01-01 18:30:14 +00:00
Moritz Göbelbecker
c004b80af6
Fixed some keep bugs
2006-12-31 16:40:49 +00:00
Mark de Wever
8a8f41a83b
merge trunk 2006-12-22T16:22:30Z!koraq@xs4all.nl..2006-12-28T17:56:12Z!koraq@xs4all.nl
2006-12-28 19:16:27 +00:00
Mark de Wever
1f7a5cd8b0
Fixed a bug, if the new map format didn't end with an EOL...
...
...the reader would enter an infinite loop. Due to the fact
(int)std::npos == -1.
2006-12-28 17:56:12 +00:00
Mark de Wever
d6fea968fa
Fixed the filter_location...
...
...the code however is not nice uses some trick to maintain backwards
compability. But it works.
2006-12-28 13:54:48 +00:00
Mark de Wever
bf4d555141
The random maps are now using the new terrain strings,
...
...during the conversion some problems surfaced.
Terrain matching with additional spaces failed so terrains are now
written without extra spaces. Only maps will still get the extra
spaces. Fixed another small bug where mapgen still assumed a terrain
consists of one char.
2006-12-28 11:36:39 +00:00
Mark de Wever
cbf99a3f1f
Make it possible to recruit on the new keeps.
2006-12-22 20:31:34 +00:00
Mark de Wever
2cf0e78e35
Merged 14820 from the 1.2 branch
2006-12-22 20:06:53 +00:00
Mark de Wever
d9c380da83
merge trunk 2006-12-19T18:59:45Z!crazy-ivanovic@gmx.net..2006-12-22T16:22:30Z!koraq@xs4all.nl
2006-12-22 16:41:37 +00:00
Mark de Wever
eacd46d1ba
merge trunk 2006-12-10T11:31:19Z!koraq@xs4all.nl..2006-12-19T18:59:45Z!crazy-ivanovic@gmx.net
2006-12-22 16:07:44 +00:00
John W. C. McNabb
8711ffdd7e
auto backup for map conversion
2006-12-22 02:57:27 +00:00
John W. C. McNabb
af9991697d
updates to map_convert
2006-12-22 02:46:00 +00:00
Mark de Wever
08a2de6c58
Documentation and status updates
2006-12-21 19:47:40 +00:00
Mark de Wever
23f0c44f32
Made most parts of the editor working again,
...
...not the most beautiful solution but it works again. Some parts need
to be reworked later.
2006-12-21 19:35:13 +00:00
Mark de Wever
be813b194d
a lot of cleanups and code reorganisations
2006-12-20 19:04:36 +00:00
Mark de Wever
a99d5ff714
Fixed a glitch in the human show hill villages, having no base terrain image
2006-12-20 19:01:55 +00:00
Mark de Wever
53d0f1120f
Fixed the translations of the starting positions
2006-12-20 18:14:37 +00:00
Mark de Wever
c8f563acf4
Fixed a small typo in the desert road configuration
2006-12-19 21:54:56 +00:00
John W. C. McNabb
aabd98bbec
first try at a map conversion script
2006-12-18 21:59:29 +00:00
Mark de Wever
1d574dd7ef
removed debug comment and reanabled the cathcing of bad_alloc
2006-12-15 16:42:18 +00:00
Mark de Wever
f7f25037e8
Fixed a bug in some transitions...
...
...due to the fact that an empty string should match.
Added some consts to items which are const.
2006-12-15 16:40:37 +00:00
Mark de Wever
2e057bb986
A lot of cleanups by removing debug code
...
Speed improvements
* get_mask_ is rewritten, looks better and is about twice as fast
* the terrain matching code now has a cache structure defined
this is used in the builder since it does a lot of matching
the speed increase is noticable.
2006-12-13 17:59:49 +00:00
Mark de Wever
29156f0d72
Fix and error in the config file, the 3 bridge items are 1 parameter.
2006-12-13 16:19:00 +00:00
Mark de Wever
1c614b9bcb
Fixed the resizing of the map,
...
...the other manipulation functions are most likely still broken. These
will be looked after later.
2006-12-12 19:15:16 +00:00
Mark de Wever
d22e4cbb68
[[debug and test code]]
...
* Commented out the debug code in builder don't want to remove it yet
but hope it speeds things up a tiny bit.
* Added some testing code to measure the overhead of the many resize operations
in vectors, the overhead seems to be low.
* Some updates in the todo lists
2006-12-11 19:30:35 +00:00
Moritz Göbelbecker
170e0bcacc
Fixed glitches with sunken castle
2006-12-11 17:15:45 +00:00
Mark de Wever
2b151eddbc
Fixed the wildcard mask...
...
...another stupid mistake with caused various characters
be seen as wildcard. Added some extra debug info in the process.
2006-12-10 15:09:33 +00:00
Mark de Wever
7ab54bed1d
merge trunk 2006-12-03T13:32:46Z!koraq@xs4all.nl..2006-12-10T11:31:19Z!koraq@xs4all.nl
2006-12-10 12:46:13 +00:00
Mark de Wever
246b153665
updated status lists
2006-12-10 11:31:19 +00:00
