Revision: 10014
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10014&view=rev
Author: i-nod
Date: 2010-02-25 21:35:23 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
shaders: Merge 9796-10010 from trunk.
Modified Paths:
--------------
branches/shaders/.gitignore
branches/shaders/Makefile.am
branches/shaders/configure.ac
branches/shaders/data/mods/multiplay/Makefile.am
branches/shaders/data/mods/multiplay/makefile.win32
branches/shaders/data/mods/multiplay/ntw/doc/NTW-Mod-Change-List.html
branches/shaders/data/mods/multiplay/ntw/doc/NTW-Mod-Tree.jpg
branches/shaders/data/mods/multiplay/ntw/doc/readme.txt
branches/shaders/data/mods/multiplay/ntw/images/frontend0.png
branches/shaders/data/mods/multiplay/ntw/messages/strings/names.txt
branches/shaders/data/mods/multiplay/ntw/multiplay/script/autoenable.slo
branches/shaders/data/mods/multiplay/ntw/multiplay/script/autoenable.vlo
branches/shaders/data/mods/multiplay/ntw/stats/body.txt
branches/shaders/data/mods/multiplay/ntw/stats/research/multiplayer/prresearch.txt
branches/shaders/data/mods/multiplay/ntw/stats/research/multiplayer/research.txt
branches/shaders/data/mods/multiplay/ntw/stats/research/multiplayer/resultstructure.txt
branches/shaders/data/mods/multiplay/ntw/stats/structures.txt
branches/shaders/data/mods/multiplay/ntw/stats/weapons.txt
branches/shaders/data/mods/multiplay/ntw/texpages/page-10-laboratories.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-12-player-buildings.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-13-player-buildings.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-14-droid-hubs.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-15-droid-hubs.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-16-droid-drives.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-17-droid-weapons.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-18-fx.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-30.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-9-player-buildings-bases-rockies.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-9-player-buildings-bases-urban.png
branches/shaders/data/mods/multiplay/ntw/texpages/page-9-player-buildings-bases.png
branches/shaders/data/mods/multiplay/ntw/wrf/multi/campaign-scav.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/campaign-scav2.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/campaign-scav3.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/campaign.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/campaign2.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/campaign3.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/skirmish2.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/skirmish4.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/skirmish8.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/t2-skirmish2.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/t2-skirmish4.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/t2-skirmish8.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/t3-skirmish2.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/t3-skirmish4.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/t3-skirmish8.wrf
branches/shaders/data/mods/multiplay/semperfi/multiplay/skirmish/ai.slo
branches/shaders/data/mods/multiplay/semperfi/multiplay/skirmish/ai.vlo
branches/shaders/data/mp/messages/strings/names.txt
branches/shaders/data/mp/stats/research/multiplayer/prresearch.txt
branches/shaders/data/mp/stats/research/multiplayer/redcomponents.txt
branches/shaders/data/mp/stats/research/multiplayer/research.txt
branches/shaders/data/mp/stats/weapons.txt
branches/shaders/lib/exceptionhandler/dumpinfo.cpp
branches/shaders/lib/framework/file.h
branches/shaders/lib/framework/frame.c
branches/shaders/lib/framework/frame.h
branches/shaders/lib/framework/frameint.h
branches/shaders/lib/framework/frameresource.c
branches/shaders/lib/framework/frameresource.h
branches/shaders/lib/framework/i18n.c
branches/shaders/lib/framework/i18n.h
branches/shaders/lib/framework/input.c
branches/shaders/lib/framework/input.h
branches/shaders/lib/framework/resource_lexer.l
branches/shaders/lib/framework/strres.c
branches/shaders/lib/framework/strres.h
branches/shaders/lib/framework/strres_lexer.l
branches/shaders/lib/framework/strresly.h
branches/shaders/lib/framework/treap.c
branches/shaders/lib/framework/treap.h
branches/shaders/lib/framework/trig.c
branches/shaders/lib/framework/trig.h
branches/shaders/lib/framework/wzglobal.h
branches/shaders/lib/gamelib/audp_lexer.l
branches/shaders/lib/ivis_common/piedef.h
branches/shaders/lib/ivis_common/png_util.c
branches/shaders/lib/ivis_opengl/piedraw.c
branches/shaders/lib/ivis_opengl/screen.c
branches/shaders/lib/netplay/Makefile.am
branches/shaders/lib/netplay/netplay.c
branches/shaders/lib/netplay/netplay.h
branches/shaders/lib/script/chat_lexer.l
branches/shaders/lib/script/script_lexer.l
branches/shaders/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings
branches/shaders/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings
branches/shaders/macosx/Warzone.xcodeproj/project.pbxproj
branches/shaders/macosx/configs/Warzone-All.xcconfig
branches/shaders/pkg/nsis/warzone2100.nsi
branches/shaders/po/POTFILES.in
branches/shaders/po/cs.po
branches/shaders/po/da.po
branches/shaders/po/de.po
branches/shaders/po/en_GB.po
branches/shaders/po/es.po
branches/shaders/po/et_EE.po
branches/shaders/po/fi.po
branches/shaders/po/fr.po
branches/shaders/po/fy.po
branches/shaders/po/ga.po
branches/shaders/po/hr.po
branches/shaders/po/it.po
branches/shaders/po/la.po
branches/shaders/po/lt.po
branches/shaders/po/nb.po
branches/shaders/po/nl.po
branches/shaders/po/pl.po
branches/shaders/po/pt.po
branches/shaders/po/pt_BR.po
branches/shaders/po/ro.po
branches/shaders/po/ru.po
branches/shaders/po/sl.po
branches/shaders/po/uk_UA.po
branches/shaders/po/update-po.sh
branches/shaders/po/zh_CN.po
branches/shaders/po/zh_TW.po
branches/shaders/src/Makefile.am
branches/shaders/src/action.c
branches/shaders/src/advvis.c
branches/shaders/src/basedef.h
branches/shaders/src/baseobject.c
branches/shaders/src/baseobject.h
branches/shaders/src/bridge.c
branches/shaders/src/bridge.h
branches/shaders/src/data.c
branches/shaders/src/data.h
branches/shaders/src/display.c
branches/shaders/src/display3d.c
branches/shaders/src/droid.c
branches/shaders/src/droid.h
branches/shaders/src/droiddef.h
branches/shaders/src/edit3d.c
branches/shaders/src/feature.c
branches/shaders/src/featuredef.h
branches/shaders/src/fpath.c
branches/shaders/src/function.c
branches/shaders/src/game.c
branches/shaders/src/init.c
branches/shaders/src/keybind.c
branches/shaders/src/level_lexer.l
branches/shaders/src/map.c
branches/shaders/src/map.h
branches/shaders/src/message_lexer.l
branches/shaders/src/mission.c
branches/shaders/src/move.c
branches/shaders/src/multiint.c
branches/shaders/src/multijoin.c
branches/shaders/src/multilimit.c
branches/shaders/src/multiopt.c
branches/shaders/src/multiplay.c
branches/shaders/src/objmem.c
branches/shaders/src/order.c
branches/shaders/src/projectile.c
branches/shaders/src/projectile.h
branches/shaders/src/projectiledef.h
branches/shaders/src/research.c
branches/shaders/src/scriptai.c
branches/shaders/src/scriptfuncs.c
branches/shaders/src/scriptvals_lexer.l
branches/shaders/src/structure.c
branches/shaders/src/structuredef.h
branches/shaders/src/terrain.c
branches/shaders/src/visibility.c
branches/shaders/src/visibility.h
branches/shaders/win32/__BUILD_SCRIPT
branches/shaders/win32/libs/dejavu/Makefile
branches/shaders/win32/libs/expat/Makefile
branches/shaders/win32/libs/fontconfig/Makefile
branches/shaders/win32/libs/freetype2/Makefile
branches/shaders/win32/libs/gettext/Makefile
branches/shaders/win32/libs/iconv/Makefile
branches/shaders/win32/libs/ogg/Makefile
branches/shaders/win32/libs/png/Makefile
branches/shaders/win32/libs/popt/Makefile
branches/shaders/win32/libs/sdl/Makefile
branches/shaders/win32/libs/theora/Makefile
branches/shaders/win32/libs/vorbis/Makefile
branches/shaders/win32/libs/zlib/Makefile
Added Paths:
-----------
branches/shaders/.bzrignore
branches/shaders/data/mods/multiplay/dydo-ai/
branches/shaders/data/mods/multiplay/dydo-ai/images/
branches/shaders/data/mods/multiplay/dydo-ai/images/avatar.png
branches/shaders/data/mods/multiplay/dydo-ai/images/frontend0.png
branches/shaders/data/mods/multiplay/dydo-ai/messages/
branches/shaders/data/mods/multiplay/dydo-ai/messages/multiplay.txt
branches/shaders/data/mods/multiplay/dydo-ai/messages/strings/
branches/shaders/data/mods/multiplay/dydo-ai/messages/strings/names.txt
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player0.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player0.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player1.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player1.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player2.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player2.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player3.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player3.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player4.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player4.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player5.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player5.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player6.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player6.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player7.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player7.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/readme.txt
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/rules.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/rules.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/sk2tech.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/sk3tech.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/sktech.slo
branches/shaders/data/mods/multiplay/dydo-ai/stats/
branches/shaders/data/mods/multiplay/dydo-ai/stats/assignweapons.txt
branches/shaders/data/mods/multiplay/dydo-ai/stats/body.txt
branches/shaders/data/mods/multiplay/dydo-ai/stats/templates.txt
branches/shaders/m4/stack-protector.m4
branches/shaders/macosx/configs/LangDis
branches/shaders/macosx/configs/Warzone-Debug.xcconfig
branches/shaders/macosx/configs/Warzone-Release.xcconfig
branches/shaders/win32/libs/sdl/patches/
branches/shaders/win32/libs/sdl/patches/001-Fix-to-the-cursor-not-being-responsive-when-the-app-doesn't-have-SDL_APPINPUTFOCUS.diff
Removed Paths:
-------------
branches/shaders/.kdev_include_paths
branches/shaders/data/mods/multiplay/dydo-ai/images/
branches/shaders/data/mods/multiplay/dydo-ai/images/avatar.png
branches/shaders/data/mods/multiplay/dydo-ai/images/frontend0.png
branches/shaders/data/mods/multiplay/dydo-ai/messages/
branches/shaders/data/mods/multiplay/dydo-ai/messages/multiplay.txt
branches/shaders/data/mods/multiplay/dydo-ai/messages/strings/
branches/shaders/data/mods/multiplay/dydo-ai/messages/strings/names.txt
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player0.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player0.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player1.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player1.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player2.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player2.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player3.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player3.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player4.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player4.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player5.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player5.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player6.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player6.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player7.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/player7.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/readme.txt
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/rules.slo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/rules.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/sk2tech.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/sk3tech.vlo
branches/shaders/data/mods/multiplay/dydo-ai/multiplay/skirmish/sktech.slo
branches/shaders/data/mods/multiplay/dydo-ai/stats/
branches/shaders/data/mods/multiplay/dydo-ai/stats/assignweapons.txt
branches/shaders/data/mods/multiplay/dydo-ai/stats/body.txt
branches/shaders/data/mods/multiplay/dydo-ai/stats/templates.txt
branches/shaders/data/mods/multiplay/ntw/multiplay/script/cam1day.vlo
branches/shaders/data/mods/multiplay/ntw/multiplay/script/cam2day.vlo
branches/shaders/data/mods/multiplay/ntw/multiplay/script/cam3day.vlo
branches/shaders/data/mods/multiplay/ntw/multiplay/script/fog-daynight.slo
branches/shaders/data/mods/multiplay/ntw/multiplay/script/landmine.slo
branches/shaders/data/mods/multiplay/ntw/multiplay/script/landmine.vlo
branches/shaders/data/mods/multiplay/ntw/texpages/tertilesc1hw-128/
branches/shaders/data/mods/multiplay/ntw/texpages/tertilesc1hw-16/
branches/shaders/data/mods/multiplay/ntw/texpages/tertilesc1hw-32/
branches/shaders/data/mods/multiplay/ntw/texpages/tertilesc1hw-64/
branches/shaders/data/mods/multiplay/ntw/wrf/multi/fog1.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/fog2.wrf
branches/shaders/data/mods/multiplay/ntw/wrf/multi/fog3.wrf
branches/shaders/macosx/configs/warzone-debug.xcconfig
branches/shaders/macosx/configs/warzone-release.xcconfig
branches/shaders/win32/libs/sdl/patches/001-Fix-to-the-cursor-not-being-responsive-when-the-app-doesn't-have-SDL_APPINPUTFOCUS.diff
Property Changed:
----------------
branches/shaders/
branches/shaders/data/base/anims/
branches/shaders/data/base/audio/
branches/shaders/data/base/audio/memressp/console/power-transferred.ogg
branches/shaders/data/base/audio/proxmessages/c1prox.fodt
branches/shaders/data/base/components/
branches/shaders/data/base/effects/
branches/shaders/data/base/features/
branches/shaders/data/base/gamedesc.lev
branches/shaders/data/base/images/
branches/shaders/data/base/locale/
branches/shaders/data/base/messages/
branches/shaders/data/base/misc/
branches/shaders/data/base/multiplay/
branches/shaders/data/base/novideo.rpl
branches/shaders/data/base/script/
branches/shaders/data/base/sequenceaudio/
branches/shaders/data/base/stats/
branches/shaders/data/base/structs/
branches/shaders/data/base/tagdefinitions/
branches/shaders/data/base/texpages/
branches/shaders/data/base/texpages/page-25-sky-arizona.png
branches/shaders/data/base/wrf/
branches/shaders/data/mods/multiplay/Makefile.am
branches/shaders/data/mods/multiplay/makefile.win32
branches/shaders/data/mods/multiplay/ntw/
branches/shaders/data/mp/messages/resmessagesall.rmsg
branches/shaders/data/music/
branches/shaders/lib/betawidget/autogen.sh
branches/shaders/lib/betawidget/m4/ax_compare_version.m4
branches/shaders/lib/betawidget/m4/ax_with_prog.m4
branches/shaders/lib/betawidget/src/betawidget.i
branches/shaders/lib/betawidget/src/clipboard.h
branches/shaders/lib/betawidget/src/font.c
branches/shaders/lib/betawidget/src/font.h
branches/shaders/lib/betawidget/src/geom.c
branches/shaders/lib/betawidget/src/geom.h
branches/shaders/lib/betawidget/src/hBox.c
branches/shaders/lib/betawidget/src/hBox.h
branches/shaders/lib/betawidget/src/internal-cairo.h
branches/shaders/lib/betawidget/src/keycode.h
branches/shaders/lib/betawidget/src/lua-wrap.h
branches/shaders/lib/betawidget/src/lua_memberfnptr.i
branches/shaders/lib/betawidget/src/lua_table_as_array.i
branches/shaders/lib/betawidget/src/platform/
branches/shaders/lib/betawidget/src/platform/sdl/Makefile.am
branches/shaders/lib/betawidget/src/spacer.c
branches/shaders/lib/betawidget/src/spacer.h
branches/shaders/lib/betawidget/src/table.c
branches/shaders/lib/betawidget/src/table.h
branches/shaders/lib/betawidget/src/textEntry.c
branches/shaders/lib/betawidget/src/textEntry.h
branches/shaders/lib/betawidget/src/vector.c
branches/shaders/lib/betawidget/src/vector.h
branches/shaders/lib/betawidget/src/widget.c
branches/shaders/lib/betawidget/src/widget.h
branches/shaders/lib/betawidget/src/window.c
branches/shaders/lib/betawidget/src/window.h
branches/shaders/lib/betawidget/tools/Makefile.am
branches/shaders/lib/framework/fixedpoint.h
branches/shaders/lib/framework/utf.c
branches/shaders/lib/framework/utf.h
branches/shaders/pkg/rpm/warzone2100.spec
branches/shaders/src/baseobject.c
branches/shaders/src/baseobject.h
branches/shaders/src/message_lexer.l
branches/shaders/tools/editworld/doc/todo.txt
branches/shaders/tools/map/map2lnd.c
branches/shaders/tools/map/mapconv.c
branches/shaders/tools/map/mapinfo.c
branches/shaders/win32/libs/sdl/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
