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

461 Commits

Author SHA1 Message Date
Stefan Breunig
6796d1b37b Merge pull request #381 from boombuler/redeem_dlg 
New Redeem-Dialog Content
 2013-03-07 07:08:58 -08:00
Florian Sundermann
3bb3a4b6b2 fixed coding style (no spaces after for and if) 2013-03-07 15:04:50 +01:00
Florian Sundermann
ca4ad51d93 fixed some more codingstyle issues 2013-03-07 13:32:03 +01:00
Stefan Breunig
b6bf5669a5 portal may become unselected 
This simplifies the logic a bit, hopefully making it easier to debug the
issue See #404. It seems to be related to when the portal changed because
I could trigger it easily on zooming in/out when there was a cache bug
that gave me an R portal in one zoom level and an E one in the other.
 2013-03-07 11:30:58 +01:00
Stefan Breunig
26c18a7ddf fix shadow handling in marker icons 2013-03-07 10:49:13 +01:00
Stefan Breunig
41c3f01737 point leaflet to use app engine to serve marker icons. App Engine does not allow @-signs in their filenames, so the marker will probably be broken on retina-displays. 2013-03-07 09:06:15 +01:00
Stefan Breunig
e85d7e6751 Merge pull request #400 from Fragger/player-spiderfy-main 
Player spiderfy main
 2013-03-06 23:36:33 -08:00
Florian Sundermann
0824334d5f Merge branch 'upstream' into redeem_dlg 
Conflicts:
	code/redeeming.js
 2013-03-07 08:35:44 +01:00
Florian Sundermann
1623c3fa9a fixed indetion 2013-03-07 08:31:25 +01:00
Jon
4e9a1682cb Issue #390:https protocol for perma link and zoom 2013-03-06 17:56:43 -08:00
Fragger
28bd62d0ee Update to main needed to spiderfy player tracker icons 2013-03-06 13:43:11 -08:00
Xelio
d591b714a3 Bug fix: handleDataResponse in map_data 
It throw error when val.deletedGameEntityGuids or val.gameEntities is null
 2013-03-06 13:35:18 +08:00
Stefan Breunig
b30ac36ffa fix style nits 2013-03-06 00:02:28 +01:00
Morgan Jones
a448912500 Fix display of HTTP error messages for code redemption 2013-03-05 16:15:46 -06:00
Xelio
dbda13112e Bug fix in "isSameResonator" 
It was throwing error when only one of the resonator is null.
 2013-03-05 23:10:49 +08:00
Florian Sundermann
967578f7ea fixed codingstyle and removed coda font 2013-03-05 13:35:09 +01:00
Florian Sundermann
90ca848690 fixed indention 2013-03-05 08:56:46 +01:00
Florian Sundermann
f167cd83ea changed "redeemed" to "accepted" 2013-03-05 08:55:15 +01:00
Florian Sundermann
ba730111c4 Changed AP / XM Message to "+ 100 XM" 2013-03-05 08:52:56 +01:00
Florian Sundermann
0afc26af4a new redeem dialog content 2013-03-05 08:52:46 +01:00
Morgan Jones
3c1c596a6a * Add detailed error messages for redemption errors (including rate-limiting, which happens sometimes). 
* Reverse XMPs and resonators in redemption display
 2013-03-04 15:55:01 -06:00
Xelio
eb3ec79852 Add hook: requestFinished 
Called after each request finished. Argument is {success: boolean} indicated the request success or fail.
 2013-03-05 03:17:46 +08:00
Stefan Breunig
5f2d124ef7 Merge pull request #368 from Fragger/field-mu 
Add Field MU counts for large enough fields
 2013-03-03 21:52:05 -08:00
Kevin
01f7b7099d Use LineUtil.simplify, rearange some code 2013-03-03 19:17:17 -08:00
Xelio
5e8cab6c88 Store player level at setupPlayerStat 2013-03-03 23:59:44 +08:00
Xelio
5f94d56578 Add guid to window.PLAYER and add constant MAX_RESO_PER_PLAYER 2013-03-03 22:59:41 +08:00
Kevin
898f0c37ce One more nit 2013-03-03 01:21:50 -08:00
Kevin
e3b9a2b1ec Fix up nits 2013-03-03 01:08:46 -08:00
Kevin
f3606d6f0f Fix neutral portals have broken random details 2013-03-02 22:54:30 -08:00
Kevin
9889e0988f Fix to use identity operators 2013-03-02 22:27:45 -08:00
Kevin
7c019e1eb8 Fix tabs and add comment about crazy equation 2013-03-02 21:51:12 -08:00
Kevin
d4903c6ce7 Code breaking bug fix 2013-03-02 21:38:13 -08:00
Kevin
5513ea13eb Resolve conflict and sync 2013-03-02 21:31:12 -08:00
Kevin
0ba8631b82 MU counts for fields with limiting for small fields 
Only at higher zoom levels will counts for small fields show.
 2013-03-02 21:25:03 -08:00
vita10gy
420ec8de16 Save Game info with links and fields 
Useful for plugins/extending
 2013-03-02 10:23:38 -06:00
Stefan Breunig
bc089cd5c8 Merge pull request #344 from Xelio/patch-fix-portal-flicker 
Fix flicker portal in portal render limit handler
 2013-03-02 07:22:45 -08:00
Stefan Breunig
ee05477b2b Merge pull request #353 from cmrn/signout-link 
Added sign out link when hovering over name (fixes #352)
 2013-03-02 07:11:43 -08:00
Kevin
1e21bbb94d Add thousands separator and bug fix 2013-03-02 06:29:35 -08:00
Kevin
75dea672f3 Inital stab at mu counts for fields 
Still needs work on when not to display, maybe based on field area and
zoom level?
 2013-03-02 05:56:29 -08:00
boombuler
03da82b34e add "nickname" class to all nicknames within the page 2013-03-01 19:47:35 -08:00
boombuler
971cbef11f add "nickname" class to all nicknames within the page 2013-03-01 22:11:04 +01:00
Xelio
4113991201 Code restructure 3 2013-03-01 15:31:15 +08:00
Xelio
a679710198 Code restructure 2 2013-03-01 15:00:49 +08:00
Xelio
c9d7300a05 Code Restructure 2013-03-01 14:40:30 +08:00
Cameron Moon
32ca78b1d7 Added sign out link when hovering over name (fixes #352) 2013-03-01 13:31:13 +11:00
Stefan Breunig
6a2603d566 allow quickly (de)selecting all layers by shift/ctrl/alt/meta clicking an entry in the layer chooser (fixes #232) 2013-02-28 23:49:21 +01:00
Stefan Breunig
be893d785a Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages 2013-02-28 22:03:55 +01:00
Stefan Breunig
573562dffd undo always using https for the portal image because some images are taken from panoramio which do not support https properly 2013-02-28 22:03:12 +01:00
Xelio
c75caa91dd Fix flicker portal in portal render limit handler 
Change:
Extract portal handle process from "handleDataResponse" to "handlePortalData"
Add "action" property to object returned by $.ajax() to identity type of request
Delay low level portal render until no active request of map data.
 2013-02-28 15:10:13 +08:00
Stefan Breunig
bbe67a6573 Merge pull request #317 from Xelio/patch-portal-limit-reach-hide-low-level-2 
New Feature: (method 2)Remove lower level portal when portal render limit reached
 2013-02-27 02:44:47 -08:00