Skip to content

December 4, 2025: Merge with PS #53

Closed
Rezzo64 wants to merge 519 commits intoscoopapa:mainfrom
Rezzo64:main
Closed

December 4, 2025: Merge with PS #53
Rezzo64 wants to merge 519 commits intoscoopapa:mainfrom
Rezzo64:main

Conversation

@Rezzo64
Copy link
Collaborator

@Rezzo64 Rezzo64 commented Dec 4, 2025

No description provided.

ISenseAura and others added 30 commits April 15, 2025 01:13
Missing features:
- Popping out brackets
- Showing the bracket after the tournament ends
- Disable validate button for random teams

New and improved:
- Hover effect on tournament bar (also backported to 2013 client)
- Slightly better animations for expanding/collapsing tours
- Better scrolling around a bracket
  - "Grab" cursor
  - Selecting text is no longer completely banned (although it's still
    hard to do on desktop because of the whole drag scrolling thing)
  - Completely native scrolling on mobile
  - Scroll bars appear as normal, and regular methods of scrolling like
    arrow keys and scroll wheel also work as normal
This is a pretty major redesign that makes our brackets look way more
like other modern tour bracket visualizations out there.

In particular, nodes now have two boxes instead of one, making it
much more straightforward to tell who won. This also makes the trees
much more compact, so they take up much less vertical and horizontal
space.

Font size has been bumped up for much better readability, and colors
are now used more meaningfully.

Tournaments also now show a summary bracket when they end, so there's
no huge full bracket filling up the screen.
Minor
- Refactor placeholder room handling to fix a heisenbug crash while
  starting up
- Add `room.getParent()` (accidentally partly folded into previous
  commit)
- Support using the console without logging in
- Fix mobile support for https://pokemonshowdown.com/intro

Trivial
- Improve doc comments
Nothing major, but we no longer need `plugin-proposal-class-properties`.
Minor
- Fix crashes/bugs in backported elim tournament redesign
- Support opting into Preact client via cookie
- Fix popup positioning when parent element is unmounted (i.e. when you
  switch layouts in the Options menu)

Trivial
- Focus Main Menu and not Rooms when loading home page in single panel
  mode
- Correctly set user.registered
  ( Fixes smogon/pokemon-showdown#11031 )
- Fix some text in the Options menu
Minor
- Unhide right panel when choosing "Two panels" layout option
- Refactor focusing
  - Correctly focus next room when closing currently active room
  - Correctly focus room when joining new room
- Use strict mode on all compiled files
- Fix router when started on `/` (it previously required starting on a
  non-empty room ID, which wasn't noticeable back when the URL needed
  to be `/preactalpha`)
- Update teambuilder sidebar CSS, to make it easier to add regular text
  - This is mainly for the "Tournaments" button in the main menu,
    which shares the CSS
- Fix new tournament elim tree text in Safari
- Update new tournament elim tree highlighted links to reliably
  link every still-playing game
- Remove latest gen from format name displays everywhere
  - Previously, they would only be removed from the format dropdown,
    but now they're also gone from the Ladder tab, battle tabs, and
    `/rank`
- Support async d3 loading
  - This allows chatrooms to be loaded way before all our dependencies
    are fully downloaded
- Remove "[Gen 9]" from format names everywhere (previously it was only
  removed from the format dropdown)
  - Also add "[Gen 6]" to unlabeled formats in `/rank` (Gen 6 was the
    last time we didn't have format generation as part of format names)

Trivial
- Stricter JSX linting
  - (unfortunately, most of the JSX style enforcement I actually want
    isn't possible in @Stylistic)
- Make room.subscribeTo's second parameter optional
- Rearrange and comment loading order
- Rename hiddenInit -> focusNextUpdate (clarity)
- Rename PSMain -> PSView (clarity)
- Fix button spacing in Change Password
- Add `touch-action: manipulation` to <a> tags
- Refactor `nodeSize` in elim tour trees
Minor
- Fix "[Gen 6]" appearing in wrong places for the last time
- Fix a bunch of bugs in back/forward history
- Support short links (`news` can't be supported because it conflicts
  with the mini-window)
- Support `no-panel-intercept`
- Fix Z-move alignment
- Speed up loading by not using SockJS in newer browsers
- Fix backgrounds
  - Uploads required pressing Done, but it's supposed to be a close
    button
  - Random backgrounds weren't working
- Support ctrl+clicking and shift+clicking links
- Adjust main menu padding
  - Mini windows are now 20px wider
- Fix mini-window minimize buttons in Safari
- Add a maximize button to mini windows
- Stop special-casing News mini-window CSS
- Support mini-windows in vertical tab mode
  - PMs still default to being full tab, but News is now a mini-window
    on screens of any size, because the full tab is actually pretty
    unergonomic
- Fix highlight notification room in chat rooms
  - This is also refactored to be better code now
- Fix tab overflow
  - Give 180px space for userbar instead of 165px
  - Fix calculation of when to overflow
  - Improve tab list design
  - Add checkbox to switch to vertical tabs
- Fix race condition leading to connection failure

Trivial
- Options is now a semimodal
- Fix crash in load tracker
- Remove unused `update = forceUpdate` code in Popups
- Use the redesigned dark mode popups from the design refresh #2175
Apparently this was broken in the loginserver refactor because we all
forgot it existed...
sugar700 and others added 13 commits October 31, 2025 02:14
sugar (previously xfix) has ultimately decided on the name Luna, rather
than previously listed name.
---------

Co-authored-by: Guangcong Luo <guangcongluo@gmail.com>
Most of these were found by andrebastosdias (thanks!)

Teambuilder
- SpA/SpD columns weren't appearing in gen 2
- buggy behavior with EVs in gen 1-2 or Let's Go
- save teams after doing things (Fixes #2493)
- import old box syntax

UI
- layout breaking when resizing
Thanks to Rektile404 for reporting this bug!

https://github.com/rektile
Untested, but I think it’s pretty obvious that this is why the optimizer isn’t changing nature currently when applied. The function above is basically the same function, but with this extra line.
Fixes the thing where, after reconnecting, DMs still looked
disconnected.
@Rezzo64 Rezzo64 changed the title December 44, 2025: Merge with PS December 4, 2025: Merge with PS Dec 4, 2025
@Rezzo64
Copy link
Collaborator Author

Rezzo64 commented Dec 9, 2025

This merge is such a dumpster fire, I'll come back to it when I have more time

@Rezzo64
Copy link
Collaborator Author

Rezzo64 commented Mar 8, 2026

We're not doing this, closing

@Rezzo64 Rezzo64 closed this Mar 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.