Menu
▾
▴
[Warzone2100-commits] [Warzone2100/warzone2100] 49e978: Fix spurious out-of-synch messages when pausing in...
|
From: <no...@gi...> - 2010-12-17 01:00:56
|
Branch: refs/heads/lua2 Home: https://github.com/Warzone2100/warzone2100 Commit: 49e9780f412edab6be982dc3cbd015f078e46493 https://github.com/Warzone2100/warzone2100/commit/49e9780f412edab6be982dc3cbd015f078e46493 Author: Cyp <cy...@wz...> Date: 2010-10-16 (Sat, 16 Oct 2010) Changed paths: M lib/gamelib/gtime.c Log Message: ----------- Fix spurious out-of-synch messages when pausing in single-player mode. This was caused by forgetting to set the delta tick time to 0 when paused. Don't know whether fixing this fixes anything else. Commit: 955788bfa94d812637c1d5cd54fce2413ffd9331 https://github.com/Warzone2100/warzone2100/commit/955788bfa94d812637c1d5cd54fce2413ffd9331 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-16 (Sat, 16 Oct 2010) Changed paths: M src/Makefile.am M src/action.c M src/drive.c M src/droid.c R src/formation.c R src/formation.h R src/formationdef.h M src/fpath.c M src/game.c M src/init.c M src/makefile.win32 M src/map.c M src/move.c M src/multibot.cpp M src/objmem.c M src/order.c M src/structure.c Log Message: ----------- Remove old, broken formation system. This removes 1084 lines of code. Commit: 4bbd0e9b5fb972d4049456a9c89c3caf2829c4a0 https://github.com/Warzone2100/warzone2100/commit/4bbd0e9b5fb972d4049456a9c89c3caf2829c4a0 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-16 (Sat, 16 Oct 2010) Changed paths: M src/game.c M src/move.c Log Message: ----------- Make movement code better by deleting more lines of code. Remove boundary vectors and the hack that makes droids phase in walk nodes opportunistically. Now follow path as given. Commit: 1ef4fe7b590456c371df27d558574182a96786bb https://github.com/Warzone2100/warzone2100/commit/1ef4fe7b590456c371df27d558574182a96786bb Author: Christian Ohm <ch...@gm...> Date: 2010-10-16 (Sat, 16 Oct 2010) Changed paths: M po/POTFILES.in Log Message: ----------- Update POTFILES.in. Commit: c2368d51073b1d8d182d13361d5712e7f02aff64 https://github.com/Warzone2100/warzone2100/commit/c2368d51073b1d8d182d13361d5712e7f02aff64 Author: buginator <bug...@gn...> Date: 2010-10-16 (Sat, 16 Oct 2010) Changed paths: M .gitignore Log Message: ----------- Update .gitignore for MSVC Commit: 6f2580255378cdd7e39d540730b1e41aaf4be1a5 https://github.com/Warzone2100/warzone2100/commit/6f2580255378cdd7e39d540730b1e41aaf4be1a5 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/intdisplay.c Log Message: ----------- Fix the ugly "Bug! (e)" message for script added production. Makes watching autogames really annoying. Commit: 860d70715dc1eee474e15a327ba72da223e75eac https://github.com/Warzone2100/warzone2100/commit/860d70715dc1eee474e15a327ba72da223e75eac Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M .gitignore Log Message: ----------- Merge branch 'master' of gitorious.org:warzone2100/mainline Commit: 0c0bcd5c358f42d3ca3f98a0003fcd2db314e3d3 https://github.com/Warzone2100/warzone2100/commit/0c0bcd5c358f42d3ca3f98a0003fcd2db314e3d3 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/astar.cpp M src/display.c M src/init.c M src/map.c M src/map.h M src/scriptfuncs.c M src/scriptfuncs.h Log Message: ----------- Add a danger map to the AIs. This will keep them from wandering into the line of fire of enemies while going from one place to another, and can also be used for quick lookups to see if a particular tile is threatened by potential enemy fire. Patch review by SafetyOff and with help from Cyp. Commit: caf94e57235d3b215c863161ab1a2f88bc86cf3b https://github.com/Warzone2100/warzone2100/commit/caf94e57235d3b215c863161ab1a2f88bc86cf3b Author: Cyp <cy...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/multibot.cpp Log Message: ----------- Fix droid order lists getting cleared when processing orders to build modules. Probably fixes other cases of droid order lists getting cleared. Fixed by simplifying recvDroidInfo to call orderDroidBase directly. Commit: 5b45925a1ced14df1de0695a0f7ec169a1a73364 https://github.com/Warzone2100/warzone2100/commit/5b45925a1ced14df1de0695a0f7ec169a1a73364 Author: dak180 <da...@us...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M macosx/Warzone.xcodeproj/project.pbxproj Log Message: ----------- Remove formation.c from the xcode project. Commit: 1477265908d450557b2fd865c62c007b401701f9 https://github.com/Warzone2100/warzone2100/commit/1477265908d450557b2fd865c62c007b401701f9 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/map.c M src/map.h Log Message: ----------- Add support for multiple weapons and differentiate between air and ground hitting weapon types. Early support for AA threat maps. Patch reviewed by SafetyOff. Ref ticket:2203 Commit: 8a01df2f1a9363a2b41eff8d2787aaa5405e9fb4 https://github.com/Warzone2100/warzone2100/commit/8a01df2f1a9363a2b41eff8d2787aaa5405e9fb4 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/action.c M src/projectile.c M src/scriptfuncs.c Log Message: ----------- Clean up handling of SHOOT_IN_AIR and SHOOT_ON_GROUND with some fringe behaviour changes. These are bit values, not enums! Patch reviewed by SafetyOff. Commit: f894586e5cce49afdbae518999f041fadcb5d3d0 https://github.com/Warzone2100/warzone2100/commit/f894586e5cce49afdbae518999f041fadcb5d3d0 Author: Christian Ohm <ch...@gm...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: 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 M po/uk_UA.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update translations. Commit: a11d60774ea3db52ff7212175de3009977c4848a https://github.com/Warzone2100/warzone2100/commit/a11d60774ea3db52ff7212175de3009977c4848a Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M lib/framework/trig.c M win32/Warzone2100.vcproj Log Message: ----------- Fix MSVC builds Commit: 4cc9640860ca8852206deb168da9916e4ac228ba https://github.com/Warzone2100/warzone2100/commit/4cc9640860ca8852206deb168da9916e4ac228ba Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: A data/base/wrf/multi/skirmish3.wrf A data/base/wrf/multi/skirmish5.wrf A data/base/wrf/multi/skirmish6.wrf A data/base/wrf/multi/skirmish7.wrf A data/mp/wrf/multi/t2-skirmish3.wrf A data/mp/wrf/multi/t2-skirmish5.wrf A data/mp/wrf/multi/t2-skirmish6.wrf A data/mp/wrf/multi/t2-skirmish7.wrf A data/mp/wrf/multi/t3-skirmish3.wrf A data/mp/wrf/multi/t3-skirmish5.wrf A data/mp/wrf/multi/t3-skirmish6.wrf A data/mp/wrf/multi/t3-skirmish7.wrf M src/init.c M src/multimenu.c Log Message: ----------- 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. Commit: 89e9127957fc0a2cb94f46f0fcf2917a7a9b0d8d https://github.com/Warzone2100/warzone2100/commit/89e9127957fc0a2cb94f46f0fcf2917a7a9b0d8d Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: A data/mp/components/bodies/drtrans.pie M data/mp/messages/resmessagesall.rmsg M data/mp/messages/strings/names.txt M data/mp/messages/strings/resstrings.txt M data/mp/stats/assignweapons.txt M data/mp/stats/body.txt M data/mp/stats/research/multiplayer/prresearch.txt M data/mp/stats/research/multiplayer/research.txt M data/mp/stats/research/multiplayer/resultcomponent.txt M data/mp/stats/templates.txt M src/display.c M src/intdisplay.c M src/mapdisplay.c M src/order.c M src/transporter.c Log Message: ----------- 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 Commit: 905d039a566d89dd6797969cd8ca4f27040308cf https://github.com/Warzone2100/warzone2100/commit/905d039a566d89dd6797969cd8ca4f27040308cf Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/components/bodies/cybd_run.pie 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/cybdprun.pie M data/base/components/bodies/drtrans.pie M data/base/components/prop/mibnkdrl.pie M data/base/components/prop/mibnkdrr.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/gnhgss.pie M data/base/components/weapons/gnhsnsr3.pie M data/base/components/weapons/gnlgss.pie M data/base/components/weapons/gnlsnsr1.pie M data/base/components/weapons/gnmgss.pie M data/base/components/weapons/gnmsnsr2.pie M data/base/components/weapons/mibnkgun.pie M data/base/components/weapons/mibnktur.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/trlcmd1.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/trlvtlhe.pie M data/base/components/weapons/trlvtlin.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/components/weapons/trmvtlhe.pie M data/base/components/weapons/trmvtlin.pie M data/base/effects/cybitbod.pie M data/base/effects/cybitgun.pie M data/base/effects/cybitlg1.pie M data/base/effects/cybitrkt.pie M data/base/effects/cyshadow.pie M data/base/effects/fxdirt.pie M data/base/effects/fxlbmbi1.pie M data/base/effects/fxlenfl.pie M data/base/effects/fxmbmbi2.pie M data/base/effects/fxscudm.pie M data/base/effects/midebr1.pie M data/base/effects/midebr2.pie M data/base/effects/midebr3.pie M data/base/effects/midebr4.pie M data/base/effects/midebr5.pie M data/base/features/blfactrd.pie M data/base/features/blware1.pie M data/base/features/blware2.pie M data/base/features/blware3.pie M data/base/features/drwreck.pie M data/base/features/miairtrf.pie M data/base/features/miarthov.pie M data/base/features/micapsul.pie M data/base/features/mifactry.pie M data/base/features/mioil.pie M data/base/features/mioiltow.pie M data/base/features/mipipe1a.pie M data/base/features/mipipe2a.pie M data/base/features/mipipe3a.pie M data/base/features/mislick.pie M data/base/misc/arrow.pie M data/base/misc/blipart.pie M data/base/misc/blipenm.pie M data/base/misc/blipres.pie M data/base/misc/iccamera.pie M data/base/misc/icsynapt.pie M data/base/misc/micnum1.pie M data/base/misc/micnum2.pie M data/base/misc/micnum3.pie M data/base/misc/micnum4.pie M data/base/misc/micnum5.pie M data/base/misc/minum1.pie M data/base/misc/minum2.pie M data/base/misc/minum3.pie M data/base/misc/minum4.pie M data/base/misc/minum5.pie M data/base/misc/mirnum1.pie M data/base/misc/mitrnshd.pie M data/base/misc/mivnum1.pie M data/base/misc/mivnum2.pie M data/base/misc/mivnum3.pie M data/base/misc/mivnum4.pie M data/base/misc/mivnum5.pie M data/base/misc/researchimds/dpvtol.pie M data/base/misc/researchimds/icamrhot.pie M data/base/misc/researchimds/icamrknt.pie M data/base/misc/researchimds/iccccons.pie M data/base/misc/researchimds/iccybmg.pie M data/base/misc/researchimds/iceng.pie M data/base/misc/researchimds/icmolql.pie M data/base/misc/researchimds/icmslcd.pie M data/base/misc/researchimds/icspaner.pie M data/base/structs/bladvlab.pie M data/base/structs/blaerolb.pie M data/base/structs/blbunkms.pie M data/base/structs/blderik.pie M data/base/structs/bldrdcm0.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/blgyrlab.pie M data/base/structs/blhevlab.pie M data/base/structs/blhq.pie M data/base/structs/blhq2.pie M data/base/structs/blindlab.pie M data/base/structs/bllaslab.pie M data/base/structs/blmssilo.pie M data/base/structs/blnanlab.pie M data/base/structs/blnavbak.pie M data/base/structs/blnavbnk.pie M data/base/structs/blpilbox.pie M data/base/structs/blpower0.pie M data/base/structs/blpower4.pie M data/base/structs/blpowlab.pie M data/base/structs/blresch0.pie M data/base/structs/blresch4.pie M data/base/structs/blrotlab.pie M data/base/structs/blrpair1.pie M data/base/structs/blrpair3.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/mibar.pie M data/base/structs/mibcool.pie M data/base/structs/micool.pie M data/base/structs/minuke.pie M data/base/structs/mitrap2.pie M data/base/structs/mitrapst.pie M data/base/structs/miupdish.pie M data/base/structs/miuptrim.pie M data/mp/components/bodies/drcytran.pie M data/mp/components/bodies/scbd_run.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/cy_con.pie M data/mp/components/weapons/gnhemp.pie M data/mp/components/weapons/gnhsnsr4.pie M data/mp/components/weapons/gnmflmrp.pie M data/mp/components/weapons/gnmrepr2.pie M data/mp/components/weapons/gnwpfgss.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/trlassat.pie M data/mp/components/weapons/trlvtlem.pie M data/mp/components/weapons/trlvtlpl.pie M data/mp/components/weapons/trmvtlem.pie M data/mp/components/weapons/trmvtlpl.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/effects/fxlbmbe1.pie M data/mp/effects/fxlbmbe2.pie M data/mp/effects/fxlbmbp1.pie M data/mp/effects/fxlbmbp2.pie M data/mp/structs/stwpfcan.pie Log Message: ----------- Apply TCmask pies from ticket:1757 Textures & wrf changes will be in next commit (cherry picked from commit 82a93bb9cf8cf58ef2097aa43f75a620d1e8e309) Commit: 5dc7903b9b34f8b88f94d476d636d231e1e28591 https://github.com/Warzone2100/warzone2100/commit/5dc7903b9b34f8b88f94d476d636d231e1e28591 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: A data/base/tileset/arizonadecals.txt A data/base/tileset/arizonaground.txt A data/base/tileset/rockiedecals.txt A data/base/tileset/rockieground.txt A data/base/tileset/tertilesc1hwGtype.txt A data/base/tileset/tertilesc2hwGtype.txt A data/base/tileset/tertilesc3hwGtype.txt A data/base/tileset/urbandecals.txt A data/base/tileset/urbanground.txt Log Message: ----------- Externalise all map tileset settings. (data files) (cherry picked from commit 5b56edc6fd0fcf8be5b313d77757c61f937cf44e) Commit: 6b296db0dd28d00e2a287e9e3f19c5db8bbf6039 https://github.com/Warzone2100/warzone2100/commit/6b296db0dd28d00e2a287e9e3f19c5db8bbf6039 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/map.c Log Message: ----------- Externalise all map tileset settings. (cherry picked from commit 0d01c4d81e6605ad50687f5d33f0a53332f78003) Conflicts: src/map.c Commit: e70c36723a24a29e43af73c5bac6b192269c97fd https://github.com/Warzone2100/warzone2100/commit/e70c36723a24a29e43af73c5bac6b192269c97fd Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/wrf/cam2/cam2change.wrf M data/base/wrf/cam3/cam3change.wrf M data/base/wrf/limiter_tex.wrf M data/base/wrf/vidmem.wrf M data/base/wrf/vidmem2.wrf M data/base/wrf/vidmem3.wrf M data/mp/wrf/vidmem.wrf M data/mp/wrf/vidmem2.wrf M data/mp/wrf/vidmem3.wrf Log Message: ----------- 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) Commit: 91e3dd44b71e71003f613b86b2bee8926d401929 https://github.com/Warzone2100/warzone2100/commit/91e3dd44b71e71003f613b86b2bee8926d401929 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/mp/wrf/vidmem.wrf Log Message: ----------- Fix a typo. Thanks to Berg for the heads up. (cherry picked from commit d90e246441df486d2c2a077b39151c3333baf8d4) Commit: e09e8ac4fe331dde7d1ebaf8943be97d827b39ec https://github.com/Warzone2100/warzone2100/commit/e09e8ac4fe331dde7d1ebaf8943be97d827b39ec Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M lib/ivis_common/bitimage.c Log Message: ----------- If resource was not loaded, then don't continue on, error out. (cherry picked from commit aa8bf289b8f4fad5d6122a43432521dbf2e2cc92) Commit: 4d4e39e6d4dc435bf3625e89ce60ff8b20c8603b https://github.com/Warzone2100/warzone2100/commit/4d4e39e6d4dc435bf3625e89ce60ff8b20c8603b Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/structs/blresch0.pie M data/base/structs/blresch4.pie Log Message: ----------- Apply TCmask to research center (cherry picked from commit b91f08c5977c910fca985eb2d04106827395df7a) Commit: 162573a74dc8f8c32f097c0b6f5fe74505f669a4 https://github.com/Warzone2100/warzone2100/commit/162573a74dc8f8c32f097c0b6f5fe74505f669a4 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/structs/blhq.pie M data/base/structs/blhq3.pie M data/base/structs/blhq4.pie Log Message: ----------- Apply TCmask to HQ (cherry picked from commit 5217d81a458b94d52990d1efbacc39a7c2aa572b) Commit: 9b05b304021bdb3292d25867fc0e2d7977ecb53f https://github.com/Warzone2100/warzone2100/commit/9b05b304021bdb3292d25867fc0e2d7977ecb53f Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/structs/blfact0.pie M data/base/structs/blfact1.pie M data/base/structs/blfact2.pie Log Message: ----------- Apply TCmask to factory (cherry picked from commit af45b8dbe9d03b0a70d90e3dba39301614b806a6) Commit: 82b95c20ea044ae1077b5960c61db62c8fbb7746 https://github.com/Warzone2100/warzone2100/commit/82b95c20ea044ae1077b5960c61db62c8fbb7746 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/structs/bldrdcm0.pie Log Message: ----------- Apply TCmask to command relay center (cherry picked from commit 8e3bb05fe807fb10e851c370498e7751c6e5d54c) Commit: b16dbab041e6b5a2e5be5335084c4f01d970a252 https://github.com/Warzone2100/warzone2100/commit/b16dbab041e6b5a2e5be5335084c4f01d970a252 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/texpages/page-10-laboratories.png A data/base/texpages/page-10_tcmask.png M data/base/texpages/page-11-player-buildings.png A data/base/texpages/page-11_tcmask.png M data/base/texpages/page-12-player-buildings.png A data/base/texpages/page-12_tcmask.png M data/base/texpages/page-13-player-buildings.png A data/base/texpages/page-13_tcmask.png M data/base/texpages/page-14-droid-hubs.png A data/base/texpages/page-14_tcmask.png M data/base/texpages/page-15-droid-hubs.png A data/base/texpages/page-15_tcmask.png M data/base/texpages/page-16-droid-drives.png A data/base/texpages/page-16_tcmask.png M data/base/texpages/page-17-droid-weapons.png A data/base/texpages/page-17_tcmask.png Log Message: ----------- Apply textures from ticket #1757 TCmask textures ticket:1757 TC mask textures done by Berg (cherry picked from commit 2bab0b57a91ad4d83c5e8c2731e1a3c9ae2c8a92) Commit: 43d449aec7e837c658cfb93a502a6138c15ca0e0 https://github.com/Warzone2100/warzone2100/commit/43d449aec7e837c658cfb93a502a6138c15ca0e0 Author: safety0ff <saf...@us...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/base/structs/blvfact0.pie M data/base/structs/blvfact1.pie M data/base/structs/blvfact2.pie Log Message: ----------- Apply TCMask to VTOL factories.(cherry picked from commit b04220cb317340e2c96e32b058e85b8cd0db200c) Commit: ff4690745fb38c6f84ce08b159c55874b55b62a1 https://github.com/Warzone2100/warzone2100/commit/ff4690745fb38c6f84ce08b159c55874b55b62a1 Author: buginator <bug...@gn...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: A data/base/tileset/arizona_enum.txt A data/base/tileset/rockie_enum.txt A data/base/tileset/urban_enum.txt M src/map.c Log Message: ----------- 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) Commit: 95bbc77a1f6ea2db782d3565613b3e12ee463087 https://github.com/Warzone2100/warzone2100/commit/95bbc77a1f6ea2db782d3565613b3e12ee463087 Author: Christian Ohm <ch...@gm...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: 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 M po/uk_UA.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update translations. Commit: 4ccd57baed96126f33db51d1051716f6158888d2 https://github.com/Warzone2100/warzone2100/commit/4ccd57baed96126f33db51d1051716f6158888d2 Author: Cyp <cy...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M data/Makefile.am Log Message: ----------- Add missing "tileset \" to BASELIST, it should now be possible to start games again. Commit: b79e6da0ab753364c534dd168546c1d3d1deeb51 https://github.com/Warzone2100/warzone2100/commit/b79e6da0ab753364c534dd168546c1d3d1deeb51 Author: Cyp <cy...@wz...> Date: 2010-10-17 (Sun, 17 Oct 2010) Changed paths: M src/move.c Log Message: ----------- Let moving droids look ahead a short distance instead of narrowly following a path, and backtrack if starting to go the wrong way. If all else fails, pathfind again. Commit: ceaaaef8582bd1aaa9bb44d8e53dfd82d2354d25 https://github.com/Warzone2100/warzone2100/commit/ceaaaef8582bd1aaa9bb44d8e53dfd82d2354d25 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/map.c Log Message: ----------- Split danger map and threat map updates to use less CPU time each logical frame. Also optimize threat updates by ignoring friendly players earlier. Patch reviewed by SafetyOff. Commit: 1f857b4a52764ef239dd06b9e306607240b1c437 https://github.com/Warzone2100/warzone2100/commit/1f857b4a52764ef239dd06b9e306607240b1c437 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/display3d.c M src/map.h Log Message: ----------- Remove unused TILE_HILIGHT bits. Commit: 00406e5154ad6582ba49424d89f646d093991222 https://github.com/Warzone2100/warzone2100/commit/00406e5154ad6582ba49424d89f646d093991222 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/configuration.c Log Message: ----------- Remove completely obsolete idea of saving game.type to user settings. Commit: ee8024b6ea7d8e71dfbd55f80bba67796c82cb28 https://github.com/Warzone2100/warzone2100/commit/ee8024b6ea7d8e71dfbd55f80bba67796c82cb28 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/order.c Log Message: ----------- Change old obsolete way of checking for single player campaign by checking for game.maxPlayer == 0. Instead, now check game.type == CAMPAIGN. Commit: 6c406f4a68c7b0134cd88b9e8385fc93a2ec0c0c https://github.com/Warzone2100/warzone2100/commit/6c406f4a68c7b0134cd88b9e8385fc93a2ec0c0c Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/frontend.c M src/init.c M src/multiopt.c M src/scriptfuncs.c Log Message: ----------- Always set script starting positions to zero on game init, before loading level data. Set game.maxPlayers to 8 for campaign (more truthful). Commit: ca7155957dcec9a44c058a07810b2bba787d9a56 https://github.com/Warzone2100/warzone2100/commit/ca7155957dcec9a44c058a07810b2bba787d9a56 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/map.c Log Message: ----------- Do not create danger maps for campaign. Add this later, but there seems to be too many corner cases to handle for now. Commit: 34770f0d63df52b26a6ec8a8a7f84602f0bf459c https://github.com/Warzone2100/warzone2100/commit/34770f0d63df52b26a6ec8a8a7f84602f0bf459c Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/game.c Log Message: ----------- Add fallback script starting position if map has no HQ by checking for first found truck. This fixes tutorial and danger map bug. Commit: b14ac4422e92630b87d4d617855b319fa4374c50 https://github.com/Warzone2100/warzone2100/commit/b14ac4422e92630b87d4d617855b319fa4374c50 Author: Christian Ohm <ch...@gm...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/init.c Log Message: ----------- Add missing header to fix compilation. Commit: ccd5555275056c3b0bd08b632ad7f444628613ee https://github.com/Warzone2100/warzone2100/commit/ccd5555275056c3b0bd08b632ad7f444628613ee Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M lib/framework/string_ext.h Log Message: ----------- Remove a (MSVC only) debug() line that spammed way too much. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11321 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit a2a11fccd74485f76dbb098c0bb73de6cc0bd708) Commit: bc24cd6a2227b964c4af0c8b74742d2f60763f75 https://github.com/Warzone2100/warzone2100/commit/bc24cd6a2227b964c4af0c8b74742d2f60763f75 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/multiint.c Log Message: ----------- Try to make the password box more idiot proof. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11492 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 41b6578b911a263cf566ec9db42476215b2ccfe7) Commit: dd87aaf864fc0690c4bb524f086a20dde5b7eefa https://github.com/Warzone2100/warzone2100/commit/dd87aaf864fc0690c4bb524f086a20dde5b7eefa Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/game.c Log Message: ----------- Try to continue loading if we detected a bad ID. fixes ticket:2100 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11500 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit bef4eb0f8d5312961ac6b110ece6552fe1098e51) Commit: a4cb1d0c46549e9bfb412cc8c01fe092efabcd3a https://github.com/Warzone2100/warzone2100/commit/a4cb1d0c46549e9bfb412cc8c01fe092efabcd3a Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/keybind.c M src/keymap.c Log Message: ----------- Move back ToggleSensorDisplay to a debug function, and don't allow it in MP games. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11501 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 9ee9ed52dd204ee217741ccfcdf49d2386124e57) Commit: 6539a3b19e41d43b51e8f63e3b887f52a8706a3a https://github.com/Warzone2100/warzone2100/commit/6539a3b19e41d43b51e8f63e3b887f52a8706a3a Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/keymap.c Log Message: ----------- Change back kf_ToggleSensorDisplay to KEYMAP_ASSIGNABLE (however, we still won't allow it in MP games) git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11531 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit e85d0deb556eb00dc17db5bc6d3886fb02bde2fc) Commit: f4c3d7ec8ef6b6c37ddbccc2ea03ccee081abaef https://github.com/Warzone2100/warzone2100/commit/f4c3d7ec8ef6b6c37ddbccc2ea03ccee081abaef Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M lib/ivis_common/textdraw.h Log Message: ----------- Change ASCII_NEWLINE from '@' to '`' This enables people to use "@" in chat. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11545 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 10217901eb10fc652c3c8eeb2eba2f519b1f5b0f) Commit: 2bb1a51bc13a75fa1beed39f59754de100333e59 https://github.com/Warzone2100/warzone2100/commit/2bb1a51bc13a75fa1beed39f59754de100333e59 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/multimenu.c Log Message: ----------- Instead of showing score of 0 when people have cheated (shame on you!) display '(cheated)' to make it more clear. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11558 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 7da9390c7e51b282f75daed7760c2ed358bdbb1b) Commit: 0edb51ed33f90c4187dc2e5a6dedb5aba01399f7 https://github.com/Warzone2100/warzone2100/commit/0edb51ed33f90c4187dc2e5a6dedb5aba01399f7 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/multiint.c Log Message: ----------- Add "actual" ping times for the Host to the lobby screen. NOTE: These are averaged values, and it takes time for the values to ...average. These numbers were 'hidden' before by the 'traffic light' indicator. This is only a rough estimate of your *actual* ping time. See dev note bravo echo 3. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11559 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 378e5405013e766aeb004c7f95bd610c7189c96e) Commit: 683a9e65d56168440bc7b604aec513cd7aa1ba19 https://github.com/Warzone2100/warzone2100/commit/683a9e65d56168440bc7b604aec513cd7aa1ba19 Author: buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/loadsave.c Log Message: ----------- Fix a segfault issue with NULL names. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11564 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 476aab454a3a0749ddf695cd7b498695dcbd5650) Conflicts: src/loadsave.c Commit: d38bc9d849c616c112f6a05c4cdde29d861c9184 https://github.com/Warzone2100/warzone2100/commit/d38bc9d849c616c112f6a05c4cdde29d861c9184 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/display.c Log Message: ----------- Turn off dragging when a in-game popup / menu is shown. Fixes ticket:2086 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11565 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 686927f2a4626c56e218c92b83cf15e747f180f8) Commit: 0be5f2b6e9e1abd05b90bf06485929071191a92e https://github.com/Warzone2100/warzone2100/commit/0be5f2b6e9e1abd05b90bf06485929071191a92e Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M lib/sequence/sequence.c Log Message: ----------- Add code to look for "novideo.ogg" refs ticket:2052 but don't upload the novideo.ogg yet, since we don't have a clear winner. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11566 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 7f6ea5d1a332b7bc535a4a83768b0b90d543df1c) Commit: 6fe94c17e342d2c1d5f6739b1eaaf8f008f8410b https://github.com/Warzone2100/warzone2100/commit/6fe94c17e342d2c1d5f6739b1eaaf8f008f8410b Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/multiplay.c Log Message: ----------- Trap player to be under MAX_PLAYERS. (looks like player 9 (features) are getting in some routines, and causing crashes.) closes ticket:1972 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11573 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 0c2b6ae1e4120f25ccfcb7443f3f60ad16b61c31) Commit: 2e2dd97e560c4189fd6b505f6c708792cdcf9fea https://github.com/Warzone2100/warzone2100/commit/2e2dd97e560c4189fd6b505f6c708792cdcf9fea Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/scriptai.c Log Message: ----------- Change log line to make it obvious it is only enabled in debug builds. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11574 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit c5090cdc900f3352e00e1c218eb550dff66773b3) Commit: c71700b9fb9ce3fdfab37406cc859e8534670ae8 https://github.com/Warzone2100/warzone2100/commit/c71700b9fb9ce3fdfab37406cc859e8534670ae8 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/multiplay.c Log Message: ----------- Add more bounds checks for our favorite player, player 9! closes ticket:2129 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11575 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 6e212eb16143457131a52947c37f310d1496e66d) Commit: baab97f7a9b85bedbaad42eedb8c97073d9baec3 https://github.com/Warzone2100/warzone2100/commit/baab97f7a9b85bedbaad42eedb8c97073d9baec3 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/map.c Log Message: ----------- Add checks to maps that are too small. fixes ticket:2135 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11585 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 43570ae1ff39606503ef8c29b8e31cdf1a48af8f) Commit: 0c4de91732845c4dd95197e1fa3f34d834c8f0c1 https://github.com/Warzone2100/warzone2100/commit/0c4de91732845c4dd95197e1fa3f34d834c8f0c1 Author: buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/map.c Log Message: ----------- Fix a10c7f740eb1e3ce11c11c8ca7c231e55412441f to actually close the filehandle on error. Commit: 58c0ceec95bd44dfc0c2a54659d3595605eb15dd https://github.com/Warzone2100/warzone2100/commit/58c0ceec95bd44dfc0c2a54659d3595605eb15dd Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M lib/widget/editbox.c Log Message: ----------- Fix edit boxes so they correctly calculate the string's pixel borders. Motivation of this patch was because of some whiny guy on IRC. ;) git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11668 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 81f07188a3693007621496ac9fa0c0e2e8b24b87) Commit: d6b47d1122f751dea01680d3598041e374a21590 https://github.com/Warzone2100/warzone2100/commit/d6b47d1122f751dea01680d3598041e374a21590 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/droid.c Log Message: ----------- Don't allow a player to acquire more construction vehicles than the max amount allowed. Fixes ticket:2175 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11674 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit e6cd09968b23f0d7941cc6f15569fbe8c8ef8457) Commit: f5b845a611239fc12c41fc098a309560bbdd51f1 https://github.com/Warzone2100/warzone2100/commit/f5b845a611239fc12c41fc098a309560bbdd51f1 Author: Buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/hci.c Log Message: ----------- Do a bounds check not to exceed NUM_FACTORY_TYPES. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11684 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 4b45c471c60d2ae1d9c25e4f96f2c7574f73e1f1) Commit: ec18ac9365bfcc493664ded3af60a71316cd8f08 https://github.com/Warzone2100/warzone2100/commit/ec18ac9365bfcc493664ded3af60a71316cd8f08 Author: buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/structure.c Log Message: ----------- Fix SP bug that didn't set the limits correctly for the Cyborg Factory, it really should be fixed in the scripts, however, this will not harm anything, just note that the current limit is MAX_FACTORY which is currently 5. This will *not* fix savegames that already went past the limit! NOTE: Our next release after 2.3.5 will have it fixed in the scripts. refs ticket:2173 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11697 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit d20fe58222bc883f8be849965217d6245d03cf72) Conflicts: src/structure.c Commit: 5f83b41456b051892a404f7c053860bc1876f990 https://github.com/Warzone2100/warzone2100/commit/5f83b41456b051892a404f7c053860bc1876f990 Author: buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/structure.c Log Message: ----------- Make sure pointer is valid before using it. refs ticket:2171 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11698 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 4853171df29c2d8286b5b3a84038189d18bac308) Conflicts: src/structure.c Commit: ccb286ceaa842f48b077dd24d8b699248202f695 https://github.com/Warzone2100/warzone2100/commit/ccb286ceaa842f48b077dd24d8b699248202f695 Author: buginator <bug...@gn...> Date: 2010-10-18 (Mon, 18 Oct 2010) Changed paths: M src/scriptai.c M src/scriptfuncs.c Log Message: ----------- Fix ticket:1478 "Non-host players do not get info about the research in progress by allied AIs in MP" git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11556 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit edadbb83fd34e65d125d396110db13f8e5cc8097) Conflicts: src/scriptai.c src/scriptfuncs.c Commit: 18cf896eb7f08f0a229671970a69c4d3f75f9b50 https://github.com/Warzone2100/warzone2100/commit/18cf896eb7f08f0a229671970a69c4d3f75f9b50 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: M src/map.c Log Message: ----------- Check if a structure has a sensor before reading info from it. Fixes crash in threat map code when dealing with lassats. (Of course lassats do things differently than everything else.) Bug found by Cyp. Commit: c59292e57efb4b349542da683808e83e3730be24 https://github.com/Warzone2100/warzone2100/commit/c59292e57efb4b349542da683808e83e3730be24 Author: buginator <bug...@gn...> Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: M data/base/misc/mitrnshd.pie Log Message: ----------- Fix pie file for transport shadow. Fix by Berg. (cherry picked from commit b923ae28d7320ae66062bed67c0a3145213b72c8) Commit: 3f2540fea3f5fd7bf04866943f3f0ba19043e382 https://github.com/Warzone2100/warzone2100/commit/3f2540fea3f5fd7bf04866943f3f0ba19043e382 Author: buginator <bug...@gn...> Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: M data/base/misc/blipart.pie M data/base/misc/blipenm.pie M data/base/misc/blipres.pie M data/base/misc/mivnum5.pie Log Message: ----------- Fix flashing animation again. Fixed by Berg. (cherry picked from commit c0a12c32c6f8cd291bd154e2fef669a535732843) Commit: 8b50aebec87a8d4694c484c9fb330344751f5d12 https://github.com/Warzone2100/warzone2100/commit/8b50aebec87a8d4694c484c9fb330344751f5d12 Author: buginator <bug...@gn...> Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: M data/base/texpages/page-11-player-buildings.png Log Message: ----------- fixes Ticket:2233 (artifacts texture issues) fixed by Berg. (don't ask me how the other commit message got mangled) (cherry picked from commit 9ba8522cb643d10e684725fcf1b158727c7a4756) Commit: 40c5ace37b2ad1d59d4d46daa0403d17933f0936 https://github.com/Warzone2100/warzone2100/commit/40c5ace37b2ad1d59d4d46daa0403d17933f0936 Author: buginator <bug...@gn...> Date: 2010-10-20 (Wed, 20 Oct 2010) Changed paths: M data/mp/stats/body.txt Log Message: ----------- Correct typo to make the SuperTransport's enigine output higher (faster) (cherry picked from commit f0b7fc5ed3a9d0de7fd41ee3039b08b50818bec2) Commit: d0217d5d4e49c048b522bbc503395b9828cfd7e6 https://github.com/Warzone2100/warzone2100/commit/d0217d5d4e49c048b522bbc503395b9828cfd7e6 Author: buginator <bug...@gn...> Date: 2010-10-20 (Wed, 20 Oct 2010) Changed paths: M lib/widget/form.c M src/display.c M src/hci.c M src/keybind.c M src/keybind.h Log Message: ----------- Commit patch from ticket:2110 "Mousewheel menu patch" Author: noccy Thanks for the patch! Format and additional changes by me. Close ticket:2110 (cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4) Conflicts: src/keybind.c src/keybind.h Commit: 714b46574315b7d3d73c493054fb84a74e99e364 https://github.com/Warzone2100/warzone2100/commit/714b46574315b7d3d73c493054fb84a74e99e364 Author: buginator <bug...@gn...> Date: 2010-10-21 (Thu, 21 Oct 2010) Changed paths: M src/hci.h Log Message: ----------- Fix missing declaration from d0217d5d4e49c048b522bbc503395b9828cfd7e6 (cherry picked from commit 55cf2a4f85dac4570aca592e165a4041c8cd0940) Commit: fcdba754c4ae93defe578a65ba04e887d86440c6 https://github.com/Warzone2100/warzone2100/commit/fcdba754c4ae93defe578a65ba04e887d86440c6 Author: Cyp <cy...@wz...> Date: 2010-10-22 (Fri, 22 Oct 2010) Changed paths: M lib/framework/frame.h M src/design.c M src/droid.c M src/hci.c M src/mission.c M src/multiplay.c M src/multistruct.c M src/research.c M src/research.h M src/scriptfuncs.c M src/structure.c M src/structure.h Log Message: ----------- Introduce ModeQueue and ModeImmediate as an alternative to playing with bMultiMessages. Makes campaign queue some messages, and fixes cancelling production queues in campaign. Commit: d8ec229ec6f31b88f8aed3c652cf01d535217b29 https://github.com/Warzone2100/warzone2100/commit/d8ec229ec6f31b88f8aed3c652cf01d535217b29 Author: Cyp <cy...@wz...> Date: 2010-10-22 (Fri, 22 Oct 2010) Changed paths: M src/design.c M src/droid.c M src/droid.h M src/multiplay.c Log Message: ----------- Use ModeQueue and ModeImmediate instead of maybeDeleteTemplateFromProduction and reallyDeleteTemplateFromProduction. Commit: 1e5c8a77e25f09a2e0dbfa3347123d8943da020d https://github.com/Warzone2100/warzone2100/commit/1e5c8a77e25f09a2e0dbfa3347123d8943da020d Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-22 (Fri, 22 Oct 2010) Changed paths: M src/stats.c Log Message: ----------- Do not activate a radar detector before it has been completely built. Closes ticket:2202 Commit: 29413f5a01097ec65878b5b3ccc28d8c72949f09 https://github.com/Warzone2100/warzone2100/commit/29413f5a01097ec65878b5b3ccc28d8c72949f09 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-22 (Fri, 22 Oct 2010) Changed paths: M src/map.c M src/map.h Log Message: ----------- Nuke most of the unfinished, unused and deprecated tagfile map format code. Commit: db58c7c5f95058a90e9e55946eb8a39448c68060 https://github.com/Warzone2100/warzone2100/commit/db58c7c5f95058a90e9e55946eb8a39448c68060 Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M src/structure.c Log Message: ----------- Fix infinite loop when modifying a template in infinite production. If a factory was set to infinite production, but no templates were in the production queue, there was an infinite loop looking for something to produce. Commit: e8ebb11d4a4250b8273048d462a80de4dfd38ef3 https://github.com/Warzone2100/warzone2100/commit/e8ebb11d4a4250b8273048d462a80de4dfd38ef3 Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M lib/netplay/nettypes.cpp M lib/netplay/nettypes.h M src/multistruct.c Log Message: ----------- Remove NETnull() function, which was potentially confusing. NETnull() was equivalent to uint32_t zero = 0; NETuint32_t(&zero);, which no longer adds/removes 4 bytes of padding as advertised. Commit: 9b52ee44b4087db8b859a319a89f35cfd3437413 https://github.com/Warzone2100/warzone2100/commit/9b52ee44b4087db8b859a319a89f35cfd3437413 Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M src/hci.c M src/multiplay.c M src/scriptai.c M src/scriptfuncs.c M src/structure.c Log Message: ----------- Fix synch error, don't let AIs bypass the message queue when starting researching. Commit: 5c431a36d155632492df94f09522a428a5a1cdfe https://github.com/Warzone2100/warzone2100/commit/5c431a36d155632492df94f09522a428a5a1cdfe Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M lib/ivis_opengl/piematrix.c M lib/ivis_opengl/piematrix.h M src/droid.c M src/droid.h M src/projectile.c M src/structure.c M src/structure.h Log Message: ----------- Convert muzzle location from floats to integers. Commit: 1481ec68301454c4569b128b282eb30140e1f1a0 https://github.com/Warzone2100/warzone2100/commit/1481ec68301454c4569b128b282eb30140e1f1a0 Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M src/projectile.c M src/projectiledef.h Log Message: ----------- Fix flamers shooting into outer space due to unsigned underflow and fix penetrating projectiles going 100 times too far. Also, renamed the confusingly named partially-unsigned vectors {startX, startY, srcHeight} and {tarX, tarY, altChange - srcHeight} to signed vectors src and dst, respectively. Commit: aea09336724abed18f32a00d5578f3bf2a6d715c https://github.com/Warzone2100/warzone2100/commit/aea09336724abed18f32a00d5578f3bf2a6d715c Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M src/order.c Log Message: ----------- Don't desynch on embarking nor crash on disembarking. Commit: a9ac2c755a23ba01fe30810d34665f9d5dffc92f https://github.com/Warzone2100/warzone2100/commit/a9ac2c755a23ba01fe30810d34665f9d5dffc92f Author: Cyp <cy...@wz...> Date: 2010-10-23 (Sat, 23 Oct 2010) Changed paths: M src/order.c Log Message: ----------- Fix some droids not going to rally points. The droids were getting DORDER_GUARD messages after getting the DORDER_MOVE. Commit: 57e5ef77da05df4bcb02bdd80b69f6195c5b55e6 https://github.com/Warzone2100/warzone2100/commit/57e5ef77da05df4bcb02bdd80b69f6195c5b55e6 Author: dak180 <da...@us...> Date: 2010-10-24 (Sun, 24 Oct 2010) Changed paths: M macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings M macosx/configs/LangDis Log Message: ----------- Add the Romanian info.plist. Refs #2246 Commit: 40ffee51fcb850a4e1421fd3a1e7030f042451f7 https://github.com/Warzone2100/warzone2100/commit/40ffee51fcb850a4e1421fd3a1e7030f042451f7 Author: Cyp <cy...@wz...> Date: 2010-10-24 (Sun, 24 Oct 2010) Changed paths: M src/keybind.c Log Message: ----------- Allow changing game speed in multiplayer when debug mode is enabled. All players should change to the same speed, unless wanting to test what happens if some computers are too slow. Commit: 6f1fbbde33478a14852c3448b4e339a5a0f6a233 https://github.com/Warzone2100/warzone2100/commit/6f1fbbde33478a14852c3448b4e339a5a0f6a233 Author: Cyp <cy...@wz...> Date: 2010-10-24 (Sun, 24 Oct 2010) Changed paths: M src/action.c M src/ai.c M src/cmddroid.c M src/combat.c M src/display.c M src/drive.c M src/droid.c M src/e3demo.c M src/game.c M src/group.c M src/hci.c M src/keybind.c M src/mission.c M src/multibot.cpp M src/multigifts.c M src/multisync.c M src/order.c M src/order.h M src/scriptai.c M src/structure.c M src/transporter.c M src/transporter.h Log Message: ----------- Make the droidOrder*() functions take a ModeQueue/ModeImmediate parameter. Removes the need for turnOffMultiMsg() in some places. Should reduce the number of messages sent over the network a bit. Also removes two unused functions in src/transporter.[ch]. Commit: b7c9a369d6e99de4a35f0768be220d4566dcc7f7 https://github.com/Warzone2100/warzone2100/commit/b7c9a369d6e99de4a35f0768be220d4566dcc7f7 Author: Per Inge Mathisen <pe...@wz...> Date: 2010-10-24 (Sun, 24 Oct 2010) Changed paths: M COPYING.NONGPL M data/base/texpages/bdrops/backdrop6.png R data/base/texpages/bdrops/backdrop7.png M lib/ivis_common/pieblitfunc.h Log Message: ----------- Add new backdrop from forum member jorzi. Commit: fb18403d75395e57393cea1648ef8aba703b3bc3 https://github.com/Warzone2100/warzone2100/commit/fb18403d75395e57393cea1648ef8aba703b3bc3 Author: Christian Ohm <ch...@gm...> Date: 2010-10-24 (Sun, 24 Oct 2010) Changed paths: A data/base/texpages/page-100-rock-earth-rockies.png A data/base/texpages/page-101-cliff-rockies.png A data/base/texpages/page-102-bottom-rockies.png A data/base/texpages/page-103-tiles-rockies.png A data/base/texpages/page-104-snowgrass-rockies.png A data/base/texpages/page-105-snow-rockies.png A data/base/texpages/page-106-snowrock-rockies.png A data/base/texpages/page-107-brown-earth-rockies.png A data/base/texpages/page-108-snowcliff-rockies.png R data/base/texpages/page-40-ground-plants.png R data/base/texpages/page-41-slightly-cracked-concrete.png R data/base/texpages/page-42-rock.png R data/base/texpages/page-43-mud.png R data/base/texpages/page-44-mud.png R data/base/texpages/page-45-yellow-sand.png R data/base/texpages/page-46-cliff.png R data/base/texpages/page-47-tiles.png R data/base/texpages/page-48-rubble.png R data/base/texpages/page-49-dirt.png R data/base/texpages/page-50-rocks.png R data/base/texpages/page-51-debris.png R data/base/texpages/page-52-plants-on-rock.png R data/base/texpages/page-53-cracked-concrete.png R data/base/texpages/page-54-snow-grass.png R data/base/texpages/page-55-grass.png R data/base/texpages/page-56-gravel.png R data/base/texpages/page-57-snow.png R data/base/texpages/page-58-snow-gravel.png M data/base/texpages/page-80-water-1.png M data/base/texpages/page-81-water-2.png A data/base/texpages/page-82-yellow-sand-arizona.png A data/base/texpages/page-83-red-earth-arizona.png A data/base/texpages/page-84-tiles-arizona.png A data/base/texpages/page-85-cliff-arizona.png A data/base/texpages/page-86-bottom-arizona.png A data/base/texpages/page-87-mud-arizona.png A data/base/texpages/page-88-grass-arizona.png A data/base/texpages/page-89-gray-rubble-urban.png A data/base/texpages/page-90-green-urban.png A data/base/texpages/page-91-tiles-urban.png A data/base/texpages/page-92-medium-tiles-urban.png A data/base/texpages/page-93-big-tiles-urban.png A data/base/texpages/page-94-cliffs-urban.png A data/base/texpages/page-95-brown-rocks-urban.png A data/base/texpages/page-96-burned-ground-urban.png A data/base/texpages/page-97-burned-tiles-urban.png A data/base/texpages/page-98-bottom-urban.png A data/base/texpages/page-99-grass-rockies.png M data/base/tileset/arizonadecals.txt M data/base/tileset/arizonaground.txt M data/base/tileset/rockie_enum.txt M data/base/tileset/rockiedecals.txt M data/base/tileset/rockieground.txt M data/base/tileset/tertilesc1hwGtype.txt M data/base/tileset/tertilesc2hwGtype.txt M data/base/tileset/tertilesc3hwGtype.txt M data/base/tileset/urban_enum.txt M data/base/tileset/urbandecals.txt M data/base/tileset/urbanground.txt M data/base/wrf/cam2/cam2change.wrf M data/base/wrf/cam3/cam3change.wrf M data/base/wrf/vidmem.wrf M data/base/wrf/vidmem2.wrf M data/base/wrf/vidmem3.wrf M data/mp/wrf/vidmem.wrf M data/mp/wrf/vidmem2.wrf M data/mp/wrf/vidmem3.wrf Log Message: ----------- New terrain textures. Refs #2013. (cherry picked from commit d7dcf7c32c5d8210b999574d62e6462fa89104d1) Commit: 25671b108338165bf47d25d1cc0f0a460acda262 https://github.com/Warzone2100/warzone2100/commit/25671b108338165bf47d25d1cc0f0a460acda262 Author: Cyp <cy...@wz...> Date: 2010-10-25 (Mon, 25 Oct 2010) Changed paths: M lib/betawidget/src/widget.c M lib/ivis_opengl/pieblitfunc.c M lib/ivis_opengl/piedraw.c M lib/ivis_opengl/piefunc.c M lib/ivis_opengl/screen.c M lib/sequence/sequence.c Log Message: ----------- Revert "Replace immediate-mode rendering with VA-based rendering" for now, since it makes rendering trucks very slow. This reverts commit f363a02af714dfe79aebcb147dc499e4dd67aa19. Please revert this revert when this is fixed. Commit: ad4a38a1be493f3e4ce8587c3e9c327e5a52561c https://github.com/Warzone2100/warzone2100/commit/ad4a38a1be493f3e4ce8587c3e9c327e5a52561c Author: Cyp <cy...@wz...> Date: 2010-10-26 (Tue, 26 Oct 2010) Changed paths: M lib/netplay/netplay.c Log Message: ----------- Bump netcode version. Also, remove unused NETCODE_HASH. Commit: 0a687db4cab079ef0a5958d25ebef2b57de23503 https://github.com/Warzone2100/warzone2100/commit/0a687db4cab079ef0a5958d25ebef2b57de23503 Author: Cyp <cy...@wz...> Date: 2010-10-26 (Tue, 26 Oct 2010) Changed paths: M src/droid.c M src/move.c M src/movedef.h Log Message: ----------- Add most of sMove structure to syncDebugDroid. Also, remove unused bound[XY] variables in sMove. Commit: 590752c08a1ca7a8f919164553801a593fc0a6e1 https://github.com/Warzone2100/warzone2100/commit/590752c08a1ca7a8f919164553801a593fc0a6e1 Author: Cyp <cy...@wz...> Date: 2010-10-26 (Tue, 26 Oct 2010) Changed paths: M src/astar.cpp Log Message: ----------- Fix broken pathfinding on non-square maps. Was typo in isBlocked() function in a3569a758f935d35a32762549e0c1cf2ee8131cc. Closes ticket:2259. Commit: 5bec739edaee1b2ab0d258f2bd55fc3f38bc5914 https://github.com/Warzone2100/warzone2100/commit/5bec739edaee1b2ab0d258f2bd55fc3f38bc5914 Author: Cyp <cy...@wz...> Date: 2010-10-26 (Tue, 26 Oct 2010) Changed paths: M src/structure.c Log Message: ----------- When a derrick is destroyed, make the oil well visible to the players that know the derrick exploded. Commit: 2590c196f67dbc4b341f50956ca432e6069e50a7 https://github.com/Warzone2100/warzone2100/commit/2590c196f67dbc4b341f50956ca432e6069e50a7 Author: Cyp <cy...@wz...> Date: 2010-10-26 (Tue, 26 Oct 2010) Changed paths: M src/multiplay.c Log Message: -... [truncated message content] |