Fix merge #7
Merged
Fix merge #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
updated windows link for nodejs, was 4.4.7 move to 4.5.0
Reorganizing to keep docs in docs
Same issue/fix as #873, this time affecting the stats side bar instead of the menu bar
Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements #1237
* Decrease step size * Check the type of DB
…770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable.
* On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service
* [Fix] issue #622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection
Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first.
* Update pull request template * Changed checklist into a comment * Stupid markdown comments
* Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md
* Removed references to third party container * Changed references to container we control
…empty (#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty
* Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen
* Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors
It's groundbreaking. My valid html OCD is kicking in again :D
…pgrades (#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as #666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/
Thanks OurFlagIsMined :3
…r. (#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use #1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: