f9ad00be24
Merge branch 'bugfixes'
2013-01-21 08:00:28 +01:00
5afffc2f9b
Remove old autogenerated notice, add notice that tools/image is no longer useful.
...
Icons are now always in separate image files (and joined at run-time), so there is currently no tool which
autogenerates the header. The header should be updated manually, if adding new icons.
Fixes ticket:3886.
2013-01-18 08:53:36 +01:00
5db445fd58
Merge branch 'bugfixes'
2013-01-16 16:29:01 -05:00
d873d313ad
Remove EditWorld from source tree.
...
This only worked on windows, used DX (5/6), and MFC, and will not compile 'as is'.
Even if you could get it to compile, the data it produces will not work with the
current Warzone builds.
For a map editor, it is highly suggested you use FLaME. https://github.com/Warzone2100/flaME
2013-01-16 16:11:48 -05:00
6c6fe7c38a
Merge branch 'bugfixes'
...
Conflicts:
src/e3demo.cpp
src/e3demo.h
2013-01-16 15:44:22 -05:00
e34e7e4e0c
Seems time don't stop, so bump the year to 2013.
2013-01-16 15:34:57 -05:00
a37a9ea5a2
qwzm: Build fix
2013-01-12 20:19:02 +01:00
1193559f53
Merge branch 'bugfixes'
...
* bugfixes:
Make configure fail if it doesn't find flex.
Update the default layout for CS-ID.xcconfig.
Emit warnings on improperly / unsigned frameworks.
Do not rely on the default Designated Requirements.
stats: Prevent double-counting of wins/losses.
stats: Use actual number of games played when drawing medals.
stats: Actually save stats, so players aren't stuck with the pacifier forever.
Prevent updating autorevision.h's timestamp when its contents haven't changed
Prevent out-of-bounds array access
map2preview: handle unknown tilesets
Conflicts:
src/multiint.cpp
2013-01-07 15:27:58 +01:00
759b4cc38d
map2preview: handle unknown tilesets
...
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2013-01-04 10:30:10 +01:00
b52a42cad3
Add csv2ini tool. Closes ticket:3792
2012-11-19 23:14:31 +01:00
40b3e02ffc
Merge branch 'bugfixes'
2012-11-03 00:42:03 +01:00
182e884552
Rename autorevision.tmp to src/autorevision.cache.
...
Also remove another stray backslash, now make distcheck should work
again.
2012-10-30 17:35:58 +01:00
207248f977
Add a few forgotten files to the tarball.
2012-10-27 17:48:35 -04:00
41738d947c
Merge branch 'bugfixes'. Kept master fix for stored template filenames.
...
Conflicts:
src/intdisplay.cpp
src/multiint.cpp
src/template.cpp
tools/map/mapload.cpp
2012-10-27 00:19:18 +02:00
2cb06fb92a
Make ‘make distcheck’ pass.
...
Do not check that maps are one of arizona, urban or rockies.
2012-10-01 18:12:43 +02:00
385b16f413
statseditor: Show propulsions
2012-08-12 22:57:23 +02:00
2a649ee994
statsedit: Display body.ini in familiar row/column format.
2012-08-11 17:29:39 +02:00
5c30f35c12
Yet another stats editor
2012-08-11 17:29:39 +02:00
7bc528ebd7
Merge branch 'bugfixes'
...
Conflicts:
src/qtscriptfuncs.cpp
2012-06-25 21:37:47 +02:00
43f9036607
Do not install map tools. Closes ticket:3494
2012-06-17 11:49:14 +02:00
7107400b2b
Merge branch 'bugfixes'
2012-06-08 08:00:11 +02:00
c94112b6b3
Fix .gitignore.
...
The tools/image/image in .gitignore was mysteriously changed to be a directory only in
c346e9ebb6
2012-06-05 23:20:29 +02:00
fbd757b515
Use a faster optipng option set that also strips metadata.
...
Requires optipng 0.7.1+ to work.
2012-06-05 16:13:57 -04:00
c346e9ebb6
Add a mac build for the image helper program.
2012-06-05 15:35:19 -04:00
1a03fc34f9
Merge branch 'bugfixes'
2012-04-23 06:00:09 +02:00
bfbe5bbb24
Update player number for lint.cpp and the map conversion tools.
2012-04-22 17:32:24 +02:00
09ba151163
Merge branch 'bugfixes'
...
* bugfixes:
Readd skirmish/mp research messages, converted to .ini.
Add .rmsg to .ini converter by Emdek.
Reduce log spam for unknown messages.
2012-03-14 21:10:33 +01:00
e97a298155
Add .rmsg to .ini converter by Emdek.
2012-03-14 21:09:19 +01:00
d7468250ac
clang warning fixes
2012-03-06 22:26:57 +01:00
a1fc808e6b
Update the MapUtilities xcode project.
2012-02-25 16:44:26 -05:00
3e15039aa6
Unfortunately, the Project can't stop time, so bump the year.
2012-02-11 16:50:52 -05:00
4af296f79a
Update the ticketvalidemail plugin to work as part of the spam filter.
...
Update the url info and add some logging.
2012-01-26 22:54:09 -05:00
b06e3b3312
Remove left-over code in pre-multiplied tool.
...
Made the brightness of the alpha-blended texture be treated as the alpha mask itself.
2012-01-10 11:49:02 +01:00
532ff19b22
Add tool for composing an additive effect followed by an alpha-blended effect into a single pre-multiplied alpha effect.
2012-01-08 17:36:08 +01:00
b412744fb2
Update .gitignore.
2011-12-26 21:51:56 +01:00
6c8e465bc5
Move the map tools builds out of the main xcode project.
2011-12-16 15:35:02 -05:00
fec056d409
Change subtitle timing from frames to seconds.
...
Based on patches by Emdek and Beliar. Closes #748 .
2011-12-11 20:13:01 +01:00
eae0650a57
Keep built files out of the main directory.
2011-11-28 22:45:50 +01:00
dd4b5322e9
Make simplipie not output spaces at the end of vertex lines.
2011-11-27 02:22:43 +01:00
8034045046
Compile fix
2011-11-19 23:54:13 +01:00
74d92a17e4
Make source compatible with physfs 1 again.
2011-11-06 23:23:42 +01:00
3e53f79675
mapconv: Add command line option -cam to generate map data appropriate for campaign.
2011-10-29 16:47:31 -04:00
554bf6b380
Fix build warnings
2011-09-25 23:55:24 -04:00
f282cc289c
Fix some warn-unused-result warnings.
...
Wasn't compiling with -Werror.
2011-09-02 12:07:18 +02:00
ca8595f25a
Make sure that structure IDs are never zero for converted maps. Fixes ticket:2833
2011-07-31 22:49:55 +02:00
bc26936424
Further improve documentation of map/pngsave.h.
2011-07-30 17:29:31 +00:00
6bf33d2000
Fix autotools compilation of map2preview (reverts some parts of 65e00db411).
2011-07-30 17:29:31 +00:00
a899f46775
Add the map tools to the xcode project.
2011-07-30 00:39:56 -04:00
65e00db411
Remove Qt dependency from map tools.
...
Place origin at the top of the preview image.
Fix bug for ARGB32 method for map tool png saving rootines and add RGB888 method.
No longer stretch the preview image.
2011-07-29 22:16:59 +00:00
e1f78ed5fb
Fix comments and documentation of variables whose meaning and name were modified.
...
Also remove use of inexistant variable.
2011-07-27 23:25:02 +00:00
automerge
Cyp
vexed
per
cybersphinx
Giel van Schijndel
felippico
dak180
i-nod
safety0ff