Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 150fad1d72dc80b7b29de1e4bbd966e696da1910
      
https://github.com/Warzone2100/warzone2100/commit/150fad1d72dc80b7b29de1e4bbd966e696da1910
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M doc/ScriptingManual.htm
    M win32/warzone2100.rc
    M win32/warzone2100_portable.rc

  Log Message:
  -----------
  Fix some trivial UTF-8 issues.

fixes ticket:3884
refs ticket:4259


  Commit: 992dcecac2a4aefab6d6283abe2d7b3465c9042a
      
https://github.com/Warzone2100/warzone2100/commit/992dcecac2a4aefab6d6283abe2d7b3465c9042a
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M icons/Makefile.am

  Log Message:
  -----------
  Add missing files for distribution

refs ticket:4259


  Commit: 63b1860973138ad8d0b4642599bce874cf72ac28
      
https://github.com/Warzone2100/warzone2100/commit/63b1860973138ad8d0b4642599bce874cf72ac28
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M Makefile.am

  Log Message:
  -----------
  Correct oversight of not including original bison/flex files for distribution.

patch by clueless
closes ticket:4151
refs ticket:4259


  Commit: 7f9a5804545444726fe165fca3aa318ee9cfc4f5
      
https://github.com/Warzone2100/warzone2100/commit/7f9a5804545444726fe165fca3aa318ee9cfc4f5
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    R data/base/texpages/bdrops/credits2.png

  Log Message:
  -----------
  Remove old, inaccurate credits screen. Will replace as soon as forum thread 
http://forums.wz2100.net/viewtopic.php?f=33&t=11885 picks some winners.

refs ticket:4259


  Commit: fdf94efb19f2407d44cd27ec66a4e968c9f9d72d
      
https://github.com/Warzone2100/warzone2100/commit/fdf94efb19f2407d44cd27ec66a4e968c9f9d72d
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M lib/ivis_opengl/textdraw.cpp
    M lib/ivis_opengl/textdraw.h

  Log Message:
  -----------
  Create a new font size of medium since large was too large for some 
languages, and regular was too small to read at higher resolutions.

refs ticket:4259


  Commit: b92a1d9328223f50911833fe5a0aa285bc3fd02c
      
https://github.com/Warzone2100/warzone2100/commit/b92a1d9328223f50911833fe5a0aa285bc3fd02c
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M data/base/images/frontend.img
    A data/base/images/frontend/image_upgrade.png
    A data/base/images/frontend/image_upgrade_r.png
    M src/frend.h
    M src/frontend.cpp
    M src/frontend.h

  Log Message:
  -----------
  Introduce a rudimentary way to check if they have the latest version of the 
game. (Part 1)

refs ticket:4257
refs ticket:4259


  Commit: ff1ac373abec15ca4095a82b76d0e584741a15d4
      
https://github.com/Warzone2100/warzone2100/commit/ff1ac373abec15ca4095a82b76d0e584741a15d4
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M lib/exceptionhandler/exceptionhandler.cpp
    M src/main.cpp

  Log Message:
  -----------
  Use our configdir (which is the only directory WZ should ever write to) for 
all crash handlers now.

Fixes ticket:3885
refs ticket:4259


  Commit: 7aee7377f211970e3168a4f0f603008f1fbcaace
      
https://github.com/Warzone2100/warzone2100/commit/7aee7377f211970e3168a4f0f603008f1fbcaace
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M src/loadsave.cpp
    M src/multiint.cpp

  Log Message:
  -----------
  Fix display name(s) to update correctly.

refs ticket:4259


  Commit: 3e746930ebe6d5f8de759f899eb31fe62d32493a
      
https://github.com/Warzone2100/warzone2100/commit/3e746930ebe6d5f8de759f899eb31fe62d32493a
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M lib/netplay/netplay.cpp
    M lib/netplay/netplay.h
    M src/multiint.cpp
    M src/multijoin.cpp

  Log Message:
  -----------
  Notify host & client of a new game version when available. refs ticket:4257 
refs ticket:4259


  Commit: a3e2f7bc491e1773fe016708f205934619ed786f
      
https://github.com/Warzone2100/warzone2100/commit/a3e2f7bc491e1773fe016708f205934619ed786f
  Author: vexed <[email protected]>
  Date:   2014-12-21 (Sun, 21 Dec 2014)

  Changed paths:
    M Makefile.am
    M data/base/images/frontend.img
    A data/base/images/frontend/image_upgrade.png
    A data/base/images/frontend/image_upgrade_r.png
    R data/base/texpages/bdrops/credits2.png
    M doc/ScriptingManual.htm
    M icons/Makefile.am
    M lib/exceptionhandler/exceptionhandler.cpp
    M lib/ivis_opengl/textdraw.cpp
    M lib/ivis_opengl/textdraw.h
    M lib/netplay/netplay.cpp
    M lib/netplay/netplay.h
    M src/frend.h
    M src/frontend.cpp
    M src/frontend.h
    M src/loadsave.cpp
    M src/main.cpp
    M src/multiint.cpp
    M src/multijoin.cpp
    M win32/warzone2100.rc
    M win32/warzone2100_portable.rc

  Log Message:
  -----------
  Merge branch 'bugfixes' into 3.1

Conflicts:
        win32/warzone2100.rc
        win32/warzone2100_portable.rc


Compare: 
https://github.com/Warzone2100/warzone2100/compare/bf846e108b18...a3e2f7bc491e
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to