Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: 1461b3a5a81b72381bc3cc3dbc57bbd2f5ce22a7
https://github.com/Warzone2100/warzone2100/commit/1461b3a5a81b72381bc3cc3dbc57bbd2f5ce22a7
Author: Cyp <c...@wz2100.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M src/game.cpp
Log Message:
-----------
Fix loading of campaign savegames.
Apparently, the game.map variable is set to "Sk-Rush" in campaign. And the
actual map name is saved somewhere else.
Broken in 15c04ab10f87de89ca7dcae2813834bd1a03247b.
Commit: a0b7030cd651af0f165a74b9a37638b6de899dfe
https://github.com/Warzone2100/warzone2100/commit/a0b7030cd651af0f165a74b9a37638b6de899dfe
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp
Log Message:
-----------
Remove unused variable, and fix some narrowing stuff.
src/multiint.cpp:404:52: error: narrowing conversion of ‘(rand() % 256)’ from
‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Werror=narrowing]
Fixes #3552.
Commit: 6a3121754793d994069af0854fd61fc64b073c92
https://github.com/Warzone2100/warzone2100/commit/6a3121754793d994069af0854fd61fc64b073c92
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: 0007657291832d003639eb3f408d069881ed3b39
https://github.com/Warzone2100/warzone2100/commit/0007657291832d003639eb3f408d069881ed3b39
Author: dak180 <dak...@users.sourceforge.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
Log Message:
-----------
Update the mac doc bundle.
Commit: 0c55d94ea0b6c3ff17527dbe61b8c0b0c0f885a9
https://github.com/Warzone2100/warzone2100/commit/0c55d94ea0b6c3ff17527dbe61b8c0b0c0f885a9
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 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: 3bb326b906007bad6f64e456010eaf28d1d92f7e
https://github.com/Warzone2100/warzone2100/commit/3bb326b906007bad6f64e456010eaf28d1d92f7e
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M ChangeLog
M lib/netplay/netplay.cpp
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
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/game.cpp
M src/multiint.cpp
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
* bugfixes:
Update translations.
Update the mac doc bundle.
Update ChangeLog.
Remove unused variable, and fix some narrowing stuff.
Fix loading of campaign savegames.
Commit: 8d8539fba9757da4dc12f60056fb1f19ea1a9ff6
https://github.com/Warzone2100/warzone2100/commit/8d8539fba9757da4dc12f60056fb1f19ea1a9ff6
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 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: e8a51a2ec434b683c938797cdb80612e0866c52e
https://github.com/Warzone2100/warzone2100/commit/e8a51a2ec434b683c938797cdb80612e0866c52e
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M configure.ac
M lib/netplay/netplay.cpp
M src/version.cpp
M win32/warzone2100.rc
Log Message:
-----------
Update version numbers for 3.1 beta11.
Compare:
https://github.com/Warzone2100/warzone2100/compare/5c1e204e78bb...e8a51a2ec434
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
