Author: muggenhor
Date: Fri Dec 21 23:22:50 2007
New Revision: 3116

URL: http://svn.gna.org/viewcvs/warzone?rev=3116&view=rev
Log:
 * Merge r2870:3115 from trunk into the netcode branch

Added:
    branches/netcode/data/mods/global/newst_tiles/
      - copied from r3115, trunk/data/mods/global/newst_tiles/
    branches/netcode/lib/framework/framework.vcproj
      - copied unchanged from r3115, trunk/lib/framework/framework.vcproj
    branches/netcode/lib/gamelib/gamelib.vcproj
      - copied unchanged from r3115, trunk/lib/gamelib/gamelib.vcproj
    branches/netcode/lib/ivis_common/ivis_common.vcproj
      - copied unchanged from r3115, trunk/lib/ivis_common/ivis_common.vcproj
    branches/netcode/lib/ivis_opengl/ivis_opengl.vcproj
      - copied unchanged from r3115, trunk/lib/ivis_opengl/ivis_opengl.vcproj
    branches/netcode/lib/netplay/netplay.vcproj
      - copied unchanged from r3115, trunk/lib/netplay/netplay.vcproj
    branches/netcode/lib/script/script.vcproj
      - copied unchanged from r3115, trunk/lib/script/script.vcproj
    branches/netcode/lib/sequence/sequence.vcproj
      - copied unchanged from r3115, trunk/lib/sequence/sequence.vcproj
    branches/netcode/lib/sound/openal_error.c
      - copied unchanged from r3115, trunk/lib/sound/openal_error.c
    branches/netcode/lib/sound/openal_error.h
      - copied unchanged from r3115, trunk/lib/sound/openal_error.h
    branches/netcode/lib/sound/sound.vcproj
      - copied unchanged from r3115, trunk/lib/sound/sound.vcproj
    branches/netcode/lib/widget/widget.vcproj
      - copied unchanged from r3115, trunk/lib/widget/widget.vcproj
    branches/netcode/macosx/Resources/Popt-Info.plist
      - copied unchanged from r3115, trunk/macosx/Resources/Popt-Info.plist
    branches/netcode/macosx/Resources/QuesoGLC-Info.plist
      - copied unchanged from r3115, trunk/macosx/Resources/QuesoGLC-Info.plist
Removed:
    branches/netcode/NEWS
    branches/netcode/README
    branches/netcode/debian/docs
    branches/netcode/src/arrow.c
    branches/netcode/src/arrow.h
Modified:
    branches/netcode/AUTHORS
    branches/netcode/ChangeLog
    branches/netcode/Doxyfile
    branches/netcode/Makefile.am
    branches/netcode/autogen.sh   (contents, props changed)
    branches/netcode/build_tools/autorevision/Makefile.am
    branches/netcode/build_tools/autorevision/autorevision.vcproj
    branches/netcode/configure.ac
    branches/netcode/data/Makefile.am
    branches/netcode/data/images/intfac.img
    branches/netcode/data/images/intfac0.png
    branches/netcode/data/mods/global/Makefile.am
    branches/netcode/data/testdata/tagfile_basic.def
    branches/netcode/data/testdata/tagfile_map.def
    branches/netcode/data/texpages/tertilesc1hw-128/tile-13.png
    branches/netcode/data/texpages/tertilesc1hw-128/tile-15.png
    branches/netcode/data/texpages/tertilesc1hw-128/tile-16.png
    branches/netcode/data/texpages/tertilesc1hw-16/tile-13.png
    branches/netcode/data/texpages/tertilesc1hw-16/tile-15.png
    branches/netcode/data/texpages/tertilesc1hw-16/tile-16.png
    branches/netcode/data/texpages/tertilesc1hw-32/tile-13.png
    branches/netcode/data/texpages/tertilesc1hw-32/tile-15.png
    branches/netcode/data/texpages/tertilesc1hw-32/tile-16.png
    branches/netcode/data/texpages/tertilesc1hw-64/tile-13.png
    branches/netcode/data/texpages/tertilesc1hw-64/tile-15.png
    branches/netcode/data/texpages/tertilesc1hw-64/tile-16.png
    branches/netcode/data/texpages/tertilesc2hw-128/tile-14.png
    branches/netcode/data/texpages/tertilesc2hw-128/tile-24.png
    branches/netcode/data/texpages/tertilesc2hw-128/tile-25.png
    branches/netcode/data/texpages/tertilesc2hw-16/tile-14.png
    branches/netcode/data/texpages/tertilesc2hw-16/tile-24.png
    branches/netcode/data/texpages/tertilesc2hw-16/tile-25.png
    branches/netcode/data/texpages/tertilesc2hw-32/tile-14.png
    branches/netcode/data/texpages/tertilesc2hw-32/tile-24.png
    branches/netcode/data/texpages/tertilesc2hw-32/tile-25.png
    branches/netcode/data/texpages/tertilesc2hw-64/tile-14.png
    branches/netcode/data/texpages/tertilesc2hw-64/tile-24.png
    branches/netcode/data/texpages/tertilesc2hw-64/tile-25.png
    branches/netcode/debian/changelog
    branches/netcode/debian/control
    branches/netcode/debian/rules
    branches/netcode/doc/Readme.de   (props changed)
    branches/netcode/doc/Readme.de.xhtml   (props changed)
    branches/netcode/doc/Readme.en   (props changed)
    branches/netcode/doc/Readme.en.xhtml   (props changed)
    branches/netcode/doc/styles/readme.print.css   (contents, props changed)
    branches/netcode/doc/styles/readme.screen.css   (contents, props changed)
    branches/netcode/doc/styles/scriptingmanual.css   (props changed)
    branches/netcode/icons/Makefile.am
    branches/netcode/icons/warzone2100.desktop
    branches/netcode/lib/framework/config-macosx.h
    branches/netcode/lib/framework/exceptionhandler.c
    branches/netcode/lib/framework/frameresource.c
    branches/netcode/lib/framework/frameresource.h
    branches/netcode/lib/framework/macros.h
    branches/netcode/lib/framework/printf_ext.c
    branches/netcode/lib/framework/printf_ext.h
    branches/netcode/lib/framework/strres.c
    branches/netcode/lib/framework/tagfile.c
    branches/netcode/lib/framework/tagfile.h
    branches/netcode/lib/framework/treap.c
    branches/netcode/lib/framework/treap.h
    branches/netcode/lib/ivis_common/imd.c
    branches/netcode/lib/ivis_common/imdload.c
    branches/netcode/lib/ivis_common/ivisdef.h
    branches/netcode/lib/ivis_common/ivispatch.h
    branches/netcode/lib/ivis_common/pieblitfunc.h
    branches/netcode/lib/ivis_common/pieclip.c
    branches/netcode/lib/ivis_common/pieclip.h
    branches/netcode/lib/ivis_common/piedef.h
    branches/netcode/lib/ivis_common/piefunc.h
    branches/netcode/lib/ivis_common/piepalette.h
    branches/netcode/lib/ivis_common/piestate.c
    branches/netcode/lib/ivis_common/piestate.h
    branches/netcode/lib/ivis_common/pievector.h
    branches/netcode/lib/ivis_common/rendmode.h
    branches/netcode/lib/ivis_common/textdraw.h
    branches/netcode/lib/ivis_opengl/pieblitfunc.c
    branches/netcode/lib/ivis_opengl/piedraw.c
    branches/netcode/lib/ivis_opengl/piefunc.c
    branches/netcode/lib/ivis_opengl/piematrix.c
    branches/netcode/lib/ivis_opengl/piematrix.h
    branches/netcode/lib/ivis_opengl/piemode.c
    branches/netcode/lib/ivis_opengl/piepalette.c
    branches/netcode/lib/ivis_opengl/piestate.c
    branches/netcode/lib/ivis_opengl/screen.c
    branches/netcode/lib/ivis_opengl/textdraw.c
    branches/netcode/lib/netplay/netplay.c
    branches/netcode/lib/netplay/netplay.h
    branches/netcode/lib/netplay/nettypes.c
    branches/netcode/lib/script/chat_lexer.l
    branches/netcode/lib/script/event.c
    branches/netcode/lib/script/event.h
    branches/netcode/lib/script/script.c
    branches/netcode/lib/script/script.h
    branches/netcode/lib/script/script_lexer.l
    branches/netcode/lib/sound/Makefile.am
    branches/netcode/lib/sound/Makefile.raw
    branches/netcode/lib/sound/audio.c
    branches/netcode/lib/sound/audio.h
    branches/netcode/lib/sound/openal_track.c
    branches/netcode/lib/sound/track.c
    branches/netcode/lib/sound/track.h
    branches/netcode/lib/sound/tracklib.h
    branches/netcode/lib/widget/bar.c
    branches/netcode/lib/widget/bar.h
    branches/netcode/lib/widget/button.c
    branches/netcode/lib/widget/button.h
    branches/netcode/lib/widget/editbox.c
    branches/netcode/lib/widget/editbox.h
    branches/netcode/lib/widget/form.c
    branches/netcode/lib/widget/form.h
    branches/netcode/lib/widget/label.c
    branches/netcode/lib/widget/label.h
    branches/netcode/lib/widget/slider.c
    branches/netcode/lib/widget/slider.h
    branches/netcode/lib/widget/tip.c
    branches/netcode/lib/widget/tip.h
    branches/netcode/lib/widget/widgbase.h
    branches/netcode/lib/widget/widget.c
    branches/netcode/lib/widget/widget.h
    branches/netcode/macosx/Warzone.xcodeproj/project.pbxproj
    branches/netcode/nsis/warzone2100.nsi
    branches/netcode/nsis/warzone2100.update.nsi
    branches/netcode/po/POTFILES.in
    branches/netcode/po/da.po
    branches/netcode/po/de.po
    branches/netcode/po/la.po
    branches/netcode/po/nb.po
    branches/netcode/po/nl.po
    branches/netcode/src/Makefile.am
    branches/netcode/src/Makefile.raw
    branches/netcode/src/action.c
    branches/netcode/src/advvis.c
    branches/netcode/src/ai.c
    branches/netcode/src/aiexperience.c
    branches/netcode/src/astar.c
    branches/netcode/src/atmos.c
    branches/netcode/src/aud.c
    branches/netcode/src/basedef.h
    branches/netcode/src/bridge.c
    branches/netcode/src/bucket3d.c
    branches/netcode/src/bucket3d.h
    branches/netcode/src/cheat.c
    branches/netcode/src/clparse.c
    branches/netcode/src/cluster.c
    branches/netcode/src/combat.c
    branches/netcode/src/component.c
    branches/netcode/src/configuration.c
    branches/netcode/src/console.c
    branches/netcode/src/design.c
    branches/netcode/src/design.h
    branches/netcode/src/display.c
    branches/netcode/src/display.h
    branches/netcode/src/display3d.c
    branches/netcode/src/display3d.h
    branches/netcode/src/display3ddef.h
    branches/netcode/src/drive.c
    branches/netcode/src/droid.c
    branches/netcode/src/droid.h
    branches/netcode/src/e3demo.c
    branches/netcode/src/e3demo.h
    branches/netcode/src/effects.c
    branches/netcode/src/feature.c
    branches/netcode/src/feature.h
    branches/netcode/src/formation.c
    branches/netcode/src/fpath.c
    branches/netcode/src/frontend.c
    branches/netcode/src/frontend.h
    branches/netcode/src/game.c
    branches/netcode/src/geometry.c
    branches/netcode/src/hci.c
    branches/netcode/src/hci.h
    branches/netcode/src/ingameop.c
    branches/netcode/src/init.c
    branches/netcode/src/intdisplay.c
    branches/netcode/src/intdisplay.h
    branches/netcode/src/intelmap.c
    branches/netcode/src/intfac.h
    branches/netcode/src/intimage.c
    branches/netcode/src/intorder.c
    branches/netcode/src/keybind.c
    branches/netcode/src/keybind.h
    branches/netcode/src/keyedit.c
    branches/netcode/src/keymap.c
    branches/netcode/src/levels.c
    branches/netcode/src/lighting.c
    branches/netcode/src/lighting.h
    branches/netcode/src/loadsave.c
    branches/netcode/src/loop.c
    branches/netcode/src/main.c
    branches/netcode/src/map.c
    branches/netcode/src/map.h
    branches/netcode/src/mapgrid.c
    branches/netcode/src/message.c
    branches/netcode/src/mission.c
    branches/netcode/src/move.c
    branches/netcode/src/multibot.c
    branches/netcode/src/multigifts.c
    branches/netcode/src/multiint.c
    branches/netcode/src/multilimit.c
    branches/netcode/src/multimenu.c
    branches/netcode/src/multimenu.h
    branches/netcode/src/multiplay.c
    branches/netcode/src/multistat.c
    branches/netcode/src/multistruct.c
    branches/netcode/src/multisync.c
    branches/netcode/src/objmem.c
    branches/netcode/src/oprint.c
    branches/netcode/src/order.c
    branches/netcode/src/projectile.c
    branches/netcode/src/radar.c
    branches/netcode/src/radar.h
    branches/netcode/src/research.c
    branches/netcode/src/scores.c
    branches/netcode/src/scriptai.c
    branches/netcode/src/scriptfuncs.c
    branches/netcode/src/scriptobj.c
    branches/netcode/src/scripttabs.c
    branches/netcode/src/selection.c
    branches/netcode/src/seqdisp.c
    branches/netcode/src/structure.c
    branches/netcode/src/structure.h
    branches/netcode/src/target.c
    branches/netcode/src/texture.c
    branches/netcode/src/texture.h
    branches/netcode/src/transporter.c
    branches/netcode/src/visibility.c
    branches/netcode/src/visibility.h
    branches/netcode/src/warcam.c
    branches/netcode/src/warzoneconfig.c
    branches/netcode/src/warzoneconfig.h
    branches/netcode/src/wrappers.c
    branches/netcode/tools/masterserver/wzmasterserver.py
    branches/netcode/warzone2100.cbp
    branches/netcode/win32/Warzone2100.sln
    branches/netcode/win32/Warzone2100.vcproj


_______________________________________________
Warzone-commits mailing list
Warzone-commits@gna.org
https://mail.gna.org/listinfo/warzone-commits

Reply via email to