Merge in xonotic/xonotic-data.pk3dir.git: zykure/teamscores
git-manager created issue #1531 (closed) on 2013-04-24T09:47:35Z:
Purpose of the branch:
Add a "team" event to the data send to xonstat; submit teamscores in the new event.
Repository: xonotic/xonotic-data.pk3dir.git Commit: 42f8a3a2 Branch: zykure/teamscores
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '42f8a3a2519801f07f140f4d477ba18cb0aac004'..'origin/zykure/teamscores'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/zykure/teamscores'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'zykure/teamscores'
Diffstat:
qcsrc/server/playerstats.qc | 19 ++++++++++++++++---
qcsrc/server/scores.qc | 3 ++-
2 files changed, 18 insertions(+), 4 deletions(-)
Revision log:
commit 42f8a3a2519801f07f140f4d477ba18cb0aac004
Author: Jan Behrens
Commit: Jan Behrens
Add "Q" xonstat event for teams, move teamscores into new event
commit e6b7795562d4547d080ff3ea24ee6752f5cde025
Author: Jan Behrens
Commit: Jan Behrens
Use default teamscore for xonstat in teamgames
commit 55c696533844eba0903f273ba669975e3bd35e3f
Author: Jan Behrens
Commit: Jan Behrens
fix db key for teamscore
commit 5448301a8aca77ba6a7435e6467a97672902e679
Author: Jan Behrens
Commit: Jan Behrens
Adding xonstat event for teamscore
commit e23e7ec535b848203e145b961384b60ced5013db
Merge: 5b29399 5ff2b40
Author: Jan Behrens
Commit: Jan Behrens
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
commit 5b29399384bd98a213c977f6fe0542f4f5f249e1
Merge: ae715b8 3dc4050
Author: Jan Behrens
Commit: Jan Behrens
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
commit ae715b8874b92feeadbe09e5dd569d0ff6e3d48a
Merge: a74ce9c 9c13562
Author: Jan Behrens
Commit: Jan Behrens
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
commit a74ce9c3855c7f18f9e80323f52d04820d9a1d62
Merge: 3aa63c6 373da6f
Author: Jan Behrens
Commit: Jan Behrens
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
commit 3aa63c6febb90af279ac168b8c50dc0981e9f903
Merge: 045d99e a142a0d
Author: Jan Behrens
Commit: Jan Behrens
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Conflicts:
qcsrc/server/playerstats.qc
commit 045d99effff66234921edeb95f9246ef05ae422a
Author: Jan Behrens
Commit: Jan Behrens
Make CA and LMS send correct data to XonStat
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index c01a25b..f370ed6 100644
— a/qcsrc/server/playerstats.qc
**+ b/qcsrc/server/playerstats.qc
@ -99,7 +99,7
@ void PlayerStats_AddPlayer
}
}
-void PlayerStats_AddTeam // TODO: doesn’t this remain unused?
*void PlayerStats_AddTeam(float t)
{
if(playerstats_db < 0)
return;
@ -159,7 +159,7
@ float PlayerStats_Event(entity e, string event_id, float value)
return val;
}
~~void PlayerStats_TeamScore // TODO: doesn’t this remain unused?
*void PlayerStats_TeamScore
{
string key;
float val;
@ -217,9 +217,10
@ void PlayerStats_TeamScore // TODO: doesn
void PlayerStats_ready
{
- string t, tn; string p, pn; string e, en; ~~ string nn, tt;
- string nn, tt, ts; string s;
switch(status)
@ -238,6 +239,16
@ void PlayerStats_ready(entity fh, entity pass, float status)
url_fputs(fh, sprintf(“C d\n", cvar_purechanges_count));
url_fputs(fh, sprintf("U d\n”, cvar(“port”)));
url_fputs(fh, sprintf(“D f\n", max(0, time - game_starttime)));
-
if(teamplay)
-
{
-
for(t = teamstats\_last; (tn = db\_get(playerstats\_db, sprintf("d”, stof(t)))) != “”; t = tn)
- {
- url_fputs(fh, sprintf(“Q team#s\n", t));
-
ts = db\_get(playerstats\_db, sprintf("team\#d:s", stof(t), strcat(PLAYERSTATS\_SCOREBOARD, "score")));
-
if(ts != "")
-
url\_fputs(fh, sprintf("e s s\\n", strcat(PLAYERSTATS\_SCOREBOARD, "teamscore"), (ts != "" ? ts : "0")));
-
}
-
} for(p = playerstats\_last; (pn = db\_get(playerstats\_db, sprintf("s:\*”, p))) != “”; p = pn)
{
url_fputs(fh, sprintf(“P %s\n”, p));
@ -383,6 +394,8
@ void PlayerStats_EndMatch(float finished)
entity p;
PlayerScore_Sort(score_dummyfield, 0, 0, 0);
PlayerScore_Sort(scoreboard_pos, 1, 1, 1);
- if(teamplay)
- PlayerScore_TeamStats();
FOR_EACH_CLIENT(p)
{
// add personal score rank
diff —git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index e8d5590..aa9afa7 100644
— a/qcsrc/server/scores.qc
**+ b/qcsrc/server/scores.qc
@ -927,6 +927,7
@ void PlayerScore_TeamStats for if != 0) if
- PlayerStats_TeamScore, sk.);
- // the*1 is important here!
- PlayerStats_TeamScore(t+1, strcat(PLAYERSTATS_SCOREBOARD, teamscores_label[i]), sk.(teamscores[i])); } }