phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,802 Commits 1 Branch 0 Tags
Commit Graph

2802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Atkins
64ad7274b4 Merge pull request #704 from khabraken/master 
Fix the calculation for Link Amp range boost to be generic, so VRLA boos...
 2013-12-16 15:41:25 -08:00
khabraken
3c19f242db Fix the calculation for Link Amp range boost to be generic, so VRLA boosts are correctly calculated. 
For RLA, the first multiplier is 2x. Subsequent RLAs add 0.5, 0.25, 0.25 to the multiplier. But expressed as a fraction of the initial multiplier, this is 0.25, 0.125, 0.125. Scale array has been updated to reflect this. This means the "-1" in the calculation is no longer required, and that boost is correctly calculated when baseMultiplier is anything other than 2 (eg VRLA, when it is 7).
If there aren't any Link Amps, the multiplier is 1x.
 2013-12-17 03:58:09 +13:00
Philipp Schaefer
e1b33fa3d4 retrieve correct resource id when package name is overriden 2013-12-15 19:33:39 +01:00
Jon Atkins
e71c83aeaa Merge pull request #702 from fkloft/portal-counts 
Portal counts
 2013-12-15 10:00:12 -08:00
Philipp Schaefer
1dee77bef9 Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion 2013-12-15 18:52:24 +01:00
Philipp Schaefer
78e2f8a62f don't use hard coded strings for app name 2013-12-15 18:52:03 +01:00
fkloft
508a892341 portal-counts: Some fixes for mobile 2013-12-15 18:45:48 +01:00
fkloft
d16101e848 portal-counts: display graphs for level distribution 2013-12-15 18:44:23 +01:00
fkloft
69aad81933 mobile: show portal counts in nav drawer 2013-12-15 16:11:07 +01:00
Jon Atkins
78e9983d90 work-around for mobile-specific geodesic line drawing issue - appears to be an odd rounding problem 
not ideal, but better than the current situation
 2013-12-15 06:08:54 +00:00
Jon Atkins
11cfa11406 psd source for "I'd rather be using IITC" logo 2013-12-15 05:01:13 +00:00
Jon Atkins
0f54f5f9dc updated assets for iitc digital bumper sticker 2013-12-15 02:48:39 +00:00
Jon Atkins
83c5972502 digital bumper sticker 
- use smaller logo, fine tune position
- change z-index so it doesn't cover up the detailed AP tooltip
 2013-12-15 02:38:57 +00:00
Jon Atkins
390f3e946b logos for iitc-digital-bumper-sticker plugin 2013-12-14 20:10:57 +00:00
Jon Atkins
a765e4bd1c stock intel plugin to add the "I'd rather be using IITC" logo onto the map 2013-12-14 20:08:29 +00:00
Jon Atkins
92e8c5c6a1 portals list plugin 
- level colour background on level numbers
- abbreviated faction to 3 characters, to save space
- increased portal name column width
 2013-12-14 05:22:29 +00:00
Jon Atkins
48713823d7 resonators plugin - redraw selected portal resonators after zooming out and then back in again 2013-12-14 00:25:53 +00:00
Jon Atkins
562f745585 Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-12-13 20:11:34 +00:00
Jon Atkins
599ad25113 artifact list: 
- line break when both target and fragments are on one portal
- colour fragments when on a target portal
 2013-12-13 20:10:46 +00:00
Jon Atkins
fba399fa76 Merge pull request #698 from fkloft/compact 
Repair compact tab
 2013-12-13 09:36:10 -08:00
fkloft
ca3ad18217 Repair compact tab 2013-12-13 17:54:25 +01:00
Jon Atkins
1279179407 plugin draw-resonators: clear resonators when portal is deselected. changed hooks used to handle things in a more logical way 2013-12-13 05:49:17 +00:00
Jon Atkins
3806b5143d change makefile to run a plain build.py by default - localbuildsettings.py then can control the default 2013-12-13 05:40:49 +00:00
Jon Atkins
14c024ed85 Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-12-13 01:17:38 +00:00
Philipp Schaefer
9fc5960e5d set default build target back to desktop build 2013-12-12 19:52:18 +01:00
Jon Atkins
28b077b58d more portal summary data utility functions 
- link/field count functions - useful when we only need numbers
- approximate AP gains, based only on summary data
 2013-12-12 18:32:28 +00:00
fkloft
508b183c4f swapped inner and outer colors for user location 2013-12-12 19:04:33 +01:00
fkloft
5c30743531 Use gradient for user-location hack circle 2013-12-11 19:27:40 +01:00
Philipp Schaefer
fe0c408fd5 Merge branch 'user-location' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft/user-location 2013-12-11 00:45:30 +01:00
fkloft
61047dbbff Fix: location marker would be reset to circle when layer was toggled 2013-12-11 00:36:34 +01:00
fkloft
de96f3cd2a user-location: hide hack circle on z < 16 2013-12-11 00:18:15 +01:00
fkloft
63f4abb3ef Make user location appear in layer chooser 2013-12-11 00:18:14 +01:00
fkloft
f0a5339479 Add hack circle to user-location 2013-12-11 00:18:07 +01:00
fkloft
1e74037163 user-location: use circle by default, or arrow if device sends orientation events 2013-12-11 00:18:07 +01:00
fkloft
2c4bda7357 Improve build tools 
- Makefile provides "locale" and "mobile" as targets. Mobile also installs and starts app
- build.py returns error code if ant fails
 2013-12-11 00:18:07 +01:00
Philipp Schaefer
58b85e4c24 new actionbar title for permalink 2013-12-10 22:14:24 +01:00
fkloft
18afab9952 Improved intent sorting 
(default app listed first again, sorting broke this)
 2013-12-10 22:13:48 +01:00
Jon Atkins
1e4b56dd22 Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-12-10 19:17:56 +00:00
Jon Atkins
7fb9a1aef9 leaflet 0.7.1 update 2013-12-10 19:17:36 +00:00
Philipp Schaefer
9661867104 Merge pull request #697 from fkloft/bookmarks-pane 
Mobile: Bookmarks in nav drawer
 2013-12-10 06:08:48 -08:00
fkloft
010682ffa6 Revert "Revert "Naive attempt to make bookmarks compatible with nav drawer. @ZasoGD - please have a look, if necessary undo this commit and do it right"" 
This reverts commit 67f273fd6d4b1db7d3ac2363305a1d30e3729ac4.
 2013-12-10 14:55:46 +01:00
Jon Atkins
9293f7fe93 Merge pull request #696 from nexushoratio/proofreading 
Minor spelling correction.
 2013-12-09 07:23:49 -08:00
nexushoratio
af8e54b758 Minor typo. 2013-12-09 00:11:46 -08:00
Mike Castle
81e20b87a4 Merge remote-tracking branch 'upstream/master' 2013-12-08 23:43:43 -08:00
Jon Atkins
a5bb46c5a2 Merge pull request #694 from enigmaquip/master 
plugin draw resonator update
 2013-12-08 23:28:04 -08:00
nexushoratio
d66472a316 Merge pull request #13 from jonatkins/master 
Pull from upstream.
 2013-12-08 22:36:50 -08:00
enigmaquip
d1358081ae plugin draw resonator update 
Update to code for disabled on out of zoom bounds and tool tip when in
bounds
 2013-12-08 15:19:14 -07:00
Jon Atkins
9721dfe105 Merge pull request #693 from fkloft/pancontrol 
Remove pan control from minimap
 2013-12-08 13:49:03 -08:00
fkloft
e8db2eac66 Remove pan control from minimap 
(basically same issue as c537811e9b996bdcda80510d4e04e17fd3654796)
 2013-12-08 22:13:09 +01:00
Jon Atkins
c8423191d5 Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-12-08 19:42:09 +00:00