From 02af40c19b12f4f5391df43e49f032f396e771a8 Mon Sep 17 00:00:00 2001 From: Skylar Date: Mon, 28 Mar 2016 12:36:06 -0600 Subject: [PATCH] Add rules screen after first login, add level text to profile screen, add references to Netsyms TOS --- config.xml | 2 +- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 142041 -> 142489 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 2673183 -> 2980866 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 164934 -> 178900 bytes platforms/android/AndroidManifest.xml | 2 +- platforms/android/assets/www/css/main.css | 10 ++++ platforms/android/assets/www/js/home.js | 46 +++++++++++++----- .../android/assets/www/screens/home.html | 2 +- .../android/assets/www/screens/profile.html | 21 ++++++-- .../android/assets/www/screens/rules.html | 18 +++++++ .../android/assets/www/screens/signup.html | 2 + platforms/android/res/xml/config.xml | 2 +- www/css/main.css | 10 ++++ www/js/home.js | 46 +++++++++++++----- www/screens/home.html | 2 +- www/screens/profile.html | 21 ++++++-- www/screens/rules.html | 18 +++++++ www/screens/signup.html | 2 + 19 files changed, 169 insertions(+), 35 deletions(-) create mode 100644 platforms/android/assets/www/screens/rules.html create mode 100644 www/screens/rules.html diff --git a/config.xml b/config.xml index 958328c..5d467ac 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + TerranQuest Augmented Reality fantasy game diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index dbf52e1ea00a7cdd0a087ec8ebec758f7e49bac5..822f385442eaadf9c2d9b3526924cf60726bea8d 100644 GIT binary patch literal 17 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 delta 7250 zcmcIpcU)6R*Un9DNCHT1NFasu00})*!3J0wt|HjKo14X5UBCBx|M~9kH!wVN&Y78W&vWL?WkJUwZ1d_O zEXO9DLo+_~m)*&qB2)jxj$!j?v;>8zU%rv-D~IK-T%kzo(s*m z=L5!DNdp_tzM*ibcLQjZ1f-{BT;<){@|MEP=MU_Zg|j1X__p^cpm6!H51;WP*KXgP zhqsz+RQ~cAzfz^Fv5E+%a0jsCGu}#k;5=LiDBNy-*G@cd;=D&6Sn@d_#V(pVW5~vh z0xgr0QSWsC9d_}=roP)}&WiuzCIxDUD3B=i*KK|%e>eVm&~OS=_;_?$D`@h15b|hr zHwu@kEI@%&#hqxz<=%dLgThp6_~5WKlAGTcnfdO=j}*pxbr9%f6G53Q7C6b1!C|?W zJ3w90eWe_u#??_*L4!OKq$-5OJ~PFqS+C~QQUeOFJK(TFNtBK1^=xXddo>iO-SH6^ z6e_OEu${BBtDjOBTk#q+DJFu6N)gxj)6ct-4)mpPd~Fwyq6`R3Yo432?MMiPiKB`; zcT+)gJeYg@{ZtB<&J6yH$M<`aRlcXnWFzq`xT%Z>Q7Sz+tkUPI^+Z+hkNm>fm??l| z5;4%J{XvR4R#&qq&U1CxN`g{UrL=S!tZAxm_quK}Jnzis2A+_2_?8HHoqKoH^>$#r~m|6PD%EQQGySAZNxC1`LI zb5jeGaH-8YX%>#O!m|GDz_RX#CS1DOxZwP{PBwtB9 zuEWgT?42ox*gvSwby5;-?-wsRI{3w5N><&^42YamAkwJ>@SKxDfwL!few5#(<2qBY z+Rc9jYMqq?;~sno&L!C47JE+P=(5&}wGLUdLirmKgXaePEs)!2OB=`U_V z@u)`Yn3WVx|4;`+t^rz$%AwG(dI*JKC#QDG@)xdtv}!@paSB&>RfAYp6}N8O%MZyj zjhT=}!&AnB99Mrrxb;%Qs>>Hm=}@XZ394L`pu;s3B)RFiz1Ebx4^;S53bHm^Q0k^6 zG^(kkoTX`GP9z^X*9SC^zKeC&2RSS*ZW#4@t0`$}xR#wuaqJ&hqmg%*7*B8M{uxic zQ+Z+h!rv%Ef|%dHV)qC_S95gL$<>=%C{QN40SxYB5P8Ibbsl;yZJO_H_O@VZOdj?# zsPa$}Zl{tnvb9#Gs8c>)18#cw6YeJqmbHnz+$c#+OB-P8^OW9GIxO?fE`SusI$zqk z4&N>RX3T2D`+yR?4m9aSK;#(*R(T3Rm1k-o(c|&B>*Xsb9jWhyPMuy?R^ZDfs1N>$ z|JsQM3J%&5hppO86Z7VS5U)t?{md?zdbKx&VKudo7Ed9popYk?`-=>%^Dt^6Fwo_r&Y3#`Rh%|N^#UD*H^`jwma;^Trz*V9N_J9X z8o^+o>#72AU4@{eYbfCO3xg8YXnJgK`29OdKpkA$xu1l)>E`->T{9Wg@U@-zwByzP z`cS^i6w|V$?Lg%3uS+}xTyLk-y(lBnuAfiD#ERhq+77HVIZGy;148^&Ak$w6YW>CB z$=Y`;}Zji*|1RIXm88GOlZNE-r$rlJOB@(Uzy6pY`Cx1itVVSCE-v z98H*%v3UtxRmkoS_Zk>%nAoDh;qedjF8B?@r#{d#lI{V6s-!ZQUxRrex{dBP458E5 z!Vvi2HN91oyyRHuz}JDHON75~-MuF`*JyG|NZb^d*~2OfmU`Q)hFhM~twHeUa9H4D z^U&P9fw|xUNesJs!x_2 zHN5!+u1dEXi)#{Z9f2ptFi9aF8v!D1N8zkPr1Bve1`B;9Meqj(>C3~f=v`pIBvvxq zo50dw(_wH6{iUcxZ0Qu4eP~Ehmt))dH=Pe6)o6m_Jkm7j9dzp6OjHxna|?TjsF;fckv9CpLg*2~W`A6dan%q;Tr z`y?P|H3L9B*Mfj77v>uL!s*FZK>Z*OSUSQ?23NY!U7;I~xgPn>#D~z4emlb(!?*YM ze+(o03dPXF8Cz*CBdgA?zU?)k!dGR#t^K8&!C7+6tIt`8%{P zG^nLQwhp;+1M$MytFiJ5Txx}`wP8P6;%}ZZk3-L!*mtJ*+Hon_cQK6gr1yh4 zH|h4U?t}{gBNx(F!h$N11m$QQPU7XU_yPIcyuD~oqkQZaV_a7FAEVK;gCn75vUK3u0Hp>_ zuEETC&#DIqdS$yWH13o3Z>I~Eu<(1~bkw@eay$bSyyt5%?t%8bQ9oWteg8D$zN}lt zR9JSGnSvq$xEUObhkD!=j6CsYO8lCqMw8nFpU%ToMXYfsHcq>a0fSt0L{?>i4XP}# zZ73vY#>3onpwpK1xm`h~cJoB!7A^M2Q7gyF4MXntZ66b8QnWC82)Z&&Zilf;Y)`z; zoVMX5e32*^4qNS{_AoI?j&oAxtb5cnPM3_q%%0>St;Zb4;X(ahZ-Zr5nE~as;s^%v zxNrMQ@4*qniNtRMogDyvGeD;xjdUTE(Mke@ZnJDu2I5_cU%@soGG{9 zVEmNQK^D)MAEBp=9u8x@l33Wjle zuSY`tQie5J{6OR|8@=2ulrSkbkuI{S5TMcu*>7efr>ZaaOnf?ywCgM zoDQ7b@S$>D0qOIJmQ*^m{Ol5M{LJWIPM`{fVgrxu!*ox<1AcuAGyPapDz|6 z*s=cXcl<_J|AZ9-GelAmeD1DdvD5q(5AHg8=1<6TpZXjF)q1Ja{b4|*bnjosTs7aU z$1xhM$1(EUcK(rF)x7-ap55c_!1^Rb5_>#%b=V6hAAgv62`3j_EOq2yUFO=(8RJwo z5XFvE8?-2vDa+u)U%eFZFmF49fc4wyF|Z*-?E{~CE1U)QPM2IWW_0>cvJEsgj1E_c zt*Ap?&mPh4lH5Kli3TwXR?ONHW?X2%HB!z;pUH#LPWa0I67_(m>}1E;2|BU@)X{dr zdf>VQ8me)36xh{e3=>A2ClBSa9xiP-On)Kd!D;@gpV2Nmw?+o^=&m{hBU2UgprOBu z7X2_+p~ukO5SMY75uFZWbEI~#G@L7h>ESLLVeap$rKS?&`(>_~Fhgr2LVB%e5{C58 zRI7(t`xdqyHtvX_CmXpOh7PLMsHU=WYCQ@LNrEelSto^q?Z2HT@4t!fW(t}hKgXad^a5N+4a1te6Wo zWQsD_$Fm#`RBjUNF&S*wrY6s4X?Y%YjMb$W8H!wLgd|6r_W11FQGed9%Q?e!$rFJi zdQtCcjll?+T#Fj6xM~BC;i`zBoB!dyTx8tDu(fC(aHta!-%^ams71gRO|BcEas@|% zh^wv}yIa>sMRYYP zb0HZRo-#{@Q zhMAa3UO~)YYzJKc4Pu$OV8+DGQV7ec{NZ8#jyeDOrXc?>L9%9Qn_@S%un!s?C0}&g z#Iq{wWy)+rrI(3kQ0t>0(2G`OdQW!z5nQb|5uLP z<-c&~8QyiciDNH+7?4}C{`JPcb8MnAI6nVv&u)KlYz80cY?QNaBQhI!V=#Taj6jX8 zN}I*sm<5qc{?5tB%o%+1ZPT~ZQy%nzjb4h$#Qoiw2kN>mxiu07wLc5EvHWYoUftA@ zVU+&|VG((&YQmtjS;eDXO>$#%n^7=<<5yLT{D6uP|96;wT5~awxh2u|n_=$rw=gFX zLR)W?mQH^Hx*S^}onA4>NUY}PU6QC7H;}Uds*%a4lcIm4BDuzN7G_OKklxD~E}sJv zFRKQgd`23224ihB^NfG zn(a5y#m%xWkN5_*ee6`z9h3O_(*IZKY}S$t=%dF2P{y8{XXi&mxp%US45; z-U%6MusBTgbwzJ*gFIr!_%zfwQm0PUv=6Q@Z z`eW!II9SWiKyx13-yiagj|g8^-_%XdQI&mWT4#D=5bERWQ*+0^X|*3}RUG*|$I-Zw zxo5__M>D%S^o-(6B0qVPZ6^k?{*3h~B3hh-!^v-XJQTK1J6?py0+fy;k6yC3a%9-7 z3wMTvA05`Cqpx^9ZH>wNk&*5YlJVag+ z;w?}_33EJ#3}yUTbmIk~go%{xx&-mxiaDrNYd8Hfh{!sz$qcRRqm7UncT>uQWS@X# z_iX1=YlY-mAyS$-`t?C?cW8r5<6muNE)QN{S(lVAvNf20dnpPDYW+=eOJnU+lwoar xr(qJZkpu~|hOL{O-=d>!ynQ$-lju_WBJDYyFO&F3<@%)q|NA-d-gD-<{|}z$xGn$y diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 1bdda1d2743ede79c8a8fd457e0540abb320479f..0146abc9b006fefff90d49b3c2ab44aca93faf97 100644 GIT binary patch delta 3220 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 T7KJL6@kjHZ2a#&0Cbs - + diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index 806e392..71505a5 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -83,6 +83,16 @@ body { background: rgba(0,0,0,.9); } +#overlay-main #main-content { + overflow-x: auto; + overflow-y: auto; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; +} + #mainCloseBtn { z-index: 999999; position: absolute; diff --git a/platforms/android/assets/www/js/home.js b/platforms/android/assets/www/js/home.js index 44a5e9e..88f8da5 100644 --- a/platforms/android/assets/www/js/home.js +++ b/platforms/android/assets/www/js/home.js @@ -22,14 +22,15 @@ var map = L.map('map'); var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg"; map.setZoom(16); map.dragging.disable(); -map.touchZoom.disable(); -map.doubleClickZoom.disable(); -map.scrollWheelZoom.disable(); +//map.touchZoom.disable(); +//map.doubleClickZoom.disable(); +//map.scrollWheelZoom.disable(); map.keyboard.disable(); $(".leaflet-control-zoom").css("visibility", "hidden"); // Disable tap handler, if present. -if (map.tap) - map.tap.disable(); +//if (map.tap) { +// map.tap.disable(); +//} var lc = L.control.locate({ position: 'topleft', // set the location of the control layer: undefined, // use your own layer for the location marker, creates a new layer by default @@ -63,8 +64,8 @@ var lc = L.control.locate({ }, locateOptions: {} // define location options e.g enableHighAccuracy: true or maxZoom: 10 }).addTo(map); -map.addLayer(new L.tileLayer(tileurl, {minZoom: 16, maxZoom: 16})); -//map.setView(new L.LatLng(46, -112), 15); +map.addLayer(new L.tileLayer(tileurl, {minZoom: 15, maxZoom: 17})); + lc.start(); function mapPos(lat, lon) { @@ -183,7 +184,9 @@ setTimeout(function () { * Syncs the user's stats with the server and calls refreshStats(). */ function syncStats() { - $.getJSON(mkApiUrl('getstats') + "?user=" + username, null, function (data) { + $.getJSON(mkApiUrl('getstats'), { + user: username + }, function (data) { if (data.status === 'OK') { maxenergy = data.stats.maxenergy; energy = data.stats.energy; @@ -248,13 +251,21 @@ $("#chatsendform").submit(function (event) { function toggleChat() { if ($('#chatmsgs').css('display') === 'none') { - $('#chatmsgs').css('display', 'block'); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + openChat(); } else { - $('#chatmsgs').css('display', 'none'); + closeChat(); } } +function closeChat() { + $('#chatmsgs').css('display', 'none'); +} + +function openChat() { + $('#chatmsgs').css('display', 'block'); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); +} + function openProfile(user) { user = typeof user !== 'undefined' ? user : username; $('#main-content').load("screens/profile.html", null, function (x) { @@ -263,6 +274,11 @@ function openProfile(user) { }); } +function openRules() { + $('#main-content').load("screens/rules.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + }); +} @@ -285,4 +301,10 @@ document.addEventListener("backbutton", function (event) { } else if ($('#chatmsgs').css('display') !== 'none') { toggleChat(); } -}, false); \ No newline at end of file +}, false); + +// Show the rules +if (localStorage.getItem("seenrules") !== 'yes') { + openRules(); + localStorage.setItem("seenrules", 'yes'); +} \ No newline at end of file diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index df580a0..7445801 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -38,7 +38,7 @@
- +
diff --git a/platforms/android/assets/www/screens/profile.html b/platforms/android/assets/www/screens/profile.html index 01bb045..ed04291 100644 --- a/platforms/android/assets/www/screens/profile.html +++ b/platforms/android/assets/www/screens/profile.html @@ -1,5 +1,6 @@ -
-
Badges
+
+

+
Badges
Loading...
@@ -14,9 +15,23 @@ function loadProfile(user) { $('#player-name').text(user); loadBadges(user); + loadPlayerStats(user); + } + + function loadPlayerStats(user) { + $.getJSON(mkApiUrl('getstats'), { + user: user + }, function (data) { + if (data.status === 'OK') { + $('#player-level').text('Level ' + Math.floor(data.stats.level)); + } else { + $('#player-level').text('Error: cannot load player stats.'); + } + }).fail(function () { + $('#player-level').text('Error: check your connection.'); + }); } - // TODO: Make this actually use the database/API! function loadBadges(user) { $('#loading-badges').html(' Loading...'); $('#loading-badges').css('display', 'block'); diff --git a/platforms/android/assets/www/screens/rules.html b/platforms/android/assets/www/screens/rules.html new file mode 100644 index 0000000..6ccde85 --- /dev/null +++ b/platforms/android/assets/www/screens/rules.html @@ -0,0 +1,18 @@ +
Rules
+

Please read these rules. Because TerranQuest is a game involving other + people and the environment, it's important to show good etiquette.

+
    +
  1. Do not endanger yourself or others
    2. +
  2. be considerate and polite in the in-game chat, and don't swear
    3. +
  3. Observe all local laws and rules
    4. +
  4. Respect property rights and obtain permission for playing on private land
    5. +
  5. Be nice to other people and try not to look too creepy
    6. +
  6. Respect and minimize your impact on the environment
    7. +
  7. Don't tamper with or deface any objects, landmarks, barcodes, or other real-world items
    8. +
  8. Pick up any trash you find and dispose of it properly if you can
    9. +
  9. Socialize with any players of other games, such as Geocaching and Ingress, you might meet
    10. +
  10. Follow the Netsyms Technologies Terms of Service at netsyms.com/legal
    11. + +
\ No newline at end of file diff --git a/platforms/android/assets/www/screens/signup.html b/platforms/android/assets/www/screens/signup.html index f7fab03..2202c42 100644 --- a/platforms/android/assets/www/screens/signup.html +++ b/platforms/android/assets/www/screens/signup.html @@ -32,6 +32,8 @@ +
+

By signing up, you agree to the Netsyms Technologies Terms of Service and Privacy Policy at netsyms.com/legal

Sign Up

diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml index 4e0037d..6630776 100644 --- a/platforms/android/res/xml/config.xml +++ b/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ - + diff --git a/www/css/main.css b/www/css/main.css index 806e392..71505a5 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -83,6 +83,16 @@ body { background: rgba(0,0,0,.9); } +#overlay-main #main-content { + overflow-x: auto; + overflow-y: auto; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; +} + #mainCloseBtn { z-index: 999999; position: absolute; diff --git a/www/js/home.js b/www/js/home.js index 44a5e9e..88f8da5 100644 --- a/www/js/home.js +++ b/www/js/home.js @@ -22,14 +22,15 @@ var map = L.map('map'); var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg"; map.setZoom(16); map.dragging.disable(); -map.touchZoom.disable(); -map.doubleClickZoom.disable(); -map.scrollWheelZoom.disable(); +//map.touchZoom.disable(); +//map.doubleClickZoom.disable(); +//map.scrollWheelZoom.disable(); map.keyboard.disable(); $(".leaflet-control-zoom").css("visibility", "hidden"); // Disable tap handler, if present. -if (map.tap) - map.tap.disable(); +//if (map.tap) { +// map.tap.disable(); +//} var lc = L.control.locate({ position: 'topleft', // set the location of the control layer: undefined, // use your own layer for the location marker, creates a new layer by default @@ -63,8 +64,8 @@ var lc = L.control.locate({ }, locateOptions: {} // define location options e.g enableHighAccuracy: true or maxZoom: 10 }).addTo(map); -map.addLayer(new L.tileLayer(tileurl, {minZoom: 16, maxZoom: 16})); -//map.setView(new L.LatLng(46, -112), 15); +map.addLayer(new L.tileLayer(tileurl, {minZoom: 15, maxZoom: 17})); + lc.start(); function mapPos(lat, lon) { @@ -183,7 +184,9 @@ setTimeout(function () { * Syncs the user's stats with the server and calls refreshStats(). */ function syncStats() { - $.getJSON(mkApiUrl('getstats') + "?user=" + username, null, function (data) { + $.getJSON(mkApiUrl('getstats'), { + user: username + }, function (data) { if (data.status === 'OK') { maxenergy = data.stats.maxenergy; energy = data.stats.energy; @@ -248,13 +251,21 @@ $("#chatsendform").submit(function (event) { function toggleChat() { if ($('#chatmsgs').css('display') === 'none') { - $('#chatmsgs').css('display', 'block'); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + openChat(); } else { - $('#chatmsgs').css('display', 'none'); + closeChat(); } } +function closeChat() { + $('#chatmsgs').css('display', 'none'); +} + +function openChat() { + $('#chatmsgs').css('display', 'block'); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); +} + function openProfile(user) { user = typeof user !== 'undefined' ? user : username; $('#main-content').load("screens/profile.html", null, function (x) { @@ -263,6 +274,11 @@ function openProfile(user) { }); } +function openRules() { + $('#main-content').load("screens/rules.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + }); +} @@ -285,4 +301,10 @@ document.addEventListener("backbutton", function (event) { } else if ($('#chatmsgs').css('display') !== 'none') { toggleChat(); } -}, false); \ No newline at end of file +}, false); + +// Show the rules +if (localStorage.getItem("seenrules") !== 'yes') { + openRules(); + localStorage.setItem("seenrules", 'yes'); +} \ No newline at end of file diff --git a/www/screens/home.html b/www/screens/home.html index df580a0..7445801 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -38,7 +38,7 @@
- +
diff --git a/www/screens/profile.html b/www/screens/profile.html index 01bb045..ed04291 100644 --- a/www/screens/profile.html +++ b/www/screens/profile.html @@ -1,5 +1,6 @@ -
-
Badges
+
+

+
Badges
Loading...
@@ -14,9 +15,23 @@ function loadProfile(user) { $('#player-name').text(user); loadBadges(user); + loadPlayerStats(user); + } + + function loadPlayerStats(user) { + $.getJSON(mkApiUrl('getstats'), { + user: user + }, function (data) { + if (data.status === 'OK') { + $('#player-level').text('Level ' + Math.floor(data.stats.level)); + } else { + $('#player-level').text('Error: cannot load player stats.'); + } + }).fail(function () { + $('#player-level').text('Error: check your connection.'); + }); } - // TODO: Make this actually use the database/API! function loadBadges(user) { $('#loading-badges').html(' Loading...'); $('#loading-badges').css('display', 'block'); diff --git a/www/screens/rules.html b/www/screens/rules.html new file mode 100644 index 0000000..ef62fa0 --- /dev/null +++ b/www/screens/rules.html @@ -0,0 +1,18 @@ +
Rules
+

Please read these rules. Because TerranQuest is a game involving other + people and the environment, it's important to show good etiquette.

+
    +
  1. Do not endanger yourself or others
    2. +
  2. Be considerate and polite in the in-game chat, and don't swear
    3. +
  3. Observe all local laws and rules
    4. +
  4. Respect property rights and obtain permission for playing on private land
    5. +
  5. Be nice to other people and try not to look too creepy
    6. +
  6. Respect and minimize your impact on the environment
    7. +
  7. Don't tamper with or deface any objects, landmarks, barcodes, or other real-world items
    8. +
  8. Pick up any trash you find and dispose of it properly if you can
    9. +
  9. Socialize with any players of other games, such as Geocaching and Ingress, you might meet
    10. +
  10. Follow the Netsyms Technologies Terms of Service at netsyms.com/legal
    11. + +
\ No newline at end of file diff --git a/www/screens/signup.html b/www/screens/signup.html index f7fab03..2202c42 100644 --- a/www/screens/signup.html +++ b/www/screens/signup.html @@ -32,6 +32,8 @@ +
+

By signing up, you agree to the Netsyms Technologies Terms of Service and Privacy Policy at netsyms.com/legal

Sign Up