Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: 9a005ac66ea5a3abc18a1fec004e22c187438b9d
https://github.com/Warzone2100/warzone2100/commit/9a005ac66ea5a3abc18a1fec004e22c187438b9d
Author: vexed <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M lib/gamelib/gtime.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/frontend.cpp
M src/multiint.cpp
M src/multijoin.cpp
M src/multimenu.cpp
M src/multiopt.cpp
M src/multiplay.cpp
M src/multiplay.h
M src/multistat.cpp
Log Message:
-----------
Let the host kick people in non alliance games. (left+right click over ready
button of the player you want kicked)
close ticket:3100
close ticket:3121
Fix kick routines that got clobbered by the merge a long time ago, and also
implement a in-game kick.
Currently, you hold down the right mouse button over the channel icon of the
person you want to kick, and it will kick them.
There is no more room for a new icon. :(
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11490
4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit da30725d967cf7076456f56122b28ddbc3202488)
Conflicts:
src/multiint.cpp
src/multimenu.cpp
src/multiplay.cpp
Allow the host to kick the AI only in 'cheat mode' in skirmish games.
Closes ticket:2139
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11596
4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 7a083b154dab6b6fa8f421042db0670a671127f5)
Conflicts:
src/multimenu.cpp
When kicking, make sure they are an actual human player before adding them to
the list.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11506
4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 43b180768c71853b3de97d71fa091e6a0fdfc10e)
Conflicts:
lib/netplay/netplay.c
general networking improvements by popular request.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11568
4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 052d03d19ec967d4b8cee5d79446fe5ec1f2b040)
Conflicts:
lib/netplay/netplay.c
src/multiint.cpp
src/multijoin.cpp
src/multiplay.cpp
src/multiplay.h
src/multisync.c
Fix client side messages.
refs ticket:2144
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11601
4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 98723c00a9b7d6a46eab204ccd474df4a62fbd93)
Conflicts:
lib/netplay/netplay.c
src/multiint.cpp
src/multiplay.cpp
Commit: bdd5969031f813afe1061a70cc220065c7e05790
https://github.com/Warzone2100/warzone2100/commit/bdd5969031f813afe1061a70cc220065c7e05790
Author: vexed <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M lib/netplay/netplay.cpp
Log Message:
-----------
Bump netcode, since I forgot in last commit.
Commit: b5a45c02b07561e574d3c243a4dc13c4f5e336ad
https://github.com/Warzone2100/warzone2100/commit/b5a45c02b07561e574d3c243a4dc13c4f5e336ad
Author: cybersphinx <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M tests/Makefile.am
Log Message:
-----------
Search data/mp for map files in addition to data/base.
Refs 779b4edcbd2ce1204bb97dbb795ca7e341cc666f.
Commit: e891b7d46bd8243a186719da591503220bddc574
https://github.com/Warzone2100/warzone2100/commit/e891b7d46bd8243a186719da591503220bddc574
Author: cybersphinx <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: e0bcef31c6ba4d4d30eb21db9796c28f1df4cd6b
https://github.com/Warzone2100/warzone2100/commit/e0bcef31c6ba4d4d30eb21db9796c28f1df4cd6b
Author: cybersphinx <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M icons/warzone2100.desktop
M po/POTFILES.in
M po/ca_ES.po
M po/cs.po
M po/custom/mac-infoplist.txt
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: 8027777e9ca49148836d567394f0d8b5327ec1fb
https://github.com/Warzone2100/warzone2100/commit/8027777e9ca49148836d567394f0d8b5327ec1fb
Author: dak180 <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M macosx/configs/Glew-All.xcconfig
M macosx/configs/QuesoGLC-All.xcconfig
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
Log Message:
-----------
Update the docs for xcode builds.
Also get rid of some odd warnings
Commit: fa05b8034f3e4780b8750a210da4542418fca746
https://github.com/Warzone2100/warzone2100/commit/fa05b8034f3e4780b8750a210da4542418fca746
Author: dak180 <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M ChangeLog
M icons/warzone2100.desktop
M lib/gamelib/gtime.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M macosx/configs/Glew-All.xcconfig
M macosx/configs/QuesoGLC-All.xcconfig
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M po/POTFILES.in
M po/ca_ES.po
M po/cs.po
M po/custom/mac-infoplist.txt
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/frontend.cpp
M src/multiint.cpp
M src/multijoin.cpp
M src/multimenu.cpp
M src/multiopt.cpp
M src/multiplay.cpp
M src/multiplay.h
M src/multistat.cpp
M tests/Makefile.am
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
* bugfixes:
Update the docs for xcode builds.
Update translations.
Update ChangeLog.
Search data/mp for map files in addition to data/base.
Bump netcode, since I forgot in last commit.
Let the host kick people in non alliance games. (left+right click over ready
button of the player you want kicked)
Compare: https://github.com/Warzone2100/warzone2100/compare/127a7df...fa05b80
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
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-dev2
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
