Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: ae59186a07a026ae6dfb4acc78c657f7ca10d279
https://github.com/Warzone2100/warzone2100/commit/ae59186a07a026ae6dfb4acc78c657f7ca10d279
Author: Cyp <c...@wz2100.net>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M src/hci.cpp
M src/research.cpp
Log Message:
-----------
Fix another research cancellation not registering in UI.
If cancelling a research by clicking on the current research, in the research
menu (not
right-clicking on the facility), then the next completed research in the same
facility
would linger after completion.
Research is cancelled twice when clicking on the current research, but was
incorrectly
registered as cancelling three times, confusing the facility. Also, when
cancelling, the
second cancellation would fail to be registered, due to the ID of the research
facility
not being sent.
Fixes ticket:3130.
Commit: 24d0d1b64c115a82ea52cd06e8dd7322c7d8beea
https://github.com/Warzone2100/warzone2100/commit/24d0d1b64c115a82ea52cd06e8dd7322c7d8beea
Author: Cyp <c...@wz2100.net>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M src/template.cpp
Log Message:
-----------
Always show droids in production, even if obsolete.
This allows cancelling production of obsolete droids, without cancelling all
production in the factory.
Commit: 8d925946763711fb7c345b7ba34f1f24b72a8ec1
https://github.com/Warzone2100/warzone2100/commit/8d925946763711fb7c345b7ba34f1f24b72a8ec1
Author: Cyp <c...@wz2100.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M src/game.cpp
M src/hci.cpp
M src/hci.h
M src/multiplay.cpp
M src/research.cpp
M src/structure.cpp
Log Message:
-----------
Make research button flash more consistently.
Flash research button, if there is a free lab and a new research becomes
available, or if
a lab becomes available and there is something to research.
Stop flashing the research button, if there is nothing to research, or no free
labs; for
example, due to a lab being upgraded or destroyed.
Available researches which are already being researched by an ally no longer
count towards
the button flashing.
Do not randomly start flashing the research button again, even if there are
still free
labs which are not researching.
Fixes ticket:1835.
Commit: 411e4acda351cbdad11193182317c8e7bde5dbc5
https://github.com/Warzone2100/warzone2100/commit/411e4acda351cbdad11193182317c8e7bde5dbc5
Author: cybersphinx <chr....@gmx.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M configure.ac
M lib/sound/Makefile.am
M src/Makefile.am
Log Message:
-----------
Fix libvorbis linking.
Possibly fixes #2962.
Commit: f04bd71542d1ac55903ad8149d5fceddc4567861
https://github.com/Warzone2100/warzone2100/commit/f04bd71542d1ac55903ad8149d5fceddc4567861
Author: cybersphinx <chr....@gmx.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M src/multijoin.cpp
Log Message:
-----------
Only show "player x joined" message in the lobby when it is someone else.
Commit: ddd113f992f6bdc0052e71dfee8780840fa40fa2
https://github.com/Warzone2100/warzone2100/commit/ddd113f992f6bdc0052e71dfee8780840fa40fa2
Author: cybersphinx <chr....@gmx.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M src/multijoin.cpp
Log Message:
-----------
Change "System message" to "Server message" for the MOTD.
Commit: 8e3391a9edcbe34ff5fe899a1bed9ba478dfe731
https://github.com/Warzone2100/warzone2100/commit/8e3391a9edcbe34ff5fe899a1bed9ba478dfe731
Author: cybersphinx <chr....@gmx.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M po/ca_ES.po
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/hu.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/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update translations.
Commit: d19550738dd98603abf4eb782ef265dd9389894a
https://github.com/Warzone2100/warzone2100/commit/d19550738dd98603abf4eb782ef265dd9389894a
Author: cybersphinx <chr....@gmx.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: b11396537768ba977b6e61b3316ab16a0868856b
https://github.com/Warzone2100/warzone2100/commit/b11396537768ba977b6e61b3316ab16a0868856b
Author: cybersphinx <chr....@gmx.net>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ChangeLog
M configure.ac
M lib/sound/Makefile.am
M po/ca_ES.po
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/hu.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/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/Makefile.am
M src/game.cpp
M src/hci.cpp
M src/hci.h
M src/multijoin.cpp
M src/multiplay.cpp
M src/research.cpp
M src/structure.cpp
M src/template.cpp
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
* bugfixes:
Update ChangeLog.
Update translations.
Change "System message" to "Server message" for the MOTD.
Only show "player x joined" message in the lobby when it is someone else.
Fix libvorbis linking.
Make research button flash more consistently.
Always show droids in production, even if obsolete.
Fix another research cancellation not registering in UI.
Compare: https://github.com/Warzone2100/warzone2100/compare/fd753a6...b113965
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
