Index: ps/trunk/LICENSE.txt =================================================================== --- ps/trunk/LICENSE.txt +++ ps/trunk/LICENSE.txt @@ -83,3 +83,10 @@ /source/tools/atlas GPL version 2 (or later) - see license_gpl-2.0.txt + + /binaries/data/mods/public/gui/prelobby/common/terms + /binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt + /binaries/data/mods/mod/gui/modio/Disclaimer.txt + Redistributing modified Terms and Conditions of online services may be within the licensing, + but may not change the legality or enforceability of the terms of the service provider. + It may be against the terms of the service provider to use online services with modified terms. Index: ps/trunk/binaries/data/config/default.cfg =================================================================== --- ps/trunk/binaries/data/config/default.cfg +++ ps/trunk/binaries/data/config/default.cfg @@ -417,6 +417,7 @@ verify_certificate = false ; Whether to reject connecting to the lobby if the TLS certificate is invalid (TODO: wait for Gloox GnuTLS trust implementation to be fixed) terms_of_service = "0" ; Version (hash) of the Terms of Service that the user has accepted terms_of_use = "0" ; Version (hash) of the Terms of Use that the user has accepted +privacy_policy = "0" ; Version (hash) of the Privacy Policy that the user has accepted xpartamupp = "wfgbot23" ; Name of the server-side XMPP-account that manage games echelon = "echelon23" ; Name of the server-side XMPP-account that manages ratings buddies = "," ; Comma separated list of playernames that the current user has marked as buddies Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/feedback/feedback.xml =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/common/feedback/feedback.xml +++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/feedback/feedback.xml @@ -2,9 +2,9 @@ onTick(); - + - + Cancel Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt +++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt @@ -0,0 +1,79 @@ +[font="sans-bold-18"]0 A.D. Empires Ascendant Multiplayer Lobby Privacy Policy[/font] + +[font="sans-bold-14"]Document Date:[/font] 2018-10-16 + +[font="sans-bold-16"]Personal data processed by Wildfire Games and purposes of processing:[/font] +[font="sans-bold-14"]1. Playername[/font] +The player is identified by a name that the player chooses at the time of registration. +Having a unique playername is a requirement to gain a rating, to allow players, moderators and developers to identify players they met before, communicate about the game, coordinate matches and enables moderators to enforce the Terms of Use. +The playername serves as a pseudoynm. The identity (natural person) of players is not known to Wildfire Games, except where personally identifiable information (such as the realname) was disclosed on the Lobby Chat, other services of Wildfire Games or elsewhere in the public, or when the IP address is used to bring criminal proceedings. + +[font="sans-bold-14"]2. Password[/font] +A player is authenticated using a password that the player chooses at the time of registration. +Wildfire Games only receives an encrypted version of the password, so that the password chosen by the user is not revealed to Wildfire Games or others in case of a breach. + +[font="sans-bold-14"]3. IP address[/font] +When a player hosts a match in the Multiplayer Lobby, the IP address of that player is sent to every player who is online, so that other players can join that game. +Wildfire Games stores players IP addresses and may infer publicly available geolocation and internet service provider data (for example "geolite2") from the IP address in order to: + 1. Enforce the Terms of Use where persons create multiple accounts without Wildfire Games permission, in particular after having been banned from the service for violating the Terms of Use. + IP addresses will not be saved for longer than two years for this purpose. + 2. Make it possible to bring criminal proceedings in case of a cyberattack (EU Court of Justice Press Release No 112/16). +Wildfire Games will not use the IP address logs for any other purpose, in particular not for marketing, not otherwise disclose IP addresses to the public or third parties and erase IP addresses if they are not relevant for the stated purposes anymore. + +[font="sans-bold-14"]4. Online presence[/font] +Which players are currently connected to the Multiplayer Lobby and which match they joined is shown to all online players. + +[font="sans-bold-14"]5. Chat messages[/font] +The Multiplayer Lobby features a public chat room that enables players to discuss the game and organize multiplayer matches. +Wildfire Games stores a log of the public chat messages and online presence to meet the following purposes: + 1. Moderators may screen chat messages to enforce the Terms of Use. + 2. Wildfire Games may address or resolve bug reports, balancing issues or feature proposals indicated by players in the chat room. + 3. Wildfire Games may assess trends amongst discussed topics, the growth of the active community and use these indicators as feedback to assess, improve and direct development of the game and the service. + +[font="sans-bold-14"]6. Match statistics[/font] +Players can gain a rating on the Multiplayer Lobby that reflects their skill at the game. +The rating of all players is published by Wildfire Games and allows players to focus on competitive or balanced matchmaking if they wish to. +During a rated match, players send data relating to the game (such as the number of units trained, resources gathered and the winner of the match) to Wildfire Games, so that Wildfire Games can adapt the players ratings based on these statistics. +Wildfire Games stores match statistics to: + 1. Verify the accuracy of the rating score and identify and enforce Terms of Use violations relating to that. + 2. Compute and publish community statistics to improve the game and the service, for example to improve the balancing of the game or to make certain aspects of the game more appealing. + +[font="sans-bold-14"]Security of processing:[/font] +The transmission of personal data is secured using TLS encryption (GDPR 32). +Personal data is protected against unintentional loss in encrypted backups for additional time (GDPR 30.1.g, GDPR 32). + +Wildfire Games obtains all personal data from the user (GDPR 14). +Wildfire Games reserves the right to delete any service data (including personal data) at any time, except where a user has objected to the erasure of his or her personal data for performance of a legal claim. + +[font="sans-bold-16"]Legal basis for the processing:[/font] +1. The processing is necessary for the performance of the service defined in the terms (GDPR 6.1.b). +2. Wildfire Games has legitimate interests in providing the Multiplayer Lobby, in the development and improvement of 0 A.D. and the Multiplayer Lobby, in enforcing the Terms of Use and in the protection against cyberattacks (GDPR 6.1.f). +3. Wildfire Games does not process any further data for the Multiplayer Lobby and does not ask for consent to process data (GDPR 6.1.a, GDPR 7, GDPR 8, GDPR 13.2.c). + +[font="sans-bold-16"]User rights:[/font] +1. Contact Wildfire Games, by sending an email to webmaster at wildfiregames dot com (GDPR 13.1.a, GDPR 13.1.b). +2. Right of access to personal data concerning him or her (GDPR 15). +3. Right to obtain personal data in a machine-readable format (GDPR 20). +4. Right to rectification of inaccurate personal data (GDPR 16). +5. Right to erasure of personal data where it is not relevant to the stated purposes, if the data was processed unlawfully or if the user objects to the processing and has overriding legitimate grounds (GDPR 17). +6. Right to restriction of personal data processing where the accuracy of the data is contested by the user, if the data was processed unlawfully or if the user requires the data for a legal claim (GDPR 18). +7. Right to object to the processing of personal data concerning him or her on grounds relating to their particular situation (GDPR 21). +8. Right to lodge a complaint with a supervisory authority (GDPR 13.2.d, GDPR 77). +Requests that are manifestly unfounded or excessive are not responded to or may be charged (GDPR 12.4, GDPR 12.5). + +[font="sans-bold-16"]Wildfire Games obligations:[/font] + 1. Wildfire Games demonstrates compliance with GDPR (GDPR 5.2 'accountability'). + 2. Wildfire Games documents their processing activities appropriately, in particular the categories of processed personal data and security measures to protect it (GDPR 30). + 3. Wildfire Games processes personal data lawfully, fairly and transparently (GDPR 5.1.a, GDPR 12.1). + 4. Wildfire Games informs users of the purposes, legal grounds, legitimate interests and retention periods of personal data processing at the time it is processed, recipients of personal data and where applicable, transfer of personal data to third countries and automated decision-making (GDPR 13.1.c-f, GDPR 13.2.a, GDPR 13.2.e-f, GDPR 15.1, GDPR 15.4). + 5. Wildfire Games does not processes personal data for purposes other than the specified ones (GDPR 5.1.b, 'purpose limitation', GDPR 13.3). + 6. Wildfire Games does not process personal data that is not needed for the specified purposes (GDPR 5.1.c, 'data minimization'). + 7. Wildfire Games uses a storage form that does not allow identification of natural persons for longer than necessary (GDPR 5.1.e 'storage limitation'). + 8. Wildfire Games secures personal data processing to prevent unauthorised or unlawful processing and accidental loss (GDPR 5.1.f. 'integrity and confidentiality'). + 9. Wildfire Games informs users of their right to access, to rectify, to erase personal data and the right to restrict, to withdraw consent to, to object to personal data processing and to complain at a supervisory authority (GDPR 13.2.b, GDPR 13.2.c, GDPR 13.2.d). +10. Wildfire Games facilitates the exercise of user rights where possible (GDPR 12.2), without undue delay (GDPR 12.3). +12. Wildfire Games informs the users that to exercise their rights, users might need to provide additional information to identify the natural person or the data (GDPR 12.6, GDPR 13.2.e). +13. Wildfire Games will not knowingly collect personal data from children under the age of 13 (Children's Online Privacy Protection Act). If you believe Wildfire Games received any personal data from or about a child under 13, please contact Wildfire Games. +14. Where Wildfire Games processes sensitive personal data based on legitimate interests, Wildfire Games considers performing, recording and periodically reviewing Legitimate Interests Assessments and Data Protection Impact Assessments (GDPR 35) to become confident that the individual's interests do not override Wildfire Games legitimate interests, and that Wildfire Games is not using personal data in intrusive ways unless there is a very good reason to. + +For further information on Wildfire Games Privacy Policies, visit https://trac.wildfiregames.com/wiki/UserDataProtection Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Terms_of_Service.txt =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Terms_of_Service.txt +++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/Terms_of_Service.txt @@ -1,21 +1,22 @@ [font="sans-bold-18"]0 A.D. Empires Ascendant Multiplayer Lobby Terms of Service[/font] -[font="sans-bold-14"]Document Date:[/font] 2018-10-13 +[font="sans-bold-14"]Document Date:[/font] 2018-10-16 The 0 A.D. Empires Ascendant Multiplayer Lobby is an online service provided by Wildfire Games that allows players to setup online multiplayer matches, discuss the game in a public chat room and gain a rating that reflects their skill. +Due to the subject matter of historic warfare, description and depcition of violence and the language on the Multiplayer Lobby, 0 A.D. and the Multiplayer Lobby are not directed to young children (COPPA ยง312.2). +The minimum age to use the Multiplayer Lobby is 13. + [font="sans-bold-14"]By using the 0 A.D. Multiplayer Lobby, you agree to:[/font] 1. Follow all usage policies. - 2. Allow user identifiable statistics to be gathered for the purposes of rating, user profiles, and community statistics. + 2. Not use the service with third-party software or mods that prevents the user from being informed of updated Terms and Conditions, unless authorized by a Wildfire Games team member. 3. Use the service at your own risk. Wildfire Games does not take responsibility for the content posted by users or damages resulting from this service. - 4. Not use the service with third-party software or mods that prevents the user from being informed of updated Terms and Conditions, unless authorized by a Wildfire Games team member. [font="sans-bold-14"]Wildfire Games reserves the right to:[/font] 1. Moderate the service, i.e. to enforce the Terms of Use by restricting, suspending or terminating user accounts. 2. Appoint others to moderate the service. 3. Discontinue or interrupt any part of the service at any time. - 4. Change the service or its terms. The document date of the terms indicate its version, and the user is informed of the new terms before being able to use the service again. - 5. Delete any and all service data at any time with or without announcement. - 6. Collect any or all user identifiable statistics at any time without consent for: - a. Private analysis by Wildfire Games (WFG) team members and their affiliates. - b. Anonymized public release by Wildfire Games (WFG) team members. + 4. Change the service or the terms. The document date of the terms indicate its version, and the user is informed of the new terms before being able to use the service again. + 5. Process personal data in accordance with the Lobby Privacy Policy, the General Data Protection Regulation (GDPR) and the Children's Online Privacy Protection Act (COPPA) where applicable. + +If parts of the terms are held to be illegal or otherwise unenforceable, the remainder of the terms shall still apply ('severability'). Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.js =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.js +++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.js @@ -20,6 +20,15 @@ "salt": () => Engine.GetGUIObjectByName("username").caption, "accepted": false, "callback": updateFeedback + }, + "Privacy": { + "title": translate("Privacy Policy"), + "instruction": translate("Please read and accept the Privacy Policy."), + "file": "gui/prelobby/common/terms/Privacy_Policy.txt", + "config": "lobby.privacy_policy", + "salt": () => Engine.GetGUIObjectByName("username").caption, + "accepted": false, + "callback": updateFeedback } }; Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.xml =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.xml +++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/termslobby.xml @@ -1,7 +1,7 @@ - + Index: ps/trunk/binaries/data/mods/public/gui/prelobby/login/login.xml =================================================================== --- ps/trunk/binaries/data/mods/public/gui/prelobby/login/login.xml +++ ps/trunk/binaries/data/mods/public/gui/prelobby/login/login.xml @@ -7,7 +7,7 @@