From 697e7c2fad825e53cc379b4cc7180e526f859eb3 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 27 Aug 2016 01:29:25 -0600 Subject: [PATCH] Update code with copyright headers --- config.xml | 90 ++++---- nbproject/project.properties | 15 ++ nbproject/project.xml | 1 + www/css/main.css | 18 ++ www/index.html | 17 ++ www/js/auth.js | 18 ++ www/js/home.js | 355 ------------------------------ www/js/location.js | 19 +- www/js/main.js | 18 ++ www/js/user.js | 18 ++ www/screens/battle.html | 0 www/screens/chooseteam.html | 17 ++ www/screens/dungeon.html | 0 www/screens/home.html | 17 ++ www/screens/intro.html | 17 ++ www/screens/inventory.html | 17 ++ www/screens/licenses.html | 413 ++++++++++++++++++----------------- www/screens/login.html | 17 ++ www/screens/menu.html | 57 +++-- www/screens/munzeelink.html | 17 ++ www/screens/place.html | 17 ++ www/screens/profile.html | 17 ++ www/screens/rules.html | 17 ++ www/screens/servererror.html | 17 ++ www/screens/settings.html | 17 ++ www/screens/signup.html | 105 +++++---- www/screens/splash.html | 33 ++- 27 files changed, 701 insertions(+), 663 deletions(-) delete mode 100644 www/js/home.js delete mode 100644 www/screens/battle.html delete mode 100644 www/screens/dungeon.html diff --git a/config.xml b/config.xml index b3b5d5f..e4df9a6 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,21 @@ - - + + + + TerranQuest Augmented Reality fantasy game @@ -7,45 +23,45 @@ Netsyms Technologies - - - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/nbproject/project.properties b/nbproject/project.properties index 750f685..f98bf43 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,8 +1,23 @@ auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52 auxiliary.org-netbeans-modules-cordova.phonegap=false +auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css +auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css +auxiliary.org-netbeans-modules-javascript-nodejs.enabled=false +auxiliary.org-netbeans-modules-javascript-nodejs.node_2e_default=true +auxiliary.org-netbeans-modules-javascript-nodejs.run_2e_enabled=false +auxiliary.org-netbeans-modules-javascript-nodejs.sync_2e_enabled=true +auxiliary.org-netbeans-modules-javascript2-requirejs.enabled=true auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs +browser.run=true file.reference.TerranQuest-test=test file.reference.TerranQuest-www=www files.encoding=UTF-8 +project.license=apache20 site.root.folder=${file.reference.TerranQuest-www} +start.file=index.html test.folder=${file.reference.TerranQuest-test} +web.context.root=/TerranQuest diff --git a/nbproject/project.xml b/nbproject/project.xml index 47057b4..c440b5f 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -5,6 +5,7 @@ TerranQuest + Geocaching diff --git a/www/css/main.css b/www/css/main.css index 7e65260..c2e46af 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -1,3 +1,21 @@ +/* + * TerranQuest - Augmented Reality fantasy game + * + * Copyright 2016 Netsyms Technologies + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + body { color: #eee; } diff --git a/www/index.html b/www/index.html index 59fddfe..7fe52bb 100644 --- a/www/index.html +++ b/www/index.html @@ -1,3 +1,20 @@ + diff --git a/www/js/auth.js b/www/js/auth.js index 6973a3c..5acc83d 100644 --- a/www/js/auth.js +++ b/www/js/auth.js @@ -1,3 +1,21 @@ +/* + * TerranQuest - Augmented Reality fantasy game + * + * Copyright 2016 Netsyms Technologies + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /* * Authentication and signup codez */ diff --git a/www/js/home.js b/www/js/home.js deleted file mode 100644 index 841e300..0000000 --- a/www/js/home.js +++ /dev/null @@ -1,355 +0,0 @@ -///* global PositionError */ -// -//////////////////////////////////////////////// -//// GPS and terrain stuff -//////////////////////////////////////////////// -// -///** -// * Handles GPS and terrain data. -// */ -// -//// Globals -//lockGot = false; -//terrainGot = false; -//latitude = 0.0000; -//longitude = 0.0000; -//gpsaccuracy = 9999; -//// End Globals -// -//var lastgpstime = 0; -//var terraintypeid = 0; -//var map = L.map('map'); -//var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg"; -//map.setZoom(17); -//map.dragging.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(); -////} -// -//// Tile layer -//map.addLayer(new L.tileLayer(tileurl, {minZoom: 17, maxZoom: 18})); -//// Places layer -//var placeLayer = L.geoJson( -// {"name": "Places", "type": "FeatureCollection", "features": [{"type": "Feature", "geometry": {"type": "Point", "coordinates": [0, 0]}, "properties": {"osm_id": -1, "name": null}}]}, -// { -// onEachFeature: onPlaceTap, -// pointToLayer: function (feature, latlng) { -// return L.circleMarker(latlng, { -// radius: 14, -// fillColor: "#ff7800", -// color: "#000", -// weight: 1, -// opacity: 1, -// fillOpacity: 0.6 -// }); -// } -// }).addTo(map); -// -//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 -// drawCircle: false, // controls whether a circle is drawn that shows the uncertainty about the location -// follow: true, // follow the user's location -// setView: true, // automatically sets the map view to the user's location, enabled if `follow` is true -// keepCurrentZoomLevel: true, // keep the current map zoom level when displaying the user's location. (if `false`, use maxZoom) -// stopFollowingOnDrag: false, // stop following when the map is dragged if `follow` is true (deprecated, see below) -// remainActive: true, // if true locate control remains active on click even if the user's location is in view. -// markerClass: L.circleMarker, // L.circleMarker or L.marker -// circleStyle: {}, // change the style of the circle around the user's location -// markerStyle: {}, -// followCircleStyle: {}, // set difference for the style of the circle around the user's location while following -// followMarkerStyle: {}, -// icon: 'fa fa-map-marker', // class for icon, fa-location-arrow or fa-map-marker -// iconLoading: 'fa fa-spinner fa-pulse', // class for loading icon -// iconElementTag: 'span', // tag for the icon element, span or i -// circlePadding: [0, 0], // padding around accuracy circle, value is passed to setBounds -// metric: true, // use metric or imperial units -// onLocationError: function (err) { -// }, // define an error callback function -// onLocationOutsideMapBounds: function (context) { // called when outside map boundaries -// }, -// showPopup: false, // display a popup when the user click on the inner marker -// strings: { -// title: ".", // title of the locate control -// metersUnit: "meters", // string for metric units -// feetUnit: "feet", // string for imperial units -// popup: "You are within {distance} {unit} from this point", // text to appear if user clicks on circle -// outsideMapBoundsMsg: "You seem located outside the boundaries of the map" // default message for onLocationOutsideMapBounds -// }, -// locateOptions: {} // define location options e.g enableHighAccuracy: true or maxZoom: 10 -//}).addTo(map); -//lc.start(); -//function mapPos(lat, lon) { -// lockGot = true; -// hideLoading(); -// loadPlaces(latitude, longitude); -// //map.setView(new L.LatLng(lat, lon), 16, {animate: true}); -// //map.panTo(new L.LatLng(lat, lon)); -// //map.invalidateSize(); -// //redraw('.leaflet-map-pane'); -//// $('.leaflet-map-plane').css('height', '90%'); -//// setTimeout(function () { -//// $('#map').css('width', '100%'); -//// $('#map').css('height', '100%'); -//// }, 100); -//} -// -//function onPlaceTap(feature, layer) { -// layer.on('click', function (e) { -// openPlace(feature); -// }); -//} -// -//function loadPlaces(lat, long) { -// $.getJSON( -// "http://earth.apis.netsyms.net/places.php?format=geojson&lat=" + lat + "&long=" + long + "&radius=.25&names=1", -// function (data) { -// if (data.type === 'FeatureCollection') { -// placeLayer.clearLayers(); -// data.features.forEach(function (item) { -// item.properties.popupContent = "" + item.properties.name + ""; -// placeLayer.addData(item); -// }); -// } -// }); -//} -// -//function openPlace(feature) { -// $('#main-content').load("screens/place.html", null, function () { -// loadPlace(feature); -// $('#overlay-main').css('display', 'block'); -// }); -//} -// -///** -// * Hide the loading overlay if everything is loaded, otherwise do nothing -// */ -//function hideLoading() { -// if (lockGot && terrainGot && gpsaccuracy < 30 && $('#loading').css('display') !== 'none') { -// $('#loading').fadeOut('slow', function () { -// $('#loading').css('display', 'none'); -// }); -// } -//} -// -//var updatePosition = function (position) { -// latitude = position.coords.latitude; -// longitude = position.coords.longitude; -// lastgpstime = position.timestamp; -// gpsaccuracy = position.coords.accuracy; -// if (gpsaccuracy > 30) { -// $('#no-lock').css('display', 'block'); -// } else { -// $('#no-lock').css('display', 'none'); -// } -// mapPos(latitude, longitude); -//}; -//var updateTerrain = function (position) { -// latitude = position.coords.latitude; -// longitude = position.coords.longitude; -// lastgpstime = position.timestamp; -// gpsaccuracy = position.coords.accuracy; -// var rasterurl = "http://earth.apis.netsyms.net/terrain.php?format=json&lat=" -// + latitude + "&long=" + longitude; -// $.get(rasterurl, function (data) { -// if (data.status === 'OK') { -// terraintypeid = data.typeid; -// terraintypename = data.typename; -// $('#terrain-image').attr('src', 'assets/terrain/' + terraintypeid + '.png'); -// terrainGot = true; -// hideLoading(); -// } -// }, "json").fail(function (err) { -// $('#terrain-image').attr('src', 'assets/terrain/0.png'); -// }); -//}; -//function pingServer() { -// if (lockGot && gpsaccuracy < 30) { -// $.get(mkApiUrl('ping') + "?user=" + username + "&lat=" + latitude + "&long=" + longitude); -// } -//} -//; -//function onError(error) { -// $('#loading-error').text("Check your device's network and location settings, and ensure a clear view of the sky."); -//} -// -//function popGPS() { -// navigator.notification.alert("Latitude: " + latitude + -// "\nLongitude: " + longitude + -// "\nAccuracy: " + gpsaccuracy + -// "\nTerrain: " + terraintypename + " (" + terraintypeid + ")", -// null, -// "GPS Information", -// "Close"); -//} -//$('#terrain-image').click(function () { -// popGPS(); -//}); -//// Initial GPS position and stuff -//navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); -//// Update position -//setInterval(function () { -// navigator.geolocation.getCurrentPosition(updatePosition, onError, {timeout: 10000, enableHighAccuracy: true}); -//}, 1000); -//// Update position + terrain -//setInterval(function () { -// navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); -// loadPlaces(latitude, longitude); -//}, 1000 * 20); -//// Ping the server with coordinates -//setInterval(pingServer, 5000); -//// Show error if it's taking too long -//setTimeout(function () { -// onError(); -//}, 15 * 1000); -// -// -//////////////////////////////////////////////// -//// Profile, stats, and chat stuff -//////////////////////////////////////////////// -// -// -///* -// * Handles general server communication. -// */ -// -///** -// * Syncs the user's stats with the server and calls refreshStats(). -// */ -//function syncStats() { -// $.getJSON(mkApiUrl('getstats'), { -// user: username -// }, function (data) { -// if (data.status === 'OK') { -// maxenergy = data.stats.maxenergy; -// energy = data.stats.energy; -// level = data.stats.level; -// refreshStats(); -// } -// }); -//} -// -///** -// * Display the current stats on the home screen. -// */ -//function refreshStats() { -// energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0; -// $('#energybar').css('width', String(energypercent) + '%'); -//} -// -//function getChat() { -// if (lockGot) { -// $.getJSON(mkApiUrl('chat', 'cs'), { -// lat: latitude, -// long: longitude -// }, function (data) { -// data = sortResults(data, 'time', true); -// var content = ""; -// data.forEach(function (msg) { -// content += "" + msg.username + " " + msg.message + "
"; -// }); -// $('#chatmsgs').html(content); -// }); -// } -//} -// -// -//syncStats(); -//setInterval(function () { -// syncStats(); -//}, 10 * 1000); -//setInterval(function () { -// getChat(); -//}, 2000); -//// Send chat messages -//$("#chatsendform").submit(function (event) { -// message = $('#chatbox-input').val(); -// if (message !== '') { -// $.post(mkApiUrl('chat', 'cs'), { -// user: username, -// lat: latitude, -// long: longitude, -// msg: message -// }, function (data) { -// if (data.status === 'OK') { -// $('#chatbox-input').val(""); -// $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); -// } -// }, "json"); -// } -// event.preventDefault(); -// return false; -//}); -//function toggleChat() { -// if ($('#chatmsgs').css('display') === 'none') { -// openChat(); -// } else { -// closeChat(); -// } -//} -// -//function closeChat() { -// $('#chatmsgs').css('display', 'none'); -// $('#chatbox').css('height', 'auto'); -//} -// -//function openChat() { -// $('#chatbox').css('height', '50%'); -// $('#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) { -// $('#overlay-main').css('display', 'block'); -// loadProfile(user); -// }); -//} -// -//function openRules() { -// openmodal('rules', '#rules-modal'); -//} -// -//function openMenu(topage) { -// topage = typeof topage !== 'undefined' ? topage : ""; -// $('#main-content').load("screens/menu.html", null, function (x) { -// $('#overlay-main').css('display', 'block'); -// if (topage !== '') { -// $('#' + topage + '-tab').tab('show'); -// } -// }); -//} -// -// -// -//////////////////////////////////////////////// -//// Other things -//////////////////////////////////////////////// -// -//function closeMain() { -// $('#overlay-main').slideDown(100, function () { -// $('#overlay-main').css('display', 'none'); -// $('#main-content').html(""); -// }); -//} -// -//// Handle back button to close things -//document.addEventListener("backbutton", function (event) { -// if ($('#overlay-main').css('display') !== 'none') { -// closeMain(); -// } else if ($('#chatmsgs').css('display') !== 'none') { -// toggleChat(); -// } -//}, false); -//// Show the rules -//if (localStorage.getItem("seenrules") !== 'yes') { -// openRules(); -// localStorage.setItem("seenrules", 'yes'); -//} \ No newline at end of file diff --git a/www/js/location.js b/www/js/location.js index 6b151b6..2a35801 100644 --- a/www/js/location.js +++ b/www/js/location.js @@ -1,4 +1,21 @@ -/* global PositionError */ +/* + * TerranQuest - Augmented Reality fantasy game + * + * Copyright 2016 Netsyms Technologies + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + ////////////////////////////////////////////// // GPS and terrain stuff diff --git a/www/js/main.js b/www/js/main.js index 2c3ff84..a4fac7a 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -1,3 +1,21 @@ +/* + * TerranQuest - Augmented Reality fantasy game + * + * Copyright 2016 Netsyms Technologies + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + // Constants username = ""; password = ""; diff --git a/www/js/user.js b/www/js/user.js index a2bbd9d..e8b0a31 100644 --- a/www/js/user.js +++ b/www/js/user.js @@ -1,3 +1,21 @@ +/* + * TerranQuest - Augmented Reality fantasy game + * + * Copyright 2016 Netsyms Technologies + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + ////////////////////////////////////////////// // Profile, stats, and chat stuff ////////////////////////////////////////////// diff --git a/www/screens/battle.html b/www/screens/battle.html deleted file mode 100644 index e69de29..0000000 diff --git a/www/screens/chooseteam.html b/www/screens/chooseteam.html index 8e3eb7e..5ff3381 100644 --- a/www/screens/chooseteam.html +++ b/www/screens/chooseteam.html @@ -1,3 +1,20 @@ +
Choose Your Magic

Before you can harness the power of magic, you must make a difficult choice.
diff --git a/www/screens/dungeon.html b/www/screens/dungeon.html deleted file mode 100644 index e69de29..0000000 diff --git a/www/screens/home.html b/www/screens/home.html index 549468a..9752ee9 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -1,3 +1,20 @@ +

diff --git a/www/screens/intro.html b/www/screens/intro.html index 25883a8..01e569d 100644 --- a/www/screens/intro.html +++ b/www/screens/intro.html @@ -1,3 +1,20 @@ +