Revision: 10219
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10219&view=rev
Author: cypr
Date: 2010-03-10 21:35:37 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into qt
Conflicts:
configure.ac
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.c
lib/framework/input.h
lib/framework/types.h
lib/ivis_common/piepalette.h
lib/ivis_common/piestate.h
lib/ivis_opengl/piestate.c
lib/ivis_opengl/screen.c
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/QuesoGLC-Debug.xcconfig
macosx/configs/QuesoGLC-Release.xcconfig
macosx/configs/SDLmain-Debug.xcconfig
macosx/configs/SDLmain-Release.xcconfig
src/Makefile.am
src/display.c
src/keybind.c
src/keyedit.c
src/terrain.c
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/qt/configure.ac
branches/qt/data/Makefile.am
branches/qt/data/base/palette.txt
branches/qt/data/base/stats/weapons.txt
branches/qt/data/makefile.win32
branches/qt/data/mods/multiplay/ntw/components/bodies/cybd_stdi.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/exbuggy.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/exfire.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/exjeep.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/exschool.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/extrike.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/sabod1.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/sabod2.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/sabod3.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/sebod1.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/sebod2.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/sebod3.pie
branches/qt/data/mods/multiplay/ntw/components/bodies/truck.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/ccbase.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/cy_mineswp.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/cy_miss2.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/cy_snipe.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/gnhgss2.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/gnhplsma.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/gnhsuper.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/gnmrckta.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/gnmrcktb.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/ic_mineswp.pie
branches/qt/data/mods/multiplay/ntw/components/weapons/mine_vis.pie
branches/qt/data/mods/multiplay/ntw/effects/fxbluelaser.pie
branches/qt/data/mods/multiplay/ntw/effects/fxcammo2.pie
branches/qt/data/mods/multiplay/ntw/effects/fxlflsh2.pie
branches/qt/data/mods/multiplay/ntw/effects/fxlthrow2.pie
branches/qt/data/mods/multiplay/ntw/effects/fxproject.pie
branches/qt/data/mods/multiplay/ntw/messages/strings/names.txt
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player0.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player1.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player2.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player3.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player4.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player5.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player6.slo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player7.slo
branches/qt/data/mods/multiplay/ntw/stats/construction.txt
branches/qt/data/mods/multiplay/ntw/stats/repair.txt
branches/qt/data/mods/multiplay/ntw/stats/structures.txt
branches/qt/data/mods/multiplay/ntw/stats/templates.txt
branches/qt/data/mods/multiplay/ntw/structs/adv-bunker.pie
branches/qt/data/mods/multiplay/ntw/structs/blbrbgen.pie
branches/qt/data/mods/multiplay/ntw/structs/blfact1.pie
branches/qt/data/mods/multiplay/ntw/structs/blfact2.pie
branches/qt/data/mods/multiplay/ntw/structs/blguard1.pie
branches/qt/data/mods/multiplay/ntw/structs/blpower4.pie
branches/qt/data/mods/multiplay/ntw/structs/blresch4.pie
branches/qt/data/mods/multiplay/ntw/structs/blwallc1.pie
branches/qt/data/mods/multiplay/ntw/structs/blwallh.pie
branches/qt/data/mods/multiplay/ntw/structs/blwallh2.pie
branches/qt/data/mods/multiplay/ntw/structs/gatedoorh.pie
branches/qt/data/mods/multiplay/ntw/structs/gatedoorv.pie
branches/qt/data/mods/multiplay/ntw/structs/gateh.pie
branches/qt/data/mods/multiplay/ntw/structs/gatev.pie
branches/qt/data/mods/multiplay/ntw/structs/micool.pie
branches/qt/data/mods/multiplay/ntw/structs/mineinfo.pie
branches/qt/data/mods/multiplay/ntw/structs/scav-res.pie
branches/qt/data/mods/multiplay/ntw/structs/shield.pie
branches/qt/data/mods/multiplay/ntw/structs/tank-traps.pie
branches/qt/data/mods/multiplay/ntw/wrf/frontend.wrf
branches/qt/data/mods/multiplay/ntw/wrf/vidmem.wrf
branches/qt/data/mods/multiplay/ntw/wrf/vidmem2.wrf
branches/qt/data/mods/multiplay/ntw/wrf/vidmem3.wrf
branches/qt/data/mods/multiplay/ntw/wrf/vidmemc.wrf
branches/qt/lib/framework/listmacs.h
branches/qt/lib/framework/math_ext.h
branches/qt/lib/framework/trig.c
branches/qt/lib/framework/trig.h
branches/qt/lib/framework/types.h
branches/qt/lib/framework/vector.h
branches/qt/lib/framework/wzglobal.h
branches/qt/lib/ivis_common/bitimage.c
branches/qt/lib/ivis_common/imd.h
branches/qt/lib/ivis_common/imdload.c
branches/qt/lib/ivis_common/ivisdef.h
branches/qt/lib/ivis_common/piedef.h
branches/qt/lib/ivis_common/piepalette.h
branches/qt/lib/ivis_common/piestate.h
branches/qt/lib/ivis_common/tex.h
branches/qt/lib/ivis_opengl/pieblitfunc.c
branches/qt/lib/ivis_opengl/piedraw.c
branches/qt/lib/ivis_opengl/piefunc.c
branches/qt/lib/ivis_opengl/piematrix.c
branches/qt/lib/ivis_opengl/piematrix.h
branches/qt/lib/ivis_opengl/piepalette.c
branches/qt/lib/ivis_opengl/piestate.c
branches/qt/lib/ivis_opengl/screen.c
branches/qt/lib/ivis_opengl/tex.c
branches/qt/lib/netplay/netplay.c
branches/qt/lib/script/chat_lexer.l
branches/qt/lib/script/codeprint.h
branches/qt/lib/script/script_lexer.l
branches/qt/lib/script/script_parser.y
branches/qt/lib/widget/form.h
branches/qt/lib/widget/tip.h
branches/qt/m4/stack-protector.m4
branches/qt/macosx/configs/Gettext-Debug.xcconfig
branches/qt/macosx/configs/Gettext-Release.xcconfig
branches/qt/macosx/configs/Ogg-Debug.xcconfig
branches/qt/macosx/configs/Ogg-Release.xcconfig
branches/qt/macosx/configs/PhysFS-Debug.xcconfig
branches/qt/macosx/configs/PhysFS-Release.xcconfig
branches/qt/macosx/configs/Png-Debug.xcconfig
branches/qt/macosx/configs/Png-Release.xcconfig
branches/qt/macosx/configs/Project-All.xcconfig
branches/qt/macosx/configs/Theora-Debug.xcconfig
branches/qt/macosx/configs/Theora-Release.xcconfig
branches/qt/macosx/configs/Vorbis-Debug.xcconfig
branches/qt/macosx/configs/Vorbis-Release.xcconfig
branches/qt/macosx/configs/Warzone-All.xcconfig
branches/qt/macosx/configs/Warzone-Debug.xcconfig
branches/qt/macosx/configs/Warzone-Release.xcconfig
branches/qt/macosx/configs/Zlib-Debug.xcconfig
branches/qt/macosx/configs/Zlib-Release.xcconfig
branches/qt/src/Makefile.am
branches/qt/src/action.c
branches/qt/src/ai.c
branches/qt/src/atmos.c
branches/qt/src/baseobject.c
branches/qt/src/baseobject.h
branches/qt/src/bridge.h
branches/qt/src/clparse.c
branches/qt/src/combat.c
branches/qt/src/component.c
branches/qt/src/data.c
branches/qt/src/data.h
branches/qt/src/design.h
branches/qt/src/display.c
branches/qt/src/display.h
branches/qt/src/display3d.c
branches/qt/src/droid.c
branches/qt/src/effects.c
branches/qt/src/formation.c
branches/qt/src/fpath.c
branches/qt/src/geometry.c
branches/qt/src/geometry.h
branches/qt/src/hci.c
branches/qt/src/hci.h
branches/qt/src/intelmap.h
branches/qt/src/intorder.c
branches/qt/src/intorder.h
branches/qt/src/keybind.c
branches/qt/src/keyedit.c
branches/qt/src/keyedit.h
branches/qt/src/main.h
branches/qt/src/mission.c
branches/qt/src/move.c
branches/qt/src/multiint.h
branches/qt/src/multimenu.h
branches/qt/src/order.c
branches/qt/src/pointtree.h
branches/qt/src/projectile.c
branches/qt/src/projectile.h
branches/qt/src/radar.c
branches/qt/src/raycast.c
branches/qt/src/raycast.h
branches/qt/src/scriptai.c
branches/qt/src/scriptfuncs.c
branches/qt/src/scriptobj.h
branches/qt/src/scripttabs.h
branches/qt/src/scriptvals.h
branches/qt/src/structure.c
branches/qt/src/terrain.c
branches/qt/src/visibility.c
branches/qt/src/warcam.c
Added Paths:
-----------
branches/qt/data/base/shaders/
branches/qt/data/base/shaders/tcmask.frag
branches/qt/data/base/shaders/tcmask.vert
branches/qt/data/mods/multiplay/ntw/multiplay/script/landmine.slo
branches/qt/data/mods/multiplay/ntw/multiplay/script/landmine.vlo
branches/qt/data/mods/multiplay/ntw/structs/blbrbfac.pie
branches/qt/data/mods/multiplay/ntw/texpages/page-111-laboratories.png
branches/qt/data/mods/multiplay/ntw/texpages/page-8-player-buildings-bases-rockies.png
branches/qt/data/mods/multiplay/ntw/texpages/page-8-player-buildings-bases-urban.png
branches/qt/data/mods/multiplay/ntw/texpages/page-8-player-buildings-bases.png
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
