Revision: 10156
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10156&view=rev
Author: cypr
Date: 2010-03-05 15:22:52 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
lib/netplay/netplay.c
lib/netplay/netplay.h
lib/netplay/nettypes.c
lib/netplay/nettypes.h
src/multibot.c
src/multistruct.c
src/multisync.c
src/order.c
src/orderdef.h
src/wavecast.cpp
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/newnet/Makefile.am
branches/newnet/configure.ac
branches/newnet/data/base/multiplay/script/scavfact.slo
branches/newnet/data/mods/multiplay/ntw/components/bodies/cybd_stdi.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/exbuggy.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/exfire.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/exjeep.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/exschool.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/extrike.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/sabod1.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/sabod2.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/sabod3.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/sebod1.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/sebod2.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/sebod3.pie
branches/newnet/data/mods/multiplay/ntw/components/bodies/truck.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/ccbase.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/cy_mineswp.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/cy_miss2.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/cy_snipe.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/gnhgss2.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/gnhplsma.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/gnhsuper.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/gnmrckta.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/gnmrcktb.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/ic_mineswp.pie
branches/newnet/data/mods/multiplay/ntw/components/weapons/mine_vis.pie
branches/newnet/data/mods/multiplay/ntw/effects/fxbluelaser.pie
branches/newnet/data/mods/multiplay/ntw/effects/fxcammo2.pie
branches/newnet/data/mods/multiplay/ntw/effects/fxlflsh2.pie
branches/newnet/data/mods/multiplay/ntw/effects/fxlthrow2.pie
branches/newnet/data/mods/multiplay/ntw/effects/fxproject.pie
branches/newnet/data/mods/multiplay/ntw/messages/strings/names.txt
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player0.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player1.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player2.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player3.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player4.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player5.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player6.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/skirmish/player7.slo
branches/newnet/data/mods/multiplay/ntw/stats/assignweapons.txt
branches/newnet/data/mods/multiplay/ntw/stats/construction.txt
branches/newnet/data/mods/multiplay/ntw/stats/repair.txt
branches/newnet/data/mods/multiplay/ntw/stats/structures.txt
branches/newnet/data/mods/multiplay/ntw/stats/templates.txt
branches/newnet/data/mods/multiplay/ntw/structs/adv-bunker.pie
branches/newnet/data/mods/multiplay/ntw/structs/blbrbgen.pie
branches/newnet/data/mods/multiplay/ntw/structs/blfact1.pie
branches/newnet/data/mods/multiplay/ntw/structs/blfact2.pie
branches/newnet/data/mods/multiplay/ntw/structs/blguard1.pie
branches/newnet/data/mods/multiplay/ntw/structs/blpower4.pie
branches/newnet/data/mods/multiplay/ntw/structs/blresch4.pie
branches/newnet/data/mods/multiplay/ntw/structs/blwallc1.pie
branches/newnet/data/mods/multiplay/ntw/structs/blwallh.pie
branches/newnet/data/mods/multiplay/ntw/structs/blwallh2.pie
branches/newnet/data/mods/multiplay/ntw/structs/gatedoorh.pie
branches/newnet/data/mods/multiplay/ntw/structs/gatedoorv.pie
branches/newnet/data/mods/multiplay/ntw/structs/gateh.pie
branches/newnet/data/mods/multiplay/ntw/structs/gatev.pie
branches/newnet/data/mods/multiplay/ntw/structs/micool.pie
branches/newnet/data/mods/multiplay/ntw/structs/mineinfo.pie
branches/newnet/data/mods/multiplay/ntw/structs/scav-res.pie
branches/newnet/data/mods/multiplay/ntw/structs/shield.pie
branches/newnet/data/mods/multiplay/ntw/structs/tank-traps.pie
branches/newnet/data/mods/multiplay/ntw/wrf/frontend.wrf
branches/newnet/data/mods/multiplay/ntw/wrf/vidmem.wrf
branches/newnet/data/mods/multiplay/ntw/wrf/vidmem2.wrf
branches/newnet/data/mods/multiplay/ntw/wrf/vidmem3.wrf
branches/newnet/data/mods/multiplay/ntw/wrf/vidmemc.wrf
branches/newnet/lib/framework/configfile.c
branches/newnet/lib/framework/fixedpoint.h
branches/newnet/lib/framework/math_ext.h
branches/newnet/lib/framework/trig.c
branches/newnet/lib/framework/trig.h
branches/newnet/lib/framework/vector.h
branches/newnet/lib/gamelib/gtime.h
branches/newnet/lib/ivis_common/piepalette.h
branches/newnet/lib/ivis_opengl/Makefile.am
branches/newnet/lib/ivis_opengl/ivis_opengl.vcproj
branches/newnet/lib/ivis_opengl/makefile.win32
branches/newnet/lib/ivis_opengl/pieblitfunc.c
branches/newnet/lib/ivis_opengl/piedraw.c
branches/newnet/lib/ivis_opengl/piefunc.c
branches/newnet/lib/ivis_opengl/piematrix.c
branches/newnet/lib/ivis_opengl/piematrix.h
branches/newnet/lib/ivis_opengl/piemode.c
branches/newnet/lib/ivis_opengl/piestate.c
branches/newnet/lib/ivis_opengl/screen.c
branches/newnet/lib/ivis_opengl/tex.c
branches/newnet/lib/ivis_opengl/textdraw.c
branches/newnet/lib/netplay/netplay.c
branches/newnet/lib/netplay/netplay.h
branches/newnet/lib/netplay/nettypes.cpp
branches/newnet/lib/netplay/nettypes.h
branches/newnet/lib/sequence/Makefile.am
branches/newnet/lib/sequence/makefile.win32
branches/newnet/lib/sequence/sequence.c
branches/newnet/lib/sequence/sequence.vcproj
branches/newnet/lib/sound/aud.h
branches/newnet/lib/widget/scrap.c
branches/newnet/macosx/Warzone.xcodeproj/project.pbxproj
branches/newnet/macosx/configs/Warzone-All.xcconfig
branches/newnet/macosx/configs/Warzone-Debug.xcconfig
branches/newnet/po/cs.po
branches/newnet/po/da.po
branches/newnet/po/de.po
branches/newnet/po/en_GB.po
branches/newnet/po/es.po
branches/newnet/po/et_EE.po
branches/newnet/po/fi.po
branches/newnet/po/fr.po
branches/newnet/po/fy.po
branches/newnet/po/ga.po
branches/newnet/po/hr.po
branches/newnet/po/it.po
branches/newnet/po/la.po
branches/newnet/po/lt.po
branches/newnet/po/nb.po
branches/newnet/po/nl.po
branches/newnet/po/pl.po
branches/newnet/po/pt.po
branches/newnet/po/pt_BR.po
branches/newnet/po/ro.po
branches/newnet/po/ru.po
branches/newnet/po/sl.po
branches/newnet/po/uk_UA.po
branches/newnet/po/zh_CN.po
branches/newnet/po/zh_TW.po
branches/newnet/src/Makefile.am
branches/newnet/src/action.c
branches/newnet/src/ai.c
branches/newnet/src/astar.c
branches/newnet/src/atmos.c
branches/newnet/src/atmos.h
branches/newnet/src/aud.c
branches/newnet/src/basedef.h
branches/newnet/src/baseobject.c
branches/newnet/src/baseobject.h
branches/newnet/src/challenge.c
branches/newnet/src/cheat.c
branches/newnet/src/cheat.h
branches/newnet/src/clparse.c
branches/newnet/src/clparse.h
branches/newnet/src/cluster.c
branches/newnet/src/cluster.h
branches/newnet/src/combat.c
branches/newnet/src/combat.h
branches/newnet/src/component.c
branches/newnet/src/configuration.c
branches/newnet/src/configuration.h
branches/newnet/src/data.c
branches/newnet/src/data.h
branches/newnet/src/difficulty.c
branches/newnet/src/difficulty.h
branches/newnet/src/display.c
branches/newnet/src/display3d.c
branches/newnet/src/display3d.h
branches/newnet/src/drive.c
branches/newnet/src/droid.c
branches/newnet/src/droid.h
branches/newnet/src/droiddef.h
branches/newnet/src/e3demo.c
branches/newnet/src/e3demo.h
branches/newnet/src/effects.c
branches/newnet/src/feature.c
branches/newnet/src/formation.c
branches/newnet/src/formation.h
branches/newnet/src/formationdef.h
branches/newnet/src/fpath.c
branches/newnet/src/fpath.h
branches/newnet/src/frontend.c
branches/newnet/src/game.c
branches/newnet/src/gateway.c
branches/newnet/src/geometry.c
branches/newnet/src/geometry.h
branches/newnet/src/group.c
branches/newnet/src/group.h
branches/newnet/src/hci.h
branches/newnet/src/init.c
branches/newnet/src/intimage.c
branches/newnet/src/intimage.h
branches/newnet/src/intorder.c
branches/newnet/src/intorder.h
branches/newnet/src/keybind.c
branches/newnet/src/main.h
branches/newnet/src/makefile.win32
branches/newnet/src/map.c
branches/newnet/src/map.h
branches/newnet/src/mission.c
branches/newnet/src/move.c
branches/newnet/src/movedef.h
branches/newnet/src/multibot.c
branches/newnet/src/multigifts.c
branches/newnet/src/multiint.c
branches/newnet/src/multilimit.c
branches/newnet/src/multimenu.c
branches/newnet/src/multiplay.c
branches/newnet/src/multiplay.h
branches/newnet/src/multistruct.c
branches/newnet/src/multisync.c
branches/newnet/src/oprint.c
branches/newnet/src/order.c
branches/newnet/src/orderdef.h
branches/newnet/src/projectile.c
branches/newnet/src/projectile.h
branches/newnet/src/radar.c
branches/newnet/src/raycast.c
branches/newnet/src/raycast.h
branches/newnet/src/scriptai.c
branches/newnet/src/scriptfuncs.c
branches/newnet/src/structure.c
branches/newnet/src/structure.h
branches/newnet/src/texture.c
branches/newnet/src/transporter.c
branches/newnet/src/visibility.c
branches/newnet/src/warcam.c
branches/newnet/src/wavecast.cpp
branches/newnet/src/weapondef.h
branches/newnet/src/wrappers.c
branches/newnet/src/wrappers.h
branches/newnet/win32/Warzone2100.vs2k8.vcproj
Added Paths:
-----------
branches/newnet/data/mods/multiplay/ntw/multiplay/script/landmine.slo
branches/newnet/data/mods/multiplay/ntw/multiplay/script/landmine.vlo
branches/newnet/data/mods/multiplay/ntw/structs/blbrbfac.pie
branches/newnet/data/mods/multiplay/ntw/texpages/page-111-laboratories.png
branches/newnet/data/mods/multiplay/ntw/texpages/page-8-player-buildings-bases-rockies.png
branches/newnet/data/mods/multiplay/ntw/texpages/page-8-player-buildings-bases-urban.png
branches/newnet/data/mods/multiplay/ntw/texpages/page-8-player-buildings-bases.png
branches/newnet/macosx/configs/FetchPrebuilt.sh
branches/newnet/macosx/configs/FetchSource.sh
branches/newnet/macosx/configs/bison.sh
branches/newnet/win32/libs/sdl/patches/001-Fix-cursor-not-being-responsive-without-SDL_APPINPUTFOCUS.diff
Removed Paths:
-------------
branches/newnet/macosx/external/bison.sh
branches/newnet/win32/libs/sdl/patches/001-Fix-to-the-cursor-not-being-responsive-when-the-app-doesn't-have-SDL_APPINPUTFOCUS.diff
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
