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

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

Browse Source 
Conflicts:
	code/panes.js
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
This commit is contained in:
Philipp Schaefer 2015-01-24 12:33:14 +01:00
commit 615372e137
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/chat.js
View File

@ -530,7 +530,6 @@ window.chat.request = function() {
chat.requestFaction(false); chat.requestFaction(false);
} }
if (channel == 'all' || (window.chat.backgroundChannels && window.chat.backgroundChannels['all'])) { if (channel == 'all' || (window.chat.backgroundChannels && window.chat.backgroundChannels['all'])) {
// the 'public', 'full' and 'compact' tabs are all based off the 'public' COMM data
chat.requestPublic(false); chat.requestPublic(false);
} }
if (channel == 'alerts' || (window.chat.backgroundChannels && window.chat.backgroundChannels['alerts'])) { if (channel == 'alerts' || (window.chat.backgroundChannels && window.chat.backgroundChannels['alerts'])) {

5
code/panes.js
View File

@ -7,10 +7,9 @@ window.show = function(id) {
switch(id) { switch(id) {
case 'all': case 'all':
window.chat.show('all');
break;
case 'faction': case 'faction':
window.chat.show('faction'); case 'alerts':
window.chat.show(id);
break; break;
case 'alerts': case 'alerts':
window.chat.show('alerts'); window.chat.show('alerts');

3
mobile/src/com/cradle/iitc_mobile/compass/Compass.java
View File

@ -16,10 +16,9 @@ public abstract class Compass
return new GyroCompass(context); return new GyroCompass(context);
else else
return new AccMagCompass(context); return new AccMagCompass(context);
} }
private final ArrayList<CompassListener> mListeners = new ArrayList<CompassListener>();
private final ArrayList<CompassListener> mListeners = new ArrayList<CompassListener>();
private boolean mStarted = false; private boolean mStarted = false;
protected abstract void onStart(); protected abstract void onStart();