Revision: 7037
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=7037&view=rev
Author: gitsvngateway
Date: 2009-04-16 18:12:39 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
Merge trunk into the lua2 branch.
From: Gerard Krol <[email protected]>
Modified Paths:
--------------
branches/lua2/.gitignore
branches/lua2/AUTHORS
branches/lua2/ChangeLog
branches/lua2/configure.ac
branches/lua2/data/base/components/bodies/drhbod11.pie
branches/lua2/data/mods/global/makefile.win32
branches/lua2/data/mods/multiplay/makefile.win32
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/mp/messages/strings/names.txt
branches/lua2/data/mp/stats/construction.txt
branches/lua2/data/mp/stats/functions.txt
branches/lua2/data/mp/stats/propulsion.txt
branches/lua2/data/mp/stats/propulsiontype.txt
branches/lua2/data/mp/stats/research/multiplayer/prresearch.txt
branches/lua2/data/mp/stats/research/multiplayer/redcomponents.txt
branches/lua2/data/mp/stats/research/multiplayer/research.txt
branches/lua2/data/mp/stats/research/multiplayer/researchstruct.txt
branches/lua2/data/mp/stats/research/multiplayer/resultcomponent.txt
branches/lua2/data/mp/stats/research/multiplayer/resultstructure.txt
branches/lua2/data/mp/stats/sensor.txt
branches/lua2/data/mp/stats/structuremodifier.txt
branches/lua2/data/mp/stats/structures.txt
branches/lua2/data/mp/stats/weaponmodifier.txt
branches/lua2/data/mp/stats/weapons.txt
branches/lua2/data/mp/wrf/piestats.wrf
branches/lua2/data/mp/wrf/vidmem.wrf
branches/lua2/data/mp/wrf/vidmem2.wrf
branches/lua2/data/mp/wrf/vidmem3.wrf
branches/lua2/data/mp/wrf/vidmemc.wrf
branches/lua2/lib/betawidget/src/Makefile.am
branches/lua2/lib/betawidget/src/betawidget.i
branches/lua2/lib/betawidget/src/button.c
branches/lua2/lib/betawidget/src/button.h
branches/lua2/lib/betawidget/src/hBox.c
branches/lua2/lib/betawidget/src/hBox.h
branches/lua2/lib/betawidget/src/platform/sdl/init.c
branches/lua2/lib/betawidget/src/platform/sdl/time.c
branches/lua2/lib/betawidget/src/svgManager.c
branches/lua2/lib/betawidget/src/table.c
branches/lua2/lib/betawidget/src/vector.c
branches/lua2/lib/betawidget/src/widget.c
branches/lua2/lib/betawidget/src/widget.h
branches/lua2/lib/betawidget/src/window.c
branches/lua2/lib/betawidget/src/window.h
branches/lua2/lib/betawidget/tools/Makefile.am
branches/lua2/lib/betawidget/tools/sdl-testapp.c
branches/lua2/lib/betawidget/tools/sdl-testapp.lua
branches/lua2/lib/exceptionhandler/dumpinfo.cpp
branches/lua2/lib/framework/lexer_input.h
branches/lua2/lib/framework/stdio_ext.h
branches/lua2/lib/framework/wzglobal.h
branches/lua2/lib/ivis_common/imdload.c
branches/lua2/lib/ivis_opengl/piedraw.c
branches/lua2/lib/ivis_opengl/screen.c
branches/lua2/lib/netplay/netlog.c
branches/lua2/lib/netplay/netplay.c
branches/lua2/lib/netplay/netplay.h
branches/lua2/lib/script/stack.c
branches/lua2/lib/sequence/sequence.c
branches/lua2/macosx/Warzone.xcodeproj/project.pbxproj
branches/lua2/pkg/nsis/warzone2100.nsi
branches/lua2/pkg/nsis/warzone2100.update.nsi
branches/lua2/src/action.c
branches/lua2/src/ai.c
branches/lua2/src/astar.c
branches/lua2/src/combat.c
branches/lua2/src/configuration.c
branches/lua2/src/configuration.h
branches/lua2/src/display.c
branches/lua2/src/display3d.c
branches/lua2/src/display3d.h
branches/lua2/src/droid.c
branches/lua2/src/droid.h
branches/lua2/src/feature.c
branches/lua2/src/frontend.c
branches/lua2/src/function.c
branches/lua2/src/game.c
branches/lua2/src/gateway.c
branches/lua2/src/gateway.h
branches/lua2/src/hci.c
branches/lua2/src/init.c
branches/lua2/src/keybind.c
branches/lua2/src/keymap.c
branches/lua2/src/main.c
branches/lua2/src/mapgrid.c
branches/lua2/src/mission.c
branches/lua2/src/mission.h
branches/lua2/src/move.h
branches/lua2/src/multigifts.c
branches/lua2/src/multiint.c
branches/lua2/src/multiint.h
branches/lua2/src/multijoin.c
branches/lua2/src/multiplay.c
branches/lua2/src/multiplay.h
branches/lua2/src/objects.c
branches/lua2/src/objects.h
branches/lua2/src/order.c
branches/lua2/src/research.c
branches/lua2/src/scriptai.c
branches/lua2/src/scriptfuncs.c
branches/lua2/src/stats-db2.c
branches/lua2/src/stats-db2.h
branches/lua2/src/stats-db2.tpl
branches/lua2/src/stats.c
branches/lua2/src/stats.h
branches/lua2/src/statsdef.h
branches/lua2/src/structure.c
branches/lua2/src/terrain.c
branches/lua2/src/version.h
branches/lua2/src/visibility.c
branches/lua2/src/visibility.h
branches/lua2/tests/maptest.c
branches/lua2/tools/conversion/obj2pie.c
branches/lua2/tools/display/wzmutils.h
branches/lua2/tools/editworld/src/res/btedit.rc2
branches/lua2/tools/map/mapload.c
branches/lua2/tools/masterserver/wzmasterserver.py
Added Paths:
-----------
branches/lua2/data/base/structs/radarsensor.pie
branches/lua2/data/base/texpages/page-59-more-weapons.png
branches/lua2/doc/SQLite-stats-status.tex
branches/lua2/lib/betawidget/src/imageButton.c
branches/lua2/lib/betawidget/src/imageButton.h
branches/lua2/lib/betawidget/src/patternManager.c
branches/lua2/lib/betawidget/src/patternManager.h
branches/lua2/lib/betawidget/tools/patterns.lua
branches/lua2/lib/betawidget/tools/tank.svg
branches/lua2/tools/gitsvngateway/
branches/lua2/tools/gitsvngateway/gitsvngateway
branches/lua2/tools/lobby/client.py
branches/lua2/tools/lobby/ircbot.py
Removed Paths:
-------------
branches/lua2/tools/lobbyserver_cpp/COPYING
branches/lua2/tools/lobbyserver_cpp/autogen.sh
branches/lua2/tools/lobbyserver_cpp/configure.ac
branches/lua2/tools/lobbyserver_cpp/src/lobby/game.cpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/game.hpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/lobby.cpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/lobby.hpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/lobby_gamelock.cpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/lobby_iterator.cpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/lobby_iterator.hpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/raii_counter.cpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/raii_counter.hpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/read_write_mutex.cpp
branches/lua2/tools/lobbyserver_cpp/src/lobby/read_write_mutex.hpp
branches/lua2/tools/lobbyserver_cpp/src/main.cpp
branches/lua2/tools/lobbyserver_cpp/src/makefile.win32
branches/lua2/tools/lobbyserver_cpp/src/networking/nattester.cpp
branches/lua2/tools/lobbyserver_cpp/src/networking/nattester.hpp
branches/lua2/tools/lobbyserver_cpp/src/networking/tcp_server.cpp
branches/lua2/tools/lobbyserver_cpp/src/networking/tcp_server.hpp
branches/lua2/tools/lobbyserver_cpp/src/requesthandler.cpp
branches/lua2/tools/lobbyserver_cpp/src/requesthandler.hpp
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
