Branch: refs/heads/qt
Home: https://github.com/Warzone2100/warzone2100
Commit: 60d7cb6127a7d31eed533ca689ee1749815ea253
https://github.com/Warzone2100/warzone2100/commit/60d7cb6127a7d31eed533ca689ee1749815ea253
Author: Cyp <c...@wz2100.net>
Date: 2010-11-21 (Sun, 21 Nov 2010)
Changed paths:
M .gitignore
M .hgignore
M build_tools/autorevision/autorevision.cpp
M build_tools/changelog2bbcode.sh
M data/base/components/bodies/cybdpair.pie
M data/base/components/bodies/cybdpjmp.pie
M data/base/components/bodies/cybdplnd.pie
M data/base/components/bodies/drtrans.pie
M data/base/components/prop/prhhov1.pie
M data/base/components/prop/prhlhtr3.pie
M data/base/components/prop/prhltrk3.pie
M data/base/components/prop/prhlvtl1.pie
M data/base/components/prop/prhlvtl2.pie
M data/base/components/prop/prhlvtl3.pie
M data/base/components/prop/prhlvtl4.pie
M data/base/components/prop/prhlwhl1.pie
M data/base/components/prop/prhrhtr3.pie
M data/base/components/prop/prhrtrk3.pie
M data/base/components/prop/prhrvtl1.pie
M data/base/components/prop/prhrvtl2.pie
M data/base/components/prop/prhrvtl3.pie
M data/base/components/prop/prhrvtl4.pie
M data/base/components/prop/prhrwhl1.pie
M data/base/components/prop/prlhov1.pie
M data/base/components/prop/prllhtr1.pie
M data/base/components/prop/prlltrk1.pie
M data/base/components/prop/prllvtl1.pie
M data/base/components/prop/prllvtl2.pie
M data/base/components/prop/prllvtl3.pie
M data/base/components/prop/prllwhl1.pie
M data/base/components/prop/prlrhtr1.pie
M data/base/components/prop/prlrtrk1.pie
M data/base/components/prop/prlrvtl1.pie
M data/base/components/prop/prlrvtl2.pie
M data/base/components/prop/prlrvtl3.pie
M data/base/components/prop/prlrwhl1.pie
M data/base/components/prop/prmhov1.pie
M data/base/components/prop/prmlhtr2.pie
M data/base/components/prop/prmltrk2.pie
M data/base/components/prop/prmlvtl1.pie
M data/base/components/prop/prmlwhl1.pie
M data/base/components/prop/prmrhtr2.pie
M data/base/components/prop/prmrtrk2.pie
M data/base/components/prop/prmrvtl1.pie
M data/base/components/prop/prmrwhl1.pie
M data/base/components/weapons/cy_can.pie
M data/base/components/weapons/cy_las.pie
M data/base/components/weapons/cy_rail.pie
M data/base/components/weapons/cybody.pie
M data/base/components/weapons/gnlsnsr1.pie
M data/base/components/weapons/misensor.pie
M data/base/components/weapons/trhair.pie
M data/base/components/weapons/trhcan.pie
M data/base/components/weapons/trhcon.pie
M data/base/components/weapons/trhecm3.pie
M data/base/components/weapons/trhgss.pie
M data/base/components/weapons/trhhow2.pie
M data/base/components/weapons/trhhowt.pie
M data/base/components/weapons/trhlas.pie
M data/base/components/weapons/trhmsl.pie
M data/base/components/weapons/trhmslab.pie
M data/base/components/weapons/trhmsli.pie
M data/base/components/weapons/trhmslsa.pie
M data/base/components/weapons/trhplasm.pie
M data/base/components/weapons/trhrckt.pie
M data/base/components/weapons/trhrmort.pie
M data/base/components/weapons/trhsnsr3.pie
M data/base/components/weapons/trhsuper.pie
M data/base/components/weapons/trhvcan.pie
M data/base/components/weapons/trlacan.pie
M data/base/components/weapons/trlcan.pie
M data/base/components/weapons/trlcon.pie
M data/base/components/weapons/trlflmr.pie
M data/base/components/weapons/trlgss.pie
M data/base/components/weapons/trlmg1.pie
M data/base/components/weapons/trlmg2.pie
M data/base/components/weapons/trlmsl.pie
M data/base/components/weapons/trlrckt.pie
M data/base/components/weapons/trlrcktp.pie
M data/base/components/weapons/trlsnsr1.pie
M data/base/components/weapons/trmacan.pie
M data/base/components/weapons/trmair.pie
M data/base/components/weapons/trmcan.pie
M data/base/components/weapons/trmcon.pie
M data/base/components/weapons/trmecm1.pie
M data/base/components/weapons/trmecm2.pie
M data/base/components/weapons/trmflmr.pie
M data/base/components/weapons/trmgss.pie
M data/base/components/weapons/trmhowt.pie
M data/base/components/weapons/trmlas.pie
M data/base/components/weapons/trmmg.pie
M data/base/components/weapons/trmmort.pie
M data/base/components/weapons/trmmsl.pie
M data/base/components/weapons/trmmsla.pie
M data/base/components/weapons/trmmslaa.pie
M data/base/components/weapons/trmmslat.pie
M data/base/components/weapons/trmmslbb.pie
M data/base/components/weapons/trmmslsa.pie
M data/base/components/weapons/trmrckt.pie
M data/base/components/weapons/trmrckta.pie
M data/base/components/weapons/trmrcktb.pie
M data/base/components/weapons/trmrktbb.pie
M data/base/components/weapons/trmsnsr2.pie
M data/base/components/weapons/trmvcan.pie
M data/base/effects/cybitbod.pie
A data/base/features/advmatlab.pie
A data/base/features/aerolab.pie
A data/base/features/arizonabush1.pie
A data/base/features/arizonabush2.pie
A data/base/features/arizonabush3.pie
A data/base/features/arizonabush4.pie
A data/base/features/arizonatree1.pie
A data/base/features/arizonatree2.pie
A data/base/features/arizonatree3.pie
A data/base/features/arizonatree4.pie
A data/base/features/arizonatree5.pie
A data/base/features/arizonatree6.pie
A data/base/features/arizonatrees1.pie
M data/base/features/blbrhut1.pie
A data/base/features/blwall4.pie
A data/base/features/blwall4smash.pie
A data/base/features/blwallc4.pie
A data/base/features/blwallc4smash.pie
A data/base/features/hvyweplab.pie
A data/base/features/indlab.pie
A data/base/features/lasoptlab.pie
A data/base/features/mibar.pie
M data/base/features/mibldwa2.pie
M data/base/features/mibldwa3.pie
M data/base/features/mibldwat.pie
M data/base/features/miblucar.pie
M data/base/features/mibould1.pie
M data/base/features/mibould2.pie
M data/base/features/mibould3.pie
M data/base/features/mibrdfuk.pie
A data/base/features/mibridg1.pie
A data/base/features/mibridge.pie
A data/base/features/mibridgx.pie
M data/base/features/mibuil10.pie
M data/base/features/mibuil11.pie
M data/base/features/mibuil12.pie
M data/base/features/mibuil16.pie
M data/base/features/mibuil17.pie
M data/base/features/mibuild1.pie
M data/base/features/mibuild2.pie
M data/base/features/mibuild3.pie
M data/base/features/mibuild7.pie
M data/base/features/mibuild8.pie
M data/base/features/mibuild9.pie
M data/base/features/micabin1.pie
M data/base/features/micabin2.pie
M data/base/features/micabin3.pie
M data/base/features/micabin4.pie
M data/base/features/micabin5.pie
M data/base/features/micamper.pie
M data/base/features/michevy.pie
A data/base/features/micoolbig.pie
M data/base/features/mijeep.pie
A data/base/features/minuke.pie
M data/base/features/mioil.pie
M data/base/features/mipickup.pie
M data/base/features/mipipe.pie
M data/base/features/mipipe1.pie
M data/base/features/mipipe1a.pie
M data/base/features/mipipe2a.pie
M data/base/features/mipipe3a.pie
M data/base/features/miruin1.pie
A data/base/features/miruin10.pie
M data/base/features/miruin2.pie
M data/base/features/miruin3.pie
M data/base/features/miruin4.pie
M data/base/features/miruin5.pie
A data/base/features/miruin6.pie
A data/base/features/miruin7.pie
A data/base/features/miruin8.pie
A data/base/features/miruin9.pie
M data/base/features/mistree1.pie
M data/base/features/mistree2.pie
M data/base/features/mistree3.pie
M data/base/features/mitanker.pie
M data/base/features/mitankerh.pie
A data/base/features/mitrapcr.pie
A data/base/features/mitrapstr.pie
M data/base/features/mitrees.pie
M data/base/features/mitrees2.pie
M data/base/features/mitrees3.pie
M data/base/features/miwreck.pie
M data/base/features/miwrek1.pie
M data/base/features/miwrek2.pie
M data/base/features/miwrek3.pie
M data/base/features/miwrek4.pie
M data/base/features/miwrek5.pie
A data/base/features/nanolab.pie
A data/base/features/powlab.pie
A data/base/features/rotweplab.pie
M data/base/messages/strings/names.txt
M data/base/misc/researchimds/dpvtol.pie
M data/base/misc/researchimds/icamrhot.pie
M data/base/misc/researchimds/icamrknt.pie
M data/base/stats/features.txt
M data/base/structs/blderik.pie
M data/base/structs/blgaurdn.pie
M data/base/structs/blgrdnex.pie
M data/base/structs/blguard1.pie
M data/base/structs/blguard2.pie
M data/base/structs/blguard3.pie
M data/base/structs/blguardr.pie
M data/base/structs/blhq.pie
M data/base/structs/blnavbnk.pie
M data/base/structs/blpilbox.pie
M data/base/structs/blwall2.pie
M data/base/structs/blwall3.pie
M data/base/structs/blwallc1.pie
M data/base/structs/blwallc2.pie
M data/base/structs/blwallc3.pie
M data/base/structs/blwallh.pie
M data/base/structs/dummy.pie
M data/base/structs/icdozer.pie
M data/base/structs/miuptrim.pie
A data/base/texpages/page-29-features-arizona.png
A data/base/texpages/page-30-features-rockies.png
A data/base/texpages/page-31-features-urban.png
R data/base/texpages/page-6-features-arizona.png
R data/base/texpages/page-6-features-rockies.png
R data/base/texpages/page-6-features-urban.png
A data/base/texpages/page-6.png
M data/base/texpages/tertilesc3hw-128/tile-55.png
M data/base/texpages/tertilesc3hw-128/tile-62.png
M data/base/texpages/tertilesc3hw-16/tile-55.png
M data/base/texpages/tertilesc3hw-16/tile-62.png
M data/base/texpages/tertilesc3hw-32/tile-55.png
M data/base/texpages/tertilesc3hw-32/tile-62.png
M data/base/texpages/tertilesc3hw-64/tile-55.png
M data/base/texpages/tertilesc3hw-64/tile-62.png
M data/base/wrf/limiter_tex.wrf
M data/base/wrf/multi/skirmish3.wrf
M data/base/wrf/multi/skirmish5.wrf
M data/base/wrf/multi/skirmish6.wrf
M data/base/wrf/multi/skirmish7.wrf
M data/base/wrf/piestats.wrf
M data/base/wrf/vidmem.wrf
M data/base/wrf/vidmem2.wrf
M data/base/wrf/vidmem3.wrf
M data/mods/multiplay/semperfi/multiplay/skirmish/ai.slo
M data/mp/components/bodies/drcytran.pie
M data/mp/components/bodies/drtrans.pie
M data/mp/components/prop/prshov1.pie
M data/mp/components/prop/prslhtr4.pie
M data/mp/components/prop/prsltrk4.pie
M data/mp/components/prop/prslvtl1.pie
M data/mp/components/prop/prslwhl1.pie
M data/mp/components/prop/prsrhtr4.pie
M data/mp/components/prop/prsrtrk4.pie
M data/mp/components/prop/prsrvtl1.pie
M data/mp/components/prop/prsrwhl1.pie
M data/mp/components/weapons/gnmrepr2.pie
M data/mp/components/weapons/sc_asscn.pie
M data/mp/components/weapons/sc_can.pie
M data/mp/components/weapons/sc_hpvcn.pie
M data/mp/components/weapons/sc_pulse.pie
M data/mp/components/weapons/sc_rail2.pie
M data/mp/components/weapons/scbody.pie
M data/mp/components/weapons/trhemp.pie
M data/mp/components/weapons/trhmg.pie
M data/mp/components/weapons/trhvcan2.pie
M data/mp/components/weapons/trwpfcan.pie
M data/mp/components/weapons/trwpfgss.pie
M data/mp/components/weapons/trwpfmsl.pie
M data/mp/components/weapons/trwpfrkt.pie
M data/mp/messages/strings/names.txt
M data/mp/stats/features.txt
M data/mp/structs/stwpfcan.pie
M data/mp/wrf/piestats.wrf
M data/mp/wrf/vidmem.wrf
M data/mp/wrf/vidmem2.wrf
M data/mp/wrf/vidmem3.wrf
M lib/exceptionhandler/exchndl.c
M lib/framework/crc.cpp
M lib/framework/crc.h
M lib/framework/fixedpoint.h
M lib/framework/i18n.c
M lib/framework/macros.h
M lib/framework/math_ext.h
M lib/framework/vector.h
M lib/framework/wzglobal.h
M lib/gamelib/gtime.c
M lib/gamelib/gtime.h
M lib/ivis_common/imdload.c
M lib/ivis_common/ivisdef.h
M lib/ivis_opengl/piedraw.c
M lib/ivis_opengl/piematrix.c
M lib/ivis_opengl/piematrix.h
M lib/ivis_opengl/tex.c
M lib/netplay/netplay.c
M lib/netplay/netplay.h
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M lib/script/event.c
M lib/widget/editbox.c
A macosx/configs/codesignrules.plist
M pkg/nsis/warzone2100.nsi
M po/LINGUAS
M po/POTFILES.in
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
A po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
A releaseBranch
M src/Makefile.am
M src/action.c
M src/ai.c
M src/basedef.h
M src/cmddroid.c
M src/cmddroid.h
M src/combat.c
M src/combat.h
M src/component.c
M src/design.c
M src/display.c
M src/display3d.c
M src/droid.c
M src/droid.h
M src/droiddef.h
M src/edit3d.c
M src/effects.c
M src/effects.h
M src/feature.c
M src/feature.h
M src/fpath.c
M src/fpath.h
M src/game.c
M src/hci.c
M src/keybind.c
M src/loadsave.c
M src/loop.c
M src/main.cpp
M src/map.c
M src/map.h
M src/mission.c
M src/move.c
M src/multiint.c
M src/multiplay.c
M src/multiplay.h
M src/multirecv.h
M src/multistruct.c
M src/multisync.c
M src/order.c
M src/power.c
M src/projectile.c
M src/radar.c
M src/raycast.c
M src/scriptai.c
M src/scriptfuncs.c
M src/scriptfuncs.h
M src/scripttabs.c
M src/structure.c
M src/structure.h
M src/terrain.c
M src/visibility.c
M tools/conversion/simplipie.c
M win32/libs/dejavu/Makefile
M win32/libs/freetype2/Makefile
M win32/libs/gettext/Makefile
M win32/libs/ogg/Makefile
M win32/libs/png/Makefile
M win32/libs/vorbis/Makefile
Log Message:
-----------
Merge remote branch 'origin/master' into qt
Conflicts:
.hgignore (manual merge)
lib/framework/wzapp_c.h (used qt)
macosx/Warzone.xcodeproj/project.pbxproj (used qt)
po/*.po (used master)
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
