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

1605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Atkins
06a1b09af6 Merge pull request #317 from integ3r/alignment-virus 
Passcode redemption: Support for Alignment Virus and other item types, tweaks
 2013-05-26 15:39:13 -07:00
Jon Atkins
e609c64775 Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-05-26 19:30:34 +01:00
Jon Atkins
5430992d70 improvements to date formatting 
- leading zeros on month/day
- milliseconds in chat tooltips
 2013-05-26 19:29:48 +01:00
Philipp Schaefer
c852d1f34b use class attribute to check for enabled/disabled desktop mode 2013-05-26 14:50:16 +02:00
Philipp Schaefer
86fe10aa9c added back desktop mode (see #304) 2013-05-26 14:15:11 +02:00
Philipp Schaefer
c8dc62eafb added forgotten getString(...) 2013-05-25 16:25:34 +02:00
Philipp Schaefer
5311fb1641 set currentPane to home if home button is pressed 2013-05-25 16:05:29 +02:00
Philipp Schaefer
37dac3b197 * display backstack correctly on home button 
* clear backstack on home button pressed
 2013-05-25 15:37:49 +02:00
Philipp Schaefer
818aec09c4 bumped version number 2013-05-25 13:41:13 +02:00
Philipp Schaefer
d3461b0451 got back long press on portal functionality 2013-05-25 13:39:58 +02:00
Philipp Schaefer
5cc27b70d9 removed forgotten setupBackButton function call 2013-05-25 12:26:53 +02:00
Philipp Schaefer
6e6249f903 * removed JS backstack (not needed anymore) 
* removed JSInterface exit method
 2013-05-25 12:24:59 +02:00
Philipp Schaefer
0a97d6a5e4 * removed not used import 
* handle home button correctly
* update currentPane after backStack.pop()
 2013-05-25 12:23:27 +02:00
Morgan Jones
0380893637 Style tweak 2013-05-25 00:36:16 -06:00
Morgan Jones
34c58bae71 Merge git://github.com/jonatkins/ingress-intel-total-conversion into alignment-virus 2013-05-25 00:15:41 -06:00
Morgan Jones
1b2baf5a88 = Redemption tweaks, round 3 
* Pass the entire acquired item into resource decoders instead of the attribute in question. Generic 'resource' objects have things we need to examine.
* Formatted support for the `resource' taxonomy (portal keys and JARVIS/ADA). Remove standard 'default' taxonomy in favor of this.
* Let individual items override their own primary key (for example, JARVIS/ADA are both a FLIP_CARD, but we don't want to smash them together)
* Let the server-side item name override the "hard-coded" name in IITC
* Assuming that passcodes can eventually work like portal hacks, add support for the MEDIA and PORTAL_LINK_KEY item types.
* Change plaintext and HTML display for modResources in anticipation of link amplifiers
* Log entire JSON response to the console if we have to guess about items.
* Add more encouragement.
* Add Jarvis/ADA JSON responses, fake media items, and fake portal keys to json_examples.
 2013-05-25 00:12:56 -06:00
hastarin
7ada77ac21 Just some code clean up. 2013-05-25 12:33:27 +10:00
hastarin
3691402e4a Improved back handling in mobile app. Now more consistant with standard. 2013-05-25 11:58:35 +10:00
Philipp Schaefer
27cb2efde5 Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion 2013-05-24 17:24:23 +02:00
Philipp Schaefer
045279a265 extended JSInterface to finish app via js (see #312) 2013-05-24 17:24:02 +02:00
Jon Atkins
84e0aeb679 Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-05-24 15:54:35 +01:00
Jon Atkins
9dffadada6 plugins - ensure they pass a default for shown/hidden when being added to the map 2013-05-24 15:54:05 +01:00
Philipp Schaefer
e7a296b2b3 removed wrong semicolon 2013-05-24 16:03:24 +02:00
Philipp Schaefer
7e35c95e2c reordered layer and location buttons correctly ;) 2013-05-24 15:58:19 +02:00
Philipp Schaefer
58faf2e2ba removed speech-search plugin from mobile. it is not working and iitcm brings its own voice search 2013-05-24 15:54:56 +02:00
Philipp Schaefer
3245ca01d4 removed not used imports 2013-05-24 15:52:36 +02:00
Philipp Schaefer
a56272f260 some tweaks for the new search 
* distinguish between onCreate intent and resume intent (do not always reload)
* handle voice search correct
 2013-05-24 15:48:37 +02:00
hastarin
34712cddb1 Removed menu selection handling for search due to double search. 2013-05-24 17:04:06 +10:00
hastarin
dd8ceaf934 Reordered menu items. IMO Layers is used more than My Location. 2013-05-24 16:15:56 +10:00
hastarin
9ce25e7e57 Initial commit of a working Search View. 2013-05-24 15:52:25 +10:00
hastarin
98e927fb0f Have everything working now if you don't enable ProGuard. 
It will take time to determine how it needs to be configured but that's low priority really.
 2013-05-24 12:04:23 +10:00
hastarin
50168e93fa Merge branch 'master' into androidstudio 2013-05-24 10:41:18 +10:00
Jon Atkins
169dd9aced Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion 2013-05-23 18:13:07 +01:00
Jon Atkins
f4027881b4 add some disclaimers to the CloudMade map plugin comments 2013-05-23 18:12:39 +01:00
Jon Atkins
9e540bb457 add a template plugin for the old cloudmade.com maps. users need to register to get their own API key for this 2013-05-23 18:07:59 +01:00
Philipp Schaefer
f58e8cfa83 fixed typo in API 2013-05-23 13:44:00 +02:00
Philipp Schaefer
d61c5cc752 bumped version number 2013-05-23 13:18:01 +02:00
hastarin
04d2e60d75 This is a version of the multi window patch minus Android Studio changes. 
Proguard changes are excluded since there is no config in the master branch
 2013-05-23 20:32:52 +10:00
hastarin
dfc18e84f5 Forgot to move some settings in gitignores. 2013-05-23 18:14:01 +10:00
hastarin
ed0e1be9e1 Added proguard-project file back as building with it requires it. 
Moved .gitignore changes to mobile/.gitignore
 2013-05-23 17:54:08 +10:00
hastarin
c584315010 Finally working and tested. *blush* 2013-05-23 17:28:04 +10:00
hastarin
a808434fd4 Tried to recreate things. 2013-05-23 17:22:59 +10:00
hastarin
b2376676c4 Fixed build not including src files. 2013-05-23 17:01:20 +10:00
hastarin
83e324f8aa Forgot to delete old iml file 2013-05-23 16:44:09 +10:00
hastarin
98c90d4b16 Fixed output APK name to be the same as ADT 2013-05-23 16:42:41 +10:00
hastarin
009691c813 Restored *.bak to .gitignore 2013-05-23 16:02:54 +10:00
hastarin
ab8018c795 Setup support for Android Studio Preview 2013-05-23 15:49:33 +10:00
Jon Atkins
6788e676ea remove now redundant commented out map layers - OSM tiles are now in a plugin 2013-05-23 05:50:44 +01:00
Jon Atkins
cd59eb0ece add blank map layer - for #220 2013-05-23 05:44:01 +01:00
Jon Atkins
f428e3037c base map plugins 
- openstreetmap - not suitable for high load use, but an optional layer in an optional plugin should be ok for them
- thunderforest opencyclemap, etc - free for use, no api key or notification required
 2013-05-23 05:31:46 +01:00