Commit: a11d60774ea3db52ff7212175de3009977c4848a Trac URL: http://developer.wz2100.net/changeset/a11d60774ea3db52ff7212175de3009977c4848a
Author: buginator <bugina...@gna.org> Date: Sun Oct 17 16:49:30 2010 -0400 Fix MSVC builds lib/framework/trig.c | 4 ++++ win32/Warzone2100.vcproj | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) ------------------------- Commit: 4cc9640860ca8852206deb168da9916e4ac228ba Trac URL: http://developer.wz2100.net/changeset/4cc9640860ca8852206deb168da9916e4ac228ba Author: buginator <bugina...@gna.org> Date: Mon Oct 11 23:47:25 2010 -0400 Add support for X player maps. You need flaME 1.10 or higher to make the new maps. This adds support for 3,5,6 & 7 player maps. data/base/wrf/multi/skirmish3.wrf | 18 +++++++++++++ data/base/wrf/multi/skirmish5.wrf | 22 ++++++++++++++++ data/base/wrf/multi/skirmish6.wrf | 24 ++++++++++++++++++ data/base/wrf/multi/skirmish7.wrf | 26 +++++++++++++++++++ data/mp/wrf/multi/t2-skirmish3.wrf | 21 +++++++++++++++ data/mp/wrf/multi/t2-skirmish5.wrf | 22 ++++++++++++++++ data/mp/wrf/multi/t2-skirmish6.wrf | 24 ++++++++++++++++++ data/mp/wrf/multi/t2-skirmish7.wrf | 26 +++++++++++++++++++ data/mp/wrf/multi/t3-skirmish3.wrf | 23 +++++++++++++++++ data/mp/wrf/multi/t3-skirmish5.wrf | 21 +++++++++++++++ data/mp/wrf/multi/t3-skirmish6.wrf | 23 +++++++++++++++++ data/mp/wrf/multi/t3-skirmish7.wrf | 25 ++++++++++++++++++ src/init.c | 15 +++++++++-- src/multimenu.c | 48 ++++++++++++++++++++++++++++++++++- 14 files changed, 333 insertions(+), 5 deletions(-) ------------------------- Commit: 89e9127957fc0a2cb94f46f0fcf2917a7a9b0d8d Trac URL: http://developer.wz2100.net/changeset/89e9127957fc0a2cb94f46f0fcf2917a7a9b0d8d Author: buginator <bugina...@gna.org> Date: Sun Oct 17 17:14:36 2010 -0400 The Super Transport (which is the same gfx as the transport in SP game) is available in MP games now. The Super Transport can carry a max of 10 units, their weights are calculated by Cyborg / light unit : 1 "slot" used Medium unit : 2 "slots" used. Heavy : 3 "slots" used. The Super Transport becomes available after you reseach the cyborg transport, and you research the Super Transport. The stats of the Super Transport are NOT final. Conflicts: data/mp/stats/assignweapons.txt data/mp/stats/templates.txt src/order.c data/mp/components/bodies/drtrans.pie | 251 ++++++++++++++++++++ data/mp/messages/resmessagesall.rmsg | 15 ++ data/mp/messages/strings/names.txt | 3 + data/mp/messages/strings/resstrings.txt | 2 + data/mp/stats/assignweapons.txt | 1 + data/mp/stats/body.txt | 1 + data/mp/stats/research/multiplayer/prresearch.txt | 2 + data/mp/stats/research/multiplayer/research.txt | 1 + .../stats/research/multiplayer/resultcomponent.txt | 1 + data/mp/stats/templates.txt | 1 + src/display.c | 17 +- src/intdisplay.c | 29 ++- src/mapdisplay.c | 139 ++++++----- src/order.c | 78 ++++--- src/transporter.c | 68 ++++-- 15 files changed, 479 insertions(+), 130 deletions(-) ------------------------- Commit: 905d039a566d89dd6797969cd8ca4f27040308cf Trac URL: http://developer.wz2100.net/changeset/905d039a566d89dd6797969cd8ca4f27040308cf Author: buginator <bugina...@gna.org> Date: Thu Sep 30 17:38:00 2010 -0400 Apply TCmask pies from ticket:1757 Textures & wrf changes will be in next commit (cherry picked from commit 82a93bb9cf8cf58ef2097aa43f75a620d1e8e309) data/base/components/bodies/cybd_run.pie | 2 +- data/base/components/bodies/cybdpair.pie | 2 +- data/base/components/bodies/cybdpjmp.pie | 2 +- data/base/components/bodies/cybdplnd.pie | 2 +- data/base/components/bodies/cybdprun.pie | 2 +- data/base/components/bodies/drtrans.pie | 2 +- data/base/components/prop/mibnkdrl.pie | 2 +- data/base/components/prop/mibnkdrr.pie | 2 +- data/base/components/prop/prhhov1.pie | 4 +- data/base/components/prop/prhlhtr3.pie | 4 +- data/base/components/prop/prhltrk3.pie | 4 +- data/base/components/prop/prhlvtl1.pie | 4 +- data/base/components/prop/prhlvtl2.pie | 4 +- data/base/components/prop/prhlvtl3.pie | 4 +- data/base/components/prop/prhlvtl4.pie | 4 +- data/base/components/prop/prhlwhl1.pie | 4 +- data/base/components/prop/prhrhtr3.pie | 4 +- data/base/components/prop/prhrtrk3.pie | 4 +- data/base/components/prop/prhrvtl1.pie | 4 +- data/base/components/prop/prhrvtl2.pie | 4 +- data/base/components/prop/prhrvtl3.pie | 4 +- data/base/components/prop/prhrvtl4.pie | 4 +- data/base/components/prop/prhrwhl1.pie | 4 +- data/base/components/prop/prlhov1.pie | 4 +- data/base/components/prop/prllhtr1.pie | 4 +- data/base/components/prop/prlltrk1.pie | 4 +- data/base/components/prop/prllvtl1.pie | 4 +- data/base/components/prop/prllvtl2.pie | 4 +- data/base/components/prop/prllvtl3.pie | 4 +- data/base/components/prop/prllwhl1.pie | 4 +- data/base/components/prop/prlrhtr1.pie | 4 +- data/base/components/prop/prlrtrk1.pie | 4 +- data/base/components/prop/prlrvtl1.pie | 4 +- data/base/components/prop/prlrvtl2.pie | 4 +- data/base/components/prop/prlrvtl3.pie | 4 +- data/base/components/prop/prlrwhl1.pie | 4 +- data/base/components/prop/prmhov1.pie | 4 +- data/base/components/prop/prmlhtr2.pie | 4 +- data/base/components/prop/prmltrk2.pie | 4 +- data/base/components/prop/prmlvtl1.pie | 4 +- data/base/components/prop/prmlwhl1.pie | 4 +- data/base/components/prop/prmrhtr2.pie | 4 +- data/base/components/prop/prmrtrk2.pie | 4 +- data/base/components/prop/prmrvtl1.pie | 4 +- data/base/components/prop/prmrwhl1.pie | 4 +- data/base/components/weapons/cy_can.pie | 2 +- data/base/components/weapons/cy_las.pie | 2 +- data/base/components/weapons/cy_rail.pie | 4 +- data/base/components/weapons/cybody.pie | 2 +- data/base/components/weapons/gnhgss.pie | 2 +- data/base/components/weapons/gnhsnsr3.pie | 2 +- data/base/components/weapons/gnlgss.pie | 2 +- data/base/components/weapons/gnlsnsr1.pie | 4 +- data/base/components/weapons/gnmgss.pie | 2 +- data/base/components/weapons/gnmsnsr2.pie | 2 +- data/base/components/weapons/mibnkgun.pie | 2 +- data/base/components/weapons/mibnktur.pie | 2 +- data/base/components/weapons/misensor.pie | 4 +- data/base/components/weapons/trhair.pie | 4 +- data/base/components/weapons/trhcan.pie | 4 +- data/base/components/weapons/trhcon.pie | 4 +- data/base/components/weapons/trhecm3.pie | 4 +- data/base/components/weapons/trhgss.pie | 4 +- data/base/components/weapons/trhhow2.pie | 4 +- data/base/components/weapons/trhhowt.pie | 4 +- data/base/components/weapons/trhlas.pie | 4 +- data/base/components/weapons/trhmsl.pie | 4 +- data/base/components/weapons/trhmslab.pie | 4 +- data/base/components/weapons/trhmsli.pie | 4 +- data/base/components/weapons/trhmslsa.pie | 4 +- data/base/components/weapons/trhplasm.pie | 4 +- data/base/components/weapons/trhrckt.pie | 4 +- data/base/components/weapons/trhrmort.pie | 4 +- data/base/components/weapons/trhsnsr3.pie | 4 +- data/base/components/weapons/trhsuper.pie | 4 +- data/base/components/weapons/trhvcan.pie | 4 +- data/base/components/weapons/trlacan.pie | 4 +- data/base/components/weapons/trlcan.pie | 4 +- data/base/components/weapons/trlcmd1.pie | 2 +- data/base/components/weapons/trlcon.pie | 4 +- data/base/components/weapons/trlflmr.pie | 4 +- data/base/components/weapons/trlgss.pie | 4 +- data/base/components/weapons/trlmg1.pie | 4 +- data/base/components/weapons/trlmg2.pie | 4 +- data/base/components/weapons/trlmsl.pie | 4 +- data/base/components/weapons/trlrckt.pie | 4 +- data/base/components/weapons/trlrcktp.pie | 4 +- data/base/components/weapons/trlsnsr1.pie | 4 +- data/base/components/weapons/trlvtlhe.pie | 2 +- data/base/components/weapons/trlvtlin.pie | 2 +- data/base/components/weapons/trmacan.pie | 4 +- data/base/components/weapons/trmair.pie | 4 +- data/base/components/weapons/trmcan.pie | 4 +- data/base/components/weapons/trmcon.pie | 4 +- data/base/components/weapons/trmecm1.pie | 4 +- data/base/components/weapons/trmecm2.pie | 4 +- data/base/components/weapons/trmflmr.pie | 4 +- data/base/components/weapons/trmgss.pie | 4 +- data/base/components/weapons/trmhowt.pie | 4 +- data/base/components/weapons/trmlas.pie | 4 +- data/base/components/weapons/trmmg.pie | 4 +- data/base/components/weapons/trmmort.pie | 4 +- data/base/components/weapons/trmmsl.pie | 4 +- data/base/components/weapons/trmmsla.pie | 4 +- data/base/components/weapons/trmmslaa.pie | 4 +- data/base/components/weapons/trmmslat.pie | 4 +- data/base/components/weapons/trmmslbb.pie | 4 +- data/base/components/weapons/trmmslsa.pie | 4 +- data/base/components/weapons/trmrckt.pie | 4 +- data/base/components/weapons/trmrckta.pie | 4 +- data/base/components/weapons/trmrcktb.pie | 4 +- data/base/components/weapons/trmrktbb.pie | 4 +- data/base/components/weapons/trmsnsr2.pie | 4 +- data/base/components/weapons/trmvcan.pie | 4 +- data/base/components/weapons/trmvtlhe.pie | 2 +- data/base/components/weapons/trmvtlin.pie | 2 +- data/base/effects/cybitbod.pie | 4 +- data/base/effects/cybitgun.pie | 2 +- data/base/effects/cybitlg1.pie | 2 +- data/base/effects/cybitrkt.pie | 2 +- data/base/effects/cyshadow.pie | 2 +- data/base/effects/fxdirt.pie | 2 +- data/base/effects/fxlbmbi1.pie | 2 +- data/base/effects/fxlenfl.pie | 2 +- data/base/effects/fxmbmbi2.pie | 2 +- data/base/effects/fxscudm.pie | 2 +- data/base/effects/midebr1.pie | 2 +- data/base/effects/midebr2.pie | 2 +- data/base/effects/midebr3.pie | 2 +- data/base/effects/midebr4.pie | 2 +- data/base/effects/midebr5.pie | 2 +- data/base/features/blfactrd.pie | 2 +- data/base/features/blware1.pie | 2 +- data/base/features/blware2.pie | 4 +- data/base/features/blware3.pie | 4 +- data/base/features/drwreck.pie | 2 +- data/base/features/miairtrf.pie | 2 +- data/base/features/miarthov.pie | 2 +- data/base/features/micapsul.pie | 2 +- data/base/features/mifactry.pie | 2 +- data/base/features/mioil.pie | 4 +- data/base/features/mioiltow.pie | 2 +- data/base/features/mipipe1a.pie | 2 +- data/base/features/mipipe2a.pie | 2 +- data/base/features/mipipe3a.pie | 2 +- data/base/features/mislick.pie | 2 +- data/base/misc/arrow.pie | 2 +- data/base/misc/blipart.pie | 4 +- data/base/misc/blipenm.pie | 4 +- data/base/misc/blipres.pie | 4 +- data/base/misc/iccamera.pie | 2 +- data/base/misc/icsynapt.pie | 2 +- data/base/misc/micnum1.pie | 2 +- data/base/misc/micnum2.pie | 2 +- data/base/misc/micnum3.pie | 2 +- data/base/misc/micnum4.pie | 2 +- data/base/misc/micnum5.pie | 2 +- data/base/misc/minum1.pie | 2 +- data/base/misc/minum2.pie | 2 +- data/base/misc/minum3.pie | 2 +- data/base/misc/minum4.pie | 2 +- data/base/misc/minum5.pie | 2 +- data/base/misc/mirnum1.pie | 2 +- data/base/misc/mitrnshd.pie | 4 +- data/base/misc/mivnum1.pie | 2 +- data/base/misc/mivnum2.pie | 2 +- data/base/misc/mivnum3.pie | 2 +- data/base/misc/mivnum4.pie | 2 +- data/base/misc/mivnum5.pie | 4 +- data/base/misc/researchimds/dpvtol.pie | 2 +- data/base/misc/researchimds/icamrhot.pie | 4 +- data/base/misc/researchimds/icamrknt.pie | 4 +- data/base/misc/researchimds/iccccons.pie | 2 +- data/base/misc/researchimds/iccybmg.pie | 2 +- data/base/misc/researchimds/iceng.pie | 2 +- data/base/misc/researchimds/icmolql.pie | 2 +- data/base/misc/researchimds/icmslcd.pie | 2 +- data/base/misc/researchimds/icspaner.pie | 2 +- data/base/structs/bladvlab.pie | 2 +- data/base/structs/blaerolb.pie | 2 +- data/base/structs/blbunkms.pie | 2 +- data/base/structs/blderik.pie | 4 +- data/base/structs/bldrdcm0.pie | 2 +- data/base/structs/blgaurdn.pie | 2 +- data/base/structs/blgrdnex.pie | 2 +- data/base/structs/blguard1.pie | 2 +- data/base/structs/blguard2.pie | 2 +- data/base/structs/blguard3.pie | 2 +- data/base/structs/blguardr.pie | 2 +- data/base/structs/blgyrlab.pie | 2 +- data/base/structs/blhevlab.pie | 2 +- data/base/structs/blhq.pie | 280 ++++++++++++++-------------- data/base/structs/blhq2.pie | 2 +- data/base/structs/blindlab.pie | 2 +- data/base/structs/bllaslab.pie | 2 +- data/base/structs/blmssilo.pie | 2 +- data/base/structs/blnanlab.pie | 2 +- data/base/structs/blnavbak.pie | 2 +- data/base/structs/blnavbnk.pie | 2 +- data/base/structs/blpilbox.pie | 2 +- data/base/structs/blpower0.pie | 2 +- data/base/structs/blpower4.pie | 2 +- data/base/structs/blpowlab.pie | 2 +- data/base/structs/blresch0.pie | 2 +- data/base/structs/blresch4.pie | 2 +- data/base/structs/blrotlab.pie | 2 +- data/base/structs/blrpair1.pie | 2 +- data/base/structs/blrpair3.pie | 2 +- data/base/structs/blwall2.pie | 4 +- data/base/structs/blwall3.pie | 4 +- data/base/structs/blwallc1.pie | 4 +- data/base/structs/blwallc2.pie | 4 +- data/base/structs/blwallc3.pie | 4 +- data/base/structs/blwallh.pie | 4 +- data/base/structs/dummy.pie | 2 +- data/base/structs/icdozer.pie | 4 +- data/base/structs/mibar.pie | 2 +- data/base/structs/mibcool.pie | 2 +- data/base/structs/micool.pie | 2 +- data/base/structs/minuke.pie | 2 +- data/base/structs/mitrap2.pie | 4 +- data/base/structs/mitrapst.pie | 2 +- data/base/structs/miupdish.pie | 2 +- data/base/structs/miuptrim.pie | 4 +- data/mp/components/bodies/drcytran.pie | 2 +- data/mp/components/bodies/scbd_run.pie | 2 +- data/mp/components/prop/prshov1.pie | 4 +- data/mp/components/prop/prslhtr4.pie | 4 +- data/mp/components/prop/prsltrk4.pie | 4 +- data/mp/components/prop/prslvtl1.pie | 4 +- data/mp/components/prop/prslwhl1.pie | 4 +- data/mp/components/prop/prsrhtr4.pie | 4 +- data/mp/components/prop/prsrtrk4.pie | 4 +- data/mp/components/prop/prsrvtl1.pie | 4 +- data/mp/components/prop/prsrwhl1.pie | 4 +- data/mp/components/weapons/cy_con.pie | 2 +- data/mp/components/weapons/gnhemp.pie | 2 +- data/mp/components/weapons/gnhsnsr4.pie | 2 +- data/mp/components/weapons/gnmflmrp.pie | 2 +- data/mp/components/weapons/gnmrepr2.pie | 4 +- data/mp/components/weapons/gnwpfgss.pie | 2 +- data/mp/components/weapons/sc_asscn.pie | 2 +- data/mp/components/weapons/sc_can.pie | 2 +- data/mp/components/weapons/sc_hpvcn.pie | 2 +- data/mp/components/weapons/sc_pulse.pie | 2 +- data/mp/components/weapons/sc_rail2.pie | 4 +- data/mp/components/weapons/scbody.pie | 2 +- data/mp/components/weapons/trhemp.pie | 4 +- data/mp/components/weapons/trhmg.pie | 4 +- data/mp/components/weapons/trhvcan2.pie | 4 +- data/mp/components/weapons/trlassat.pie | 4 +- data/mp/components/weapons/trlvtlem.pie | 2 +- data/mp/components/weapons/trlvtlpl.pie | 2 +- data/mp/components/weapons/trmvtlem.pie | 2 +- data/mp/components/weapons/trmvtlpl.pie | 2 +- data/mp/components/weapons/trwpfcan.pie | 4 +- data/mp/components/weapons/trwpfgss.pie | 4 +- data/mp/components/weapons/trwpfmsl.pie | 4 +- data/mp/components/weapons/trwpfrkt.pie | 4 +- data/mp/effects/fxlbmbe1.pie | 2 +- data/mp/effects/fxlbmbe2.pie | 2 +- data/mp/effects/fxlbmbp1.pie | 2 +- data/mp/effects/fxlbmbp2.pie | 2 +- data/mp/structs/stwpfcan.pie | 2 +- 264 files changed, 536 insertions(+), 536 deletions(-) ------------------------- Commit: 5dc7903b9b34f8b88f94d476d636d231e1e28591 Trac URL: http://developer.wz2100.net/changeset/5dc7903b9b34f8b88f94d476d636d231e1e28591 Author: buginator <bugina...@gna.org> Date: Sat Oct 2 13:52:47 2010 -0400 Externalise all map tileset settings. (data files) (cherry picked from commit 5b56edc6fd0fcf8be5b313d77757c61f937cf44e) data/base/tileset/arizonadecals.txt | 25 +++++++++ data/base/tileset/arizonaground.txt | 79 +++++++++++++++++++++++++++++ data/base/tileset/rockiedecals.txt | 14 +++++ data/base/tileset/rockieground.txt | 81 ++++++++++++++++++++++++++++++ data/base/tileset/tertilesc1hwGtype.txt | 8 +++ data/base/tileset/tertilesc2hwGtype.txt | 9 +++ data/base/tileset/tertilesc3hwGtype.txt | 10 ++++ data/base/tileset/urbandecals.txt | 30 +++++++++++ data/base/tileset/urbanground.txt | 82 +++++++++++++++++++++++++++++++ 9 files changed, 338 insertions(+), 0 deletions(-) ------------------------- Commit: 6b296db0dd28d00e2a287e9e3f19c5db8bbf6039 Trac URL: http://developer.wz2100.net/changeset/6b296db0dd28d00e2a287e9e3f19c5db8bbf6039 Author: buginator <bugina...@gna.org> Date: Sun Oct 17 17:32:58 2010 -0400 Externalise all map tileset settings. (cherry picked from commit 0d01c4d81e6605ad50687f5d33f0a53332f78003) Conflicts: src/map.c src/map.c | 730 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 310 insertions(+), 420 deletions(-) ------------------------- Commit: e70c36723a24a29e43af73c5bac6b192269c97fd Trac URL: http://developer.wz2100.net/changeset/e70c36723a24a29e43af73c5bac6b192269c97fd Author: buginator <bugina...@gna.org> Date: Wed Oct 6 12:59:46 2010 -0400 Fix wrf files to make it more clear what is going on. Frontend.wrf is *NOT* the main texture loader for MP games, we are using limiter_tex.wrf for that, which is hardcoded in the sourcecode. (This is same behavior as trunk) (cherry picked from commit fb4a9e2797252b438a1b2fbfe14f71aa2a641b9b) data/base/wrf/cam2/cam2change.wrf | 18 +++++++++--------- data/base/wrf/cam3/cam3change.wrf | 18 +++++++++--------- data/base/wrf/limiter_tex.wrf | 19 ++++++++++++++----- data/base/wrf/vidmem.wrf | 20 +++++++++++++++----- data/base/wrf/vidmem2.wrf | 20 +++++++++++++++----- data/base/wrf/vidmem3.wrf | 21 +++++++++++++++------ data/mp/wrf/vidmem.wrf | 24 +++++++++++++++++------- data/mp/wrf/vidmem2.wrf | 21 +++++++++++++++------ data/mp/wrf/vidmem3.wrf | 23 ++++++++++++++++------- 9 files changed, 125 insertions(+), 59 deletions(-) ------------------------- Commit: 91e3dd44b71e71003f613b86b2bee8926d401929 Trac URL: http://developer.wz2100.net/changeset/91e3dd44b71e71003f613b86b2bee8926d401929 Author: buginator <bugina...@gna.org> Date: Sat Oct 9 15:42:41 2010 -0400 Fix a typo. Thanks to Berg for the heads up. (cherry picked from commit d90e246441df486d2c2a077b39151c3333baf8d4) data/mp/wrf/vidmem.wrf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/mp/wrf/vidmem.wrf b/data/mp/wrf/vidmem.wrf index ce3d7b3..0858d56 100644 --- a/data/mp/wrf/vidmem.wrf +++ b/data/mp/wrf/vidmem.wrf @@ -49,6 +49,6 @@ file TEXPAGE "page-46-cliff.png" file TEXPAGE "page-47-tiles.png" file TEXPAGE "page-80-water-1.png" file TEXPAGE "page-81-water-2.png" -/* These are MP specific *./ +/* These are MP specific */ file TEXPAGE "page-28-naval.png" file TEXPAGE "page-59-more-weapons.png" \ No newline at end of file ------------------------- Commit: e09e8ac4fe331dde7d1ebaf8943be97d827b39ec Trac URL: http://developer.wz2100.net/changeset/e09e8ac4fe331dde7d1ebaf8943be97d827b39ec Author: buginator <bugina...@gna.org> Date: Wed Oct 6 12:48:52 2010 -0400 If resource was not loaded, then don't continue on, error out. (cherry picked from commit aa8bf289b8f4fad5d6122a43432521dbf2e2cc92) lib/ivis_common/bitimage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ------------------------- Commit: 4d4e39e6d4dc435bf3625e89ce60ff8b20c8603b Trac URL: http://developer.wz2100.net/changeset/4d4e39e6d4dc435bf3625e89ce60ff8b20c8603b Author: buginator <bugina...@gna.org> Date: Sat Oct 2 13:53:22 2010 -0400 Apply TCmask to research center (cherry picked from commit b91f08c5977c910fca985eb2d04106827395df7a) data/base/structs/blresch0.pie | 2 +- data/base/structs/blresch4.pie | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ------------------------- Commit: 162573a74dc8f8c32f097c0b6f5fe74505f669a4 Trac URL: http://developer.wz2100.net/changeset/162573a74dc8f8c32f097c0b6f5fe74505f669a4 Author: buginator <bugina...@gna.org> Date: Sat Oct 2 13:53:34 2010 -0400 Apply TCmask to HQ (cherry picked from commit 5217d81a458b94d52990d1efbacc39a7c2aa572b) data/base/structs/blhq.pie | 2 +- data/base/structs/blhq3.pie | 2 +- data/base/structs/blhq4.pie | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ------------------------- Commit: 9b05b304021bdb3292d25867fc0e2d7977ecb53f Trac URL: http://developer.wz2100.net/changeset/9b05b304021bdb3292d25867fc0e2d7977ecb53f Author: buginator <bugina...@gna.org> Date: Sat Oct 2 13:53:58 2010 -0400 Apply TCmask to factory (cherry picked from commit af45b8dbe9d03b0a70d90e3dba39301614b806a6) data/base/structs/blfact0.pie | 2 +- data/base/structs/blfact1.pie | 2 +- data/base/structs/blfact2.pie | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ------------------------- Commit: 82b95c20ea044ae1077b5960c61db62c8fbb7746 Trac URL: http://developer.wz2100.net/changeset/82b95c20ea044ae1077b5960c61db62c8fbb7746 Author: buginator <bugina...@gna.org> Date: Sat Oct 2 13:54:17 2010 -0400 Apply TCmask to command relay center (cherry picked from commit 8e3bb05fe807fb10e851c370498e7751c6e5d54c) data/base/structs/bldrdcm0.pie | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/base/structs/bldrdcm0.pie b/data/base/structs/bldrdcm0.pie index a2acae7..b8448fa 100644 --- a/data/base/structs/bldrdcm0.pie +++ b/data/base/structs/bldrdcm0.pie @@ -1,5 +1,5 @@ PIE 2 -TYPE 200 +TYPE 10200 TEXTURE 0 page-10-laboratories.png 256 256 LEVELS 1 LEVEL 1 ------------------------- Commit: b16dbab041e6b5a2e5be5335084c4f01d970a252 Trac URL: http://developer.wz2100.net/changeset/b16dbab041e6b5a2e5be5335084c4f01d970a252 Author: buginator <bugina...@gna.org> Date: Tue Oct 5 23:13:30 2010 -0400 Apply textures from ticket #1757 TCmask textures ticket:1757 TC mask textures done by Berg (cherry picked from commit 2bab0b57a91ad4d83c5e8c2731e1a3c9ae2c8a92) data/base/texpages/page-10-laboratories.png | Bin 33099 -> 262963 bytes data/base/texpages/page-10_tcmask.png | Bin 0 -> 263000 bytes data/base/texpages/page-11-player-buildings.png | Bin 18670 -> 1050923 bytes data/base/texpages/page-11_tcmask.png | Bin 0 -> 263707 bytes data/base/texpages/page-12-player-buildings.png | Bin 44633 -> 1050923 bytes data/base/texpages/page-12_tcmask.png | Bin 0 -> 1050960 bytes data/base/texpages/page-13-player-buildings.png | Bin 25452 -> 262963 bytes data/base/texpages/page-13_tcmask.png | Bin 0 -> 263000 bytes data/base/texpages/page-14-droid-hubs.png | Bin 326080 -> 1050923 bytes data/base/texpages/page-14_tcmask.png | Bin 0 -> 1050960 bytes data/base/texpages/page-15-droid-hubs.png | Bin 15423 -> 262963 bytes data/base/texpages/page-15_tcmask.png | Bin 0 -> 263000 bytes data/base/texpages/page-16-droid-drives.png | Bin 19428 -> 262963 bytes data/base/texpages/page-16_tcmask.png | Bin 0 -> 263000 bytes data/base/texpages/page-17-droid-weapons.png | Bin 387906 -> 4205428 bytes data/base/texpages/page-17_tcmask.png | Bin 0 -> 4202288 bytes 16 files changed, 0 insertions(+), 0 deletions(-) ------------------------- Commit: 43d449aec7e837c658cfb93a502a6138c15ca0e0 Trac URL: http://developer.wz2100.net/changeset/43d449aec7e837c658cfb93a502a6138c15ca0e0 Author: safety0ff <safety...@users.sourceforge.net> Date: Sun Oct 17 13:34:44 2010 -0400 Apply TCMask to VTOL factories.(cherry picked from commit b04220cb317340e2c96e32b058e85b8cd0db200c) data/base/structs/blvfact0.pie | 2 +- data/base/structs/blvfact1.pie | 2 +- data/base/structs/blvfact2.pie | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ------------------------- Commit: ff4690745fb38c6f84ce08b159c55874b55b62a1 Trac URL: http://developer.wz2100.net/changeset/ff4690745fb38c6f84ce08b159c55874b55b62a1 Author: buginator <bugina...@gna.org> Date: Wed Oct 13 14:45:22 2010 -0400 Externalize the former anonymous enum members for each tileset. This now allows switching between texture sets much easier than what was previously possible. NOTE: Files are currently set up for trunk's textures. refs ticket:2013 (cherry picked from commit 696f6c251fe9359041e0905207843f79f0ee1d2a) data/base/tileset/arizona_enum.txt | 8 + data/base/tileset/rockie_enum.txt | 10 ++ data/base/tileset/urban_enum.txt | 9 + src/map.c | 308 +++++++++++++++++++----------------- 4 files changed, 189 insertions(+), 146 deletions(-) ------------------------- ------------------------------------------------------------------------------ Download new Adobe(R) Flash(R) Builder(TM) 4 The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today! http://p.sf.net/sfu/adobe-dev2dev _______________________________________________ Warzone2100-commits mailing list Warzone2100-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
