phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins 2013-07-23 17:10:48 +01:00
commit e2ab17fa81
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cradle.iitc_mobile" package="com.cradle.iitc_mobile"
android:versionCode="30" android:versionCode="31"
android:versionName="0.4.9"> android:versionName="0.5.0">
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

2
mobile/plugins/user-location.user.js
View File

@ -43,7 +43,7 @@ window.plugin.userLocation.setup = function() {
marker.on('click', function(e) { marker.on('click', function(e) {
window.console.log('marker location'); window.console.log('marker location');
var ll = e.target.getLatLng(); var ll = e.target.getLatLng();
window.androidCopy('https://maps.google.com/?q='+ll.lat+','+ll.lng+'%20('+PLAYER.nickname+')'); window.androidCopy('https://maps.google.com/?q='+ll.lat+','+ll.lng);
}); });
plugin.userLocation.marker = marker; plugin.userLocation.marker = marker;

5
plugins/portals-list.user.js
View File

@ -137,6 +137,11 @@ window.plugin.portalslist.getPortals = function() {
if (modShortName === '') { if (modShortName === '') {
mods[ind] = ['', '', '']; mods[ind] = ['', '', ''];
} else { } else {
if ((modShortName === 'S') &&
((mod.rarity=='COMMON' && mod.stats.MITIGATION == 6) ||
(mod.rarity=='RARE' && mod.stats.MITIGATION == 8) ||
(mod.rarity=='VERY_RARE' && mod.stats.MITIGATION == 10)))
modShortName=modShortName+'!';
mods[ind] = [mod.rarity, getPlayerName(mod.installingUser), modShortName, mod.displayName]; mods[ind] = [mod.rarity, getPlayerName(mod.installingUser), modShortName, mod.displayName];
} }
}else { mods[ind] = ['', '', '']; } }else { mods[ind] = ['', '', '']; }