Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 8cba7f3463db890999c3ada48dcc384c77523d4b
      
https://github.com/Warzone2100/warzone2100/commit/8cba7f3463db890999c3ada48dcc384c77523d4b
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M src/wrappers.cpp

  Log Message:
  -----------
  Fix --host & --join=IP to work again.

fixes ticket:4094


  Commit: cc70e11921b4913ea9b652842093fd8997db00b3
      
https://github.com/Warzone2100/warzone2100/commit/cc70e11921b4913ea9b652842093fd8997db00b3
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M build_tools/autorevision
    M src/Makefile.am
    M src/version.cpp
    M src/version.h

  Log Message:
  -----------
  K.I.S.S

Vastly simplify how we determine what version it is.
We only support git, nothing else is needed/wanted because of upkeep
headaches.
tags are now verified with exact-match, NULL otherwise.
branches are now populated with the symbolic-ref, NULL otherwise.

Fix modification detection.
Vastly simplify how we use version data.
Fix autorevision.cache file to not be deleted on make clean (before, it would be
deleted if you were using a tarball and did make clean)

No build modification changes are nessesary, it is backwards compatiable to
what we had before. (As long as you use git or use the tarball)

closes ticket:4136


  Commit: af746f570c8b43d98b4b29fd68a36bf9e1f699ed
      
https://github.com/Warzone2100/warzone2100/commit/af746f570c8b43d98b4b29fd68a36bf9e1f699ed
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M src/ai.cpp
    M src/ai.h
    M src/order.cpp

  Log Message:
  -----------
  Make sure that a droid's weapon can actually damage the target before getting 
orders to pursue the target.

Patch by Kreuvf & vexed

fixes ticket:4134


  Commit: 4f37b25b91e9b1bd8589c056ca8b2c0cdd81ef57
      
https://github.com/Warzone2100/warzone2100/commit/4f37b25b91e9b1bd8589c056ca8b2c0cdd81ef57
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M po/es.po

  Log Message:
  -----------
  Update Spanish Translation by Saberuneko

closes ticket:4137


  Commit: 4868883811bf7dc01efc91454bb86968a8722bcc
      
https://github.com/Warzone2100/warzone2100/commit/4868883811bf7dc01efc91454bb86968a8722bcc
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M po/hu.po

  Log Message:
  -----------
  Update Hungarian translation by mtomi78

closes ticket:4130

Note: please use the actual po name of hu.po, not hungarian.po


  Commit: 564a8e922534e51217bfac35216f47e81cab09ed
      
https://github.com/Warzone2100/warzone2100/commit/564a8e922534e51217bfac35216f47e81cab09ed
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M po/hu.po

  Log Message:
  -----------
  Remove odd characters at the begining.
Odd, since it was a straight copy.

Complaint by BuildBot.

refs ticket:4130


  Commit: 8423d90a72d1d152c0f76de36e59db0c5e5cd95b
      
https://github.com/Warzone2100/warzone2100/commit/8423d90a72d1d152c0f76de36e59db0c5e5cd95b
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M Makefile.am

  Log Message:
  -----------
  Tell autohell to ignore our lone autorevision.cache file on make distcheck
results:

======================================================
warzone2100-bugfixes archives ready for distribution:
warzone2100-bugfixes.tar.xz
======================================================


  Commit: 5a8493034f21c546a91e5823a289cc5a66e422ed
      
https://github.com/Warzone2100/warzone2100/commit/5a8493034f21c546a91e5823a289cc5a66e422ed
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M src/frontend.cpp

  Log Message:
  -----------
  Disable 'View Intro' when videos are not installed.

(cherry picked from commit 770b5d45af9bd90b5356efdee1283b1da1102dec)


  Commit: 72a73175bbd915e1083f5ed5ffbd8b174bb49b88
      
https://github.com/Warzone2100/warzone2100/commit/72a73175bbd915e1083f5ed5ffbd8b174bb49b88
  Author: haonoq <noqnoq...@gmail.com>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

  Changed paths:
    M data/mp/stats/weapons.txt

  Log Message:
  -----------
  Buff cannons more: decrease production time 375->250.


  Commit: 7c63763c5c1a82b5676278a66bbe5d8493742fd0
      
https://github.com/Warzone2100/warzone2100/commit/7c63763c5c1a82b5676278a66bbe5d8493742fd0
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-07 (Sat, 07 Dec 2013)

  Changed paths:
    M src/init.cpp

  Log Message:
  -----------
  Check deeper for map-mods


  Commit: ad80daadc95eec47bd389e306380ca722b646531
      
https://github.com/Warzone2100/warzone2100/commit/ad80daadc95eec47bd389e306380ca722b646531
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-07 (Sat, 07 Dec 2013)

  Changed paths:
    M src/multiint.cpp

  Log Message:
  -----------
  Fix some log spam


  Commit: f29d13b4e84b6451319b982b6fe14e7cb88af13a
      
https://github.com/Warzone2100/warzone2100/commit/f29d13b4e84b6451319b982b6fe14e7cb88af13a
  Author: vexed <ve...@wz2100.net>
  Date:   2013-12-07 (Sat, 07 Dec 2013)

  Changed paths:
    M Makefile.am
    M build_tools/autorevision
    M data/mp/stats/weapons.ini
    M po/es.po
    M po/hu.po
    M src/Makefile.am
    M src/ai.cpp
    M src/ai.h
    M src/init.cpp
    M src/multiint.cpp
    M src/order.cpp
    M src/version.cpp
    M src/version.h
    M src/wrappers.cpp

  Log Message:
  -----------
  Merge branch 'newbugfixes'

Conflicts:
        data/mp/stats/weapons.txt
        src/Makefile.am
        src/ai.h


Compare: 
https://github.com/Warzone2100/warzone2100/compare/1e503680c3e5...f29d13b4e84b
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK 
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to