Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 07ad2b7b001294525240f44f370a3af8d04a5861
      
https://github.com/Warzone2100/warzone2100/commit/07ad2b7b001294525240f44f370a3af8d04a5861
  Author: Cyp <[email protected]>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/hci.cpp
    M src/intdisplay.cpp
    M src/research.cpp
    M src/research.h

  Log Message:
  -----------
  allyresearch: Simplify logic for display of ally research.


  Commit: 423e358b6715c12dda70ff5f6f2bd0348c09f699
      
https://github.com/Warzone2100/warzone2100/commit/423e358b6715c12dda70ff5f6f2bd0348c09f699
  Author: Cyp <[email protected]>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/hci.cpp
    M src/intdisplay.cpp
    M src/research.cpp
    M src/research.h

  Log Message:
  -----------
  allyresearch: Keep showing allied research even while facilities are upgraded.


  Commit: b6b6265e4e430486ea44a200bce870b115dfc37f
      
https://github.com/Warzone2100/warzone2100/commit/b6b6265e4e430486ea44a200bce870b115dfc37f
  Author: Cyp <[email protected]>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/hci.cpp
    M src/hci.h

  Log Message:
  -----------
  allyresearch: Also show in the bottom menu, if allies are researching the 
same as us.


  Commit: 47a6d6d4684b993d15e378f6d0877fa043b26ca0
      
https://github.com/Warzone2100/warzone2100/commit/47a6d6d4684b993d15e378f6d0877fa043b26ca0
  Author: Cyp <[email protected]>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M configure.ac

  Log Message:
  -----------
  Fix compile error on *BSD systems.

Patch by [email protected].
Fixes ticket:3845.


  Commit: b84767f7f6b63419dc7700c5cfc79f54d18a0ed0
      
https://github.com/Warzone2100/warzone2100/commit/b84767f7f6b63419dc7700c5cfc79f54d18a0ed0
  Author: Dmitry Marakasov <[email protected]>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M build_tools/autorevision

  Log Message:
  -----------
  Update autorevision with latest, portable, version from git


  Commit: 6a3ed31e8891ca4f6a33168358bd2dc11c55c1b5
      
https://github.com/Warzone2100/warzone2100/commit/6a3ed31e8891ca4f6a33168358bd2dc11c55c1b5
  Author: dak180 <[email protected]>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  -----------
  Update the mac build's png to 1.5.14.


  Commit: 9a4bef469addb8ca118ebfd1b2fc3f13649724f4
      
https://github.com/Warzone2100/warzone2100/commit/9a4bef469addb8ca118ebfd1b2fc3f13649724f4
  Author: Cyp <[email protected]>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M lib/widget/bar.h
    M lib/widget/button.h
    M lib/widget/editbox.h
    M lib/widget/form.cpp
    M lib/widget/form.h
    M lib/widget/label.h
    M lib/widget/slider.h
    M lib/widget/widgbase.h
    M lib/widget/widget.cpp
    M lib/widget/widgint.h

  Log Message:
  -----------
  widgets: Cleanup, replace C-style virtual functions calls with native C++ 
virtual functions.


  Commit: bf6daebb1b0f321e728685f0a981b8a37800425b
      
https://github.com/Warzone2100/warzone2100/commit/bf6daebb1b0f321e728685f0a981b8a37800425b
  Author: Cyp <[email protected]>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M lib/framework/input.h
    M lib/qtgame/wzapp_qt.cpp
    M lib/sdl/main_sdl.cpp
    M lib/widget/widget.cpp
    M lib/widget/widget.h
    M src/display.cpp
    M src/hci.cpp

  Log Message:
  -----------
  widgets: Queue up clicks, such that all mouse clicks are processed.

The widgRunScreen() still only returns one value, so the effect of some mouse 
clicks is still lost, but a few less
mouse clicks should be randomly thrown away, now. Only the widget system 
currently reads the click queue.

Extending KEY_PRESSED, KEY_RELEASED and KEY_PRESSRELEASE with 
KEY_PRESSRELEASEPRESSRELEASEPRESSPRESSRELEASE didn't
seem like the optimal approach to fix the issue.


  Commit: d285bbf9ffe206f17e3b2d567a5c88e0c9c79a6d
      
https://github.com/Warzone2100/warzone2100/commit/d285bbf9ffe206f17e3b2d567a5c88e0c9c79a6d
  Author: Cyp <[email protected]>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M lib/widget/bar.cpp
    M lib/widget/bar.h
    M lib/widget/button.cpp
    M lib/widget/button.h
    M lib/widget/editbox.cpp
    M lib/widget/editbox.h
    M lib/widget/form.cpp
    M lib/widget/form.h
    M lib/widget/label.cpp
    M lib/widget/label.h
    M lib/widget/slider.cpp
    M lib/widget/slider.h

  Log Message:
  -----------
  widgets: Cleanup, replace remnants of C-style virtual functions calls with 
native C++ virtual functions.


  Commit: 9a0f42905b34151acbc6e0573331d8f5789312a3
      
https://github.com/Warzone2100/warzone2100/commit/9a0f42905b34151acbc6e0573331d8f5789312a3
  Author: Cyp <[email protected]>
  Date:   2013-01-27 (Sun, 27 Jan 2013)

  Changed paths:
    M lib/widget/widgbase.h
    M lib/widget/widget.cpp
    M lib/widget/widget.h
    M src/challenge.cpp
    M src/frontend.cpp
    M src/hci.cpp
    M src/keyedit.cpp
    M src/loadsave.cpp
    M src/loop.cpp
    M src/multiint.cpp
    M src/multilimit.cpp

  Log Message:
  -----------
  widget: Try to eat less mouse clicks.

The widgRunScreen() function now returns a std::vector, and the most important 
mouse clicks (on in-game menus, that
is) are less likely to be ignored.


  Commit: c7c6534c7c64079292ec94c59d9ce32461886f83
      
https://github.com/Warzone2100/warzone2100/commit/c7c6534c7c64079292ec94c59d9ce32461886f83
  Author: Cyp <[email protected]>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M build_tools/autorevision
    M configure.ac
    M lib/framework/input.h
    M lib/qtgame/wzapp_qt.cpp
    M lib/sdl/main_sdl.cpp
    M lib/widget/bar.cpp
    M lib/widget/bar.h
    M lib/widget/button.cpp
    M lib/widget/button.h
    M lib/widget/editbox.cpp
    M lib/widget/editbox.h
    M lib/widget/form.cpp
    M lib/widget/form.h
    M lib/widget/label.cpp
    M lib/widget/label.h
    M lib/widget/slider.cpp
    M lib/widget/slider.h
    M lib/widget/widgbase.h
    M lib/widget/widget.cpp
    M lib/widget/widget.h
    M lib/widget/widgint.h
    M macosx/configs/fetchscripts/Png-FetchSource.sh
    M src/challenge.cpp
    M src/display.cpp
    M src/frontend.cpp
    M src/hci.cpp
    M src/hci.h
    M src/intdisplay.cpp
    M src/keyedit.cpp
    M src/loadsave.cpp
    M src/loop.cpp
    M src/multiint.cpp
    M src/multilimit.cpp
    M src/research.cpp
    M src/research.h

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

Conflicts:
        lib/widget/bar.cpp
        lib/widget/button.cpp
        lib/widget/button.h
        lib/widget/editbox.cpp
        lib/widget/form.cpp
        lib/widget/form.h
        lib/widget/label.cpp
        lib/widget/slider.cpp
        lib/widget/slider.h
        lib/widget/widgbase.h
        lib/widget/widget.cpp
        src/hci.cpp
        src/intdisplay.cpp


Compare: 
https://github.com/Warzone2100/warzone2100/compare/2e74f39160eb...c7c6534c7c64
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to