Revision: 7436
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=7436&view=rev
Author: gitsvngateway
Date: 2009-05-15 21:00:33 +0000 (Fri, 15 May 2009)
Log Message:
-----------
Merge trunk into lua2.
From: Git SVN Gateway <[email protected]>
Modified Paths:
--------------
branches/lua2/COMPILE
branches/lua2/ChangeLog
branches/lua2/build_tools/autorevision/Makefile.am
branches/lua2/configure.ac
branches/lua2/data/base/images/intfac.img
branches/lua2/data/base/images/intfac5.png
branches/lua2/data/mods/multiplay/ntw/components/bodies/cybd_stdi.pie
branches/lua2/data/mods/multiplay/ntw/components/weapons/cy_mineswp.pie
branches/lua2/data/mods/multiplay/ntw/components/weapons/cy_snipe.pie
branches/lua2/data/mods/multiplay/ntw/components/weapons/gnhplsma.pie
branches/lua2/data/mods/multiplay/ntw/components/weapons/ic_mineswp.pie
branches/lua2/data/mods/multiplay/ntw/components/weapons/mine_vis.pie
branches/lua2/data/mods/multiplay/ntw/doc/readme.txt
branches/lua2/data/mods/multiplay/ntw/images/frontend0.png
branches/lua2/data/mods/multiplay/ntw/messages/strings/names.txt
branches/lua2/data/mods/multiplay/ntw/multiplay/script/autoenable.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/script/autoenable.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player0.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player0.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player1.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player1.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player2.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player2.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player3.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player3.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player4.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player4.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player5.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player5.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player6.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player6.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player7.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/player7.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/rules.slo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/rules.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/sk2tech.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/sk3tech.vlo
branches/lua2/data/mods/multiplay/ntw/multiplay/skirmish/sktech.slo
branches/lua2/data/mods/multiplay/ntw/stats/assignweapons.txt
branches/lua2/data/mods/multiplay/ntw/stats/body.txt
branches/lua2/data/mods/multiplay/ntw/stats/functions.txt
branches/lua2/data/mods/multiplay/ntw/stats/repair.txt
branches/lua2/data/mods/multiplay/ntw/stats/research/multiplayer/prresearch.txt
branches/lua2/data/mods/multiplay/ntw/stats/research/multiplayer/research.txt
branches/lua2/data/mods/multiplay/ntw/stats/research/multiplayer/resultcomponent.txt
branches/lua2/data/mods/multiplay/ntw/stats/research/multiplayer/resultstructure.txt
branches/lua2/data/mods/multiplay/ntw/stats/structuremodifier.txt
branches/lua2/data/mods/multiplay/ntw/stats/structures.txt
branches/lua2/data/mods/multiplay/ntw/stats/templates.txt
branches/lua2/data/mods/multiplay/ntw/stats/weaponmodifier.txt
branches/lua2/data/mods/multiplay/ntw/stats/weapons.txt
branches/lua2/data/mods/multiplay/ntw/stats/weaponsounds.txt
branches/lua2/data/mods/multiplay/ntw/structs/micool.pie
branches/lua2/data/mods/multiplay/ntw/structs/shield.pie
branches/lua2/data/mods/multiplay/ntw/texpages/page-10-laboratories.png
branches/lua2/data/mods/multiplay/ntw/wrf/multi/campaign-scav.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/campaign-scav2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/campaign-scav3.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/campaign.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/campaign2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/campaign3.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/skirmish2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/skirmish4.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/skirmish8.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/t2-skirmish2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/t2-skirmish4.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/t2-skirmish8.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/t3-skirmish2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/t3-skirmish4.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/multi/t3-skirmish8.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/piestats.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmem.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmem2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmem3.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmemc.wrf
branches/lua2/data/mp/messages/strings/names.txt
branches/lua2/data/mp/stats/functions.txt
branches/lua2/data/mp/stats/research/multiplayer/prresearch.txt
branches/lua2/data/mp/stats/research/multiplayer/redstructure.txt
branches/lua2/data/mp/stats/research/multiplayer/research.txt
branches/lua2/data/mp/stats/research/multiplayer/researchfunctions.txt
branches/lua2/data/mp/stats/structuremodifier.txt
branches/lua2/data/mp/stats/weaponmodifier.txt
branches/lua2/data/mp/stats/weapons.txt
branches/lua2/lib/betawidget/src/patternManager.c
branches/lua2/lib/betawidget/src/patternManager.h
branches/lua2/lib/framework/cursors16.c
branches/lua2/lib/framework/cursors32.c
branches/lua2/lib/framework/frame.c
branches/lua2/lib/framework/frame.h
branches/lua2/lib/framework/math_ext.h
branches/lua2/lib/framework/stdio_ext.h
branches/lua2/lib/framework/types.h
branches/lua2/lib/framework/utf.c
branches/lua2/lib/gamelib/gtime.c
branches/lua2/lib/ivis_common/imdload.c
branches/lua2/lib/ivis_common/ivisdef.h
branches/lua2/lib/ivis_common/rendmode.h
branches/lua2/lib/ivis_common/textdraw.h
branches/lua2/lib/ivis_opengl/GLee.c
branches/lua2/lib/ivis_opengl/piedraw.c
branches/lua2/lib/ivis_opengl/piematrix.c
branches/lua2/lib/ivis_opengl/piematrix.h
branches/lua2/lib/ivis_opengl/rendmode.c
branches/lua2/lib/ivis_opengl/textdraw.c
branches/lua2/lib/netplay/Makefile.am
branches/lua2/lib/netplay/netplay.c
branches/lua2/lib/netplay/netplay.h
branches/lua2/lib/sound/audio.c
branches/lua2/lib/sound/playlist.c
branches/lua2/lib/sound/track.c
branches/lua2/makerules/configure.mk
branches/lua2/pkg/dpkg/control
branches/lua2/pkg/nsis/warzone2100.nsi
branches/lua2/pkg/rpm/warzone2100.spec
branches/lua2/po/cs.po
branches/lua2/po/da.po
branches/lua2/po/de.po
branches/lua2/po/en_GB.po
branches/lua2/po/es.po
branches/lua2/po/fi.po
branches/lua2/po/fr.po
branches/lua2/po/fy.po
branches/lua2/po/ga.po
branches/lua2/po/it.po
branches/lua2/po/la.po
branches/lua2/po/lt.po
branches/lua2/po/nb.po
branches/lua2/po/nl.po
branches/lua2/po/pl.po
branches/lua2/po/pt.po
branches/lua2/po/pt_BR.po
branches/lua2/po/ro.po
branches/lua2/po/ru.po
branches/lua2/po/zh_CN.po
branches/lua2/src/Makefile.am
branches/lua2/src/action.c
branches/lua2/src/astar.c
branches/lua2/src/astar.h
branches/lua2/src/bridge.c
branches/lua2/src/bridge.h
branches/lua2/src/clparse.c
branches/lua2/src/combat.c
branches/lua2/src/component.c
branches/lua2/src/configuration.c
branches/lua2/src/design.c
branches/lua2/src/display.c
branches/lua2/src/display.h
branches/lua2/src/display3d.c
branches/lua2/src/droid.c
branches/lua2/src/effects.c
branches/lua2/src/effects.h
branches/lua2/src/fpath.c
branches/lua2/src/fpath.h
branches/lua2/src/game.c
branches/lua2/src/init.c
branches/lua2/src/intfac.h
branches/lua2/src/loadsave.c
branches/lua2/src/main.c
branches/lua2/src/map.c
branches/lua2/src/multigifts.c
branches/lua2/src/multiint.c
branches/lua2/src/multiint.h
branches/lua2/src/multijoin.c
branches/lua2/src/multimenu.c
branches/lua2/src/multimenu.h
branches/lua2/src/multiopt.c
branches/lua2/src/multistat.c
branches/lua2/src/order.c
branches/lua2/src/projectile.c
branches/lua2/src/projectile.h
branches/lua2/src/radar.c
branches/lua2/src/research.c
branches/lua2/src/scriptai.c
branches/lua2/src/seqdisp.c
branches/lua2/src/stats.c
branches/lua2/src/structure.c
branches/lua2/src/terrain.c
branches/lua2/src/visibility.c
branches/lua2/tools/masterserver/game.py
branches/lua2/tools/masterserver/ircbot.py
branches/lua2/tools/masterserver/protocol.py
branches/lua2/tools/masterserver/wzmasterserver.py
branches/lua2/tools/masterserver/wztest.py
branches/lua2/warzone2100.cbp
branches/lua2/win32/Warzone2100.vcproj
branches/lua2/win32/__BUILD_SCRIPT
branches/lua2/wscript
Added Paths:
-----------
branches/lua2/data/mods/multiplay/ntw/components/weapons/ccbase.pie
branches/lua2/data/mods/multiplay/ntw/effects/fxcammo2.pie
branches/lua2/data/mods/multiplay/ntw/effects/fxlflsh2.pie
branches/lua2/data/mods/multiplay/ntw/effects/fxlthrow2.pie
branches/lua2/data/mods/multiplay/ntw/messages/strings/genstrings.txt
branches/lua2/data/mods/multiplay/ntw/multiplay/maps/8c-new_teamwar/taglist.tag
branches/lua2/data/mods/multiplay/ntw/multiplay/maps/8c-new_teamwar2/taglist.tag
branches/lua2/data/mods/multiplay/ntw/multiplay/script/multiplay2.slo
branches/lua2/data/mods/multiplay/ntw/structs/blfact1.pie
branches/lua2/data/mods/multiplay/ntw/structs/blfact2.pie
branches/lua2/data/mods/multiplay/ntw/texpages/page-13-player-buildings.png
branches/lua2/data/mods/multiplay/ntw/texpages/page-15-droid-hubs.png
branches/lua2/data/mods/multiplay/ntw/texpages/page-16-droid-drives.png
branches/lua2/data/mp/messages/resmessages1.rmsg
branches/lua2/data/mp/messages/resmessages2.rmsg
branches/lua2/data/mp/messages/resmessages23.rmsg
branches/lua2/data/mp/messages/resmessages3.rmsg
branches/lua2/po/sl.po
Removed Paths:
-------------
branches/lua2/data/mods/multiplay/ntw/audio/sfx/vehicle/con-move off.ogg
branches/lua2/data/mods/multiplay/ntw/audio/sfx/vehicle/con-move.ogg
branches/lua2/data/mods/multiplay/ntw/audio/sfx/vehicle/con-shut down.ogg
branches/lua2/tools/masterserver/client.py
Property Changed:
----------------
branches/lua2/tools/masterserver/game.py
branches/lua2/tools/masterserver/protocol.py
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
