Author: muggenhor
Date: Tue Apr 29 00:03:05 2008
New Revision: 4850
URL: http://svn.gna.org/viewcvs/warzone?rev=4850&view=rev
Log:
Merged revisions r4833:4838, r4844:4849 into the 2.1 branch via svnmerge from
trunk
........
r4833 | muggenhor | 2008-04-28 02:41:59 +0200 (ma, 28 apr 2008) | 3 lines
* Add yet another Pygments lexer: LevelLexer which lexes .lev files
* Mark the .lev files as text/x-wzlev
........
r4834 | muggenhor | 2008-04-28 02:45:15 +0200 (ma, 28 apr 2008) | 1 line
Add the new LeveLexer from r4833 to the Python Egg as well
........
r4835 | per | 2008-04-28 18:35:37 +0200 (ma, 28 apr 2008) | 3 lines
Fix bug #11586: crash when reaching transport destination in mission beta 7
reported by Jan Dittberner. Smoke effect coordinates were not properly
clipped.
........
r4838 | muggenhor | 2008-04-28 18:51:03 +0200 (ma, 28 apr 2008) | 1 line
Add a Doxygen comment to function iV_GetTexture
........
r4844 | muggenhor | 2008-04-28 22:45:28 +0200 (ma, 28 apr 2008) | 1 line
Pass programCommand to dbgDumpInit() so that it can use that to set up debug
dump info
........
r4845 | muggenhor | 2008-04-28 22:46:33 +0200 (ma, 28 apr 2008) | 1 line
Allow proper linking of the exceptionhandler with the raw Makefile system
........
r4846 | muggenhor | 2008-04-28 22:58:13 +0200 (ma, 28 apr 2008) | 5 lines
Lets use some proper make rules!
* Use $@ and $< to refer to the targets and dependencies of make rules
* Don't refer to make rule dependencies and targets by copying them!
* Putting make rules on multiple lines isn't bad, in fact it increases
readability!
* Mark phony make rules (i.e. rules who's actions don't produce files) as
`.PHONY`
........
r4847 | muggenhor | 2008-04-28 23:16:51 +0200 (ma, 28 apr 2008) | 1 line
Only truncate the programPath if it's followed by an EOL
........
r4848 | per | 2008-04-28 23:34:16 +0200 (ma, 28 apr 2008) | 2 lines
Add highlighting for player flags in MP dialog. Icons by Elio.
........
r4849 | muggenhor | 2008-04-28 23:41:12 +0200 (ma, 28 apr 2008) | 1 line
Merge r4804 from the 2.1 branch into trunk (except for the removal of the
SQLite stuff from the XCode projectfile)
........
Modified:
branches/2.1/ (props changed)
branches/2.1/data/gamedesc.lev (props changed)
branches/2.1/data/images/frontend.img
branches/2.1/data/images/frontend4.png
branches/2.1/data/mp/addon.lev (props changed)
branches/2.1/lib/exceptionhandler/dumpinfo.cpp
branches/2.1/lib/exceptionhandler/dumpinfo.h
branches/2.1/lib/exceptionhandler/exceptionhandler.c
branches/2.1/lib/ivis_opengl/tex.c
branches/2.1/makerules/exe.mk
branches/2.1/makerules/lib.mk
branches/2.1/src/frend.h
branches/2.1/src/multiint.c
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
