Skip to content

Sync Dev to Main#1159

Merged
Mygod merged 106 commits into
mainfrom
develop
Nov 24, 2025
Merged

Sync Dev to Main#1159
Mygod merged 106 commits into
mainfrom
develop

Conversation

@Mygod

@Mygod Mygod commented Nov 23, 2025

Copy link
Copy Markdown
Collaborator

No description provided.

Mygod and others added 30 commits September 24, 2025 15:54
Merge pull request #1135 from Mygod/persistent-popup
# [1.40.0-develop.1](v1.39.0...v1.40.0-develop.1) (2025-09-25)

### Features

* persistent popups ([5cd5be0](5cd5be0)), closes [#1135](#1135)
# [1.40.0-develop.2](v1.40.0-develop.1...v1.40.0-develop.2) (2025-09-25)

### Bug Fixes

* stationed pokemon maxHeight ([5c46dbd](5c46dbd)), closes [#1078](#1078)
# [1.40.0-develop.3](v1.40.0-develop.2...v1.40.0-develop.3) (2025-09-26)

### Bug Fixes

* better hoverability on shiny rate ([e29a68b](e29a68b))
# [1.40.0-develop.4](v1.40.0-develop.3...v1.40.0-develop.4) (2025-09-29)

### Features

* expired stations ([0521045](0521045))
# [1.40.0-develop.5](v1.40.0-develop.4...v1.40.0-develop.5) (2025-10-01)

### Bug Fixes

* always show end route count ([5226575](5226575))
* route badge color should be consistent with their roles ([0c32962](0c32962))
* self loop route counting ([e415caa](e415caa))

### Features

* configurable inactive station limit ([f8efbcd](f8efbcd))
# [1.40.0-develop.6](v1.40.0-develop.5...v1.40.0-develop.6) (2025-10-01)

### Features

* faster extraUserFields ([#1144](#1144)) ([2216787](2216787))
# [1.40.0-develop.7](v1.40.0-develop.6...v1.40.0-develop.7) (2025-10-02)

### Bug Fixes

* battle popup caching issue ([8cac1ce](8cac1ce))
# [1.40.0-develop.8](v1.40.0-develop.7...v1.40.0-develop.8) (2025-10-02)

### Bug Fixes

* gym range color should dynamically update ([7f9f95b](7f9f95b))
# [1.40.0-develop.9](v1.40.0-develop.8...v1.40.0-develop.9) (2025-10-03)

### Features

* max battle stats display ([211e0ea](211e0ea))
* quest bread mode ([b0fcf4f](b0fcf4f))
Mygod and others added 17 commits November 19, 2025 23:07
# [1.40.0-develop.26](v1.40.0-develop.25...v1.40.0-develop.26) (2025-11-20)

### Bug Fixes

* extra space around placed pokemon ([898e1e2](898e1e2))

### Features

* reworked placed pokemon in station popup ([252f327](252f327))
# [1.40.0-develop.27](v1.40.0-develop.26...v1.40.0-develop.27) (2025-11-20)

### Bug Fixes

* more robust translation fetching ([eaa2acf](eaa2acf))
# [1.40.0-develop.28](v1.40.0-develop.27...v1.40.0-develop.28) (2025-11-20)

### Bug Fixes

* alias support for cooldown ([73e8157](73e8157))

### Features

* cooldown bypass ([#1137](#1137)) ([9ceefef](9ceefef))
# [1.40.0-develop.29](v1.40.0-develop.28...v1.40.0-develop.29) (2025-11-20)

### Bug Fixes

* resetState respects server default ([e85f1e4](e85f1e4))
# [1.40.0-develop.30](v1.40.0-develop.29...v1.40.0-develop.30) (2025-11-23)

### Features

* (quest) pokemon background on map ([0676dd4](0676dd4))
# [1.40.0-develop.31](v1.40.0-develop.30...v1.40.0-develop.31) (2025-11-23)

### Bug Fixes

* fix AdvAccordion backgroundColor ([4061ee2](4061ee2))
# [1.40.0-develop.32](v1.40.0-develop.31...v1.40.0-develop.32) (2025-11-23)

### Features

* gym defender updates every second ([e99d020](e99d020))
@Mygod

Mygod commented Nov 23, 2025

Copy link
Copy Markdown
Collaborator Author

@codex review

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR syncs the development branch to main, introducing significant new features and improvements to the ReactMap application. The changes include a new tappables feature, Pokemon background visuals, manual popup tracking for better UX, improved station battle information, route loop detection, and various UI/UX enhancements.

Key Changes:

  • Added complete tappables feature with GraphQL queries, models, tile rendering, and popup support
  • Implemented Pokemon background card visuals with location card metadata
  • Enhanced manual popup tracking to keep markers visible when opened via notifications or search
  • Improved station battle CP estimation and inactive station handling
  • Added route loop detection to prevent duplicate markers
  • Updated dependencies (Vite 6.3.6→6.4.1, js-yaml 4.1.0→4.1.1, uicons.js 2.0.3→2.2.0)

Reviewed changes

Copilot reviewed 123 out of 128 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
yarn.lock Dependency updates for js-yaml, uicons.js, and vite
vite.config.js Version handling for development mode
src/utils/*.js New utilities for S2 polygons, form display, category normalization, and improved offset calculation
src/utils/resetState.js Enhanced to use config defaults for settings reset
src/features/tappable/* Complete new feature for tappable items (markers, popups, queries)
src/features/pokemon/* Background visual support and improved offset handling with S2 cells
src/features/station/* Battle CP estimation, inactive station display, improved timers
src/features/route/* Loop detection to prevent duplicate markers
src/hooks/* New hooks for background visuals, manual popup tracking, form display
src/components/popups/* New BackgroundCard component for themed backgrounds
src/store/* Added tappables category throughout state management
src/services/queries/* New tappable queries and added background/bread_mode fields
server/src/models/* New Tappable model, enhanced Station with CP estimation
server/src/utils/* New manual filter utility, scanner cooldown bypass, improved permission merging
server/src/services/* Shared PvP wrapper instance, improved shutdown handling
src/assets/css/main.css New CSS for tappable markers and improved pokestop marker stacking

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread server/src/models/Station.js
Comment thread server/src/models/Station.js
@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Mygod and others added 4 commits November 23, 2025 11:21
@Mygod Mygod merged commit b4e8fdd into main Nov 24, 2025
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 1.40.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants