[cyphesis-cpp] 02/08: Merge tag 'upstream/0.6.2'
Olek Wojnar
olek-guest at moszumanska.debian.org
Tue Sep 6 11:40:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
olek-guest pushed a commit to branch master
in repository cyphesis-cpp.
commit 44daff69e938fb1bd9e637e43ca3d8af719fab66
Merge: 5864627 531d696
Author: Olek Wojnar <olek-dev at wojnar.org>
Date: Mon Aug 29 23:01:19 2016 -0400
Merge tag 'upstream/0.6.2'
Upstream version 0.6.2
ChangeLog | 12 ++
NEWS | 4 +
configure | 20 +-
configure.ac | 2 +-
cyphesis.spec | 2 +-
data/buildings.xml | 6 +-
rulesets/Character.cpp | 17 +-
rulesets/Character.h | 7 +
rulesets/Makefile.am | 3 +-
rulesets/Makefile.in | 7 +-
rulesets/SpawnerProperty.cpp | 274 ++++++++++++++++++++++++++++
rulesets/SpawnerProperty.h | 132 ++++++++++++++
rulesets/basic/mind/goals/humanoid/mason.py | 6 +-
rulesets/mason/world/tasks/Pioneering.py | 6 +-
server/CorePropertyManager.cpp | 3 +
server/buildid.cpp | 2 +-
tests/Accountintegration.cpp | 27 +++
tests/CorePropertyManagertest.cpp | 27 +++
tests/Makefile.am | 7 +
tests/Makefile.in | 50 +++--
tests/SpawnerPropertytest.cpp | 73 ++++++++
21 files changed, 641 insertions(+), 46 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/cyphesis-cpp.git
More information about the Pkg-games-commits
mailing list