Commit Graph

3849 Commits

Author SHA1 Message Date
231178123f Merge pull request #687 from fkloft/guess-player-levels
Fix guess-player-levels
2013-12-05 14:35:29 -08:00
7451867324 Count mods by capturing player; more than two --> portal was flipped 2013-12-05 23:06:26 +01:00
82705a14fc bump version 2013-12-05 19:13:38 +01:00
c70b7ac1ca Fix guess-player-levels
(Under certain circumstances, flipped portals weren't detected correctly. Also, guessing has improved: Resonators not deployed by the owner can safely be used for level guessing)
2013-12-05 19:03:55 +01:00
b2027313e5 Merge pull request #11 from jonatkins/master
Pull from upstream.
2013-12-04 23:40:48 -08:00
c676354a15 Merge pull request #681 from nexushoratio/to-push
Introduce some consistency in grammar and punctuation into @description.
2013-12-04 16:25:11 -08:00
f2e597370e Merge pull request #683 from fkloft/controls
Fix Leaflet controls
2013-12-04 16:21:42 -08:00
c537811e9b Remove zoom slider from minimap 2013-12-04 19:58:15 +01:00
0df056f083 renamed drawer notice since it is used as howto now 2013-12-04 19:49:03 +01:00
49ed868626 Minimap: Fix bug where map whould be centered on 0,0 on startup
I'm not sure, but my best guess is that the minimap is loaded before the inital position, causing some kind of move loop between main map and mini map.
2013-12-04 19:13:33 +01:00
6cb55ae2b1 Do not show a dialog more than once.
Implement "Do not show again"
2013-12-04 18:50:49 +01:00
b4fe2a4c0b new icon for portals-list 2013-12-04 11:50:27 +01:00
ca9d631ffe updated drawers notice to a how to use notice 2013-12-04 11:20:33 +01:00
67f273fd6d 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 8a10848e15.

Conflicts:
	plugins/bookmarks-css.css
2013-12-04 10:31:57 +01:00
2522a97ee9 added default plugin icon plus JSInterface method 2013-12-04 10:17:05 +01:00
a9ecd268ac Merge branch 'navdrawer-api' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-navdrawer-api 2013-12-04 09:46:45 +01:00
511a02f9a1 Introduce some consistency in grammar and punctuation into @description. 2013-12-03 23:51:54 -08:00
adaa348bde Merge pull request #680 from nexushoratio/to-push
More typos; actual code this time.
2013-12-03 22:42:49 -08:00
1732f11f03 Fix typos in actual code. A CSS class name, and a variable name. 2013-12-03 21:59:21 -08:00
27991bab10 Merge pull request #10 from nexushoratio/master
Pull from upstream.
2013-12-03 21:56:05 -08:00
60d7f5cc6b Merge pull request #9 from jonatkins/master
Pull from upstream.
2013-12-03 21:55:03 -08:00
b0d1ec84de mobile: make portals-list appear appear in nav drawer 2013-12-04 00:42:25 +01:00
235140cbc4 Merge branch 'master' into navdrawer-api 2013-12-04 00:39:10 +01:00
89b23e8fbc decrease width from 800 to 700 pixels - resolves issues on mobile 2013-12-03 23:34:53 +00:00
99a0b3e975 delete the old broken version of portals-list 2013-12-03 23:29:48 +00:00
a2e181d052 Merge branch 'master' of https://github.com/Marx314/ingress-intel-total-conversion into Marx314-master 2013-12-03 23:29:21 +00:00
0dcc9bfd7e Merge branch 'master' into navdrawer-api
Conflicts:
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
2013-12-03 23:48:54 +01:00
18bacd956a accidental copy and pasta!
plugin: portals list - fix for changes to Niantc data
Issue #668
2013-12-03 17:47:28 -05:00
270705cf6c Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion 2013-12-03 23:30:20 +01:00
6c0327b01c Show a hint that plugins are now in the nav drawer 2013-12-03 23:07:05 +01:00
47fb16707c drawable changes part 4 2013-12-03 23:03:58 +01:00
b434b81757 drawable changes part 3 2013-12-03 22:57:15 +01:00
aff4a9f9f9 drawable changes part 2 2013-12-03 22:12:25 +01:00
39721fa0b8 Merge pull request #678 from fkloft/ipas
Fix ipas-link
2013-12-03 08:49:12 -08:00
c1434db0dc drawable changes part1 2013-12-03 17:37:41 +01:00
7a12681fab Iteration two, using TEAM_* constant, level with 0 base, getLatLng and fields/links count.
plugin: portals list - fix for changes to Niantc data
Issue #668
2013-12-03 11:11:10 -05:00
fd24fad641 Change background colors 2013-12-03 16:48:40 +01:00
7e0cfd0159 Fix ipas-link 2013-12-03 16:15:17 +01:00
7b69693a3f - don't push current pane to backstack if it was called via back button
- fixes endless loop of while toggling panes
2013-12-03 13:49:38 +01:00
7140cd41d7 Merge pull request #677 from nexushoratio/to-push
Fix a number of typos/spelling issues in comments.
2013-12-02 23:56:48 -08:00
b783ef9cf6 Spell check and found a bunch of new comments with typos. 2013-12-02 23:15:02 -08:00
82f4ee4410 Merge pull request #8 from nexushoratio/master
Pull from upstream.
2013-12-02 22:50:23 -08:00
f3bf30a99b Merge pull request #7 from jonatkins/master
Pull from upstream.
2013-12-02 22:49:15 -08:00
03fadb3078 plugin: portals list - fix for changes to Niantc data
Issue #668
2013-12-03 00:24:10 -05:00
cb603ea7be Allow plugins to specify an icon for the nav drawer
(and add icons for bookmarks)
2013-12-03 00:06:15 +01:00
8a10848e15 Naive attempt to make bookmarks compatible with nav drawer. @ZasoGD - please have a look, if necessary undo this commit and do it right 2013-12-02 23:47:00 +01:00
ad6a447bde Allow plugins to add panes to mobile nav drawer 2013-12-02 23:40:25 +01:00
40d25ad8ef Replace Pane enum with class 2013-12-02 23:06:18 +01:00
10b662d8c1 Merge pull request #673 from fkloft/website
Website: some changes
2013-12-02 12:12:23 -08:00
39d1ea6b5b Website: update mobile download and faq page
- Android login is disabled now
- issue #90 is closed
- mention issue #257
2013-12-02 20:58:56 +01:00