Commit Graph

2585 Commits

Author SHA1 Message Date
Guangcong Luo
78f0a0bfbe Merge pull request #542 from MasterFloat/patch-3
menugroup button - disabled state color change
2015-11-05 05:22:25 -06:00
MasterFloat
a6291fe315 menugroup button - disabled state color change
When you looks for a battle you get this grey color which doesn't really suite the red button: http://prntscr.com/8z9e9g
So I changed it to the border's color (a bit darker): http://prntscr.com/8z9hx4
2015-11-05 12:00:41 +01:00
Guangcong Luo
fefc779c04 Merge pull request #541 from augmt/patch-1
Pass roomid when adding TeamPopup from TournamentBox
2015-11-05 04:08:39 -06:00
Guangcong Luo
395f7676f4 Sanitizer: target="_blank" only on <a> and <form> tags
This is mostly just to make sanitized HTML more readable.
2015-11-05 03:47:17 -05:00
Guangcong Luo
5dfce38dd1 Drop outdated <a room="roomid"> syntax
We now automatically handle room links using <a href="/roomid">.

In fact, the handling is currently done using a global click
handler, the same one in client.js that handles external links for
the desktop client, so it's like extra fancy.
2015-11-05 03:34:31 -05:00
Guangcong Luo
44526f7863 Move toggleFormatChar from Tools to ConsoleRoom
The name is a bit unfortunate, but Tools is specifically for data
access for game stats/mechanics and other things relevant to
battles, it's not supposed to be a generic place to stick
miscellaneous functions.
2015-11-05 03:29:42 -05:00
Guangcong Luo
f8e89a7ce3 Remove some outdated comments 2015-11-05 03:21:34 -05:00
Guangcong Luo
ccdd3fbf96 Fix minor error when Referer header not sent 2015-11-05 03:21:26 -05:00
Hector Garcia
0b8e862506 Pass roomid when adding TeamPopup from TournamentBox 2015-11-05 06:30:16 +00:00
Guangcong Luo
53dc1a1f71 Sync data 2015-11-04 22:34:10 -05:00
Guangcong Luo
68352742be Teambuilder: Support importing packed teams
Packed teams are not currently considered an officially supported
team format, but since they're now stored in localStorage for
long-term, we'll need to support them long-term, anyway.

This is currently mostly for debugging purposes.
2015-11-04 22:34:10 -05:00
Guangcong Luo
f6f929efe0 Merge pull request #539 from Layell/gsc_bgs
Gen 1/2 bg update
2015-11-04 03:19:02 -06:00
Layell
1cd72de452 Gen 1/2 bg update 2015-11-04 03:22:00 -05:00
Guangcong Luo
122dbeb426 Merge pull request #536 from urkerab/tooltip-flip
Flip tooltips that don't fit above the element
2015-11-03 19:41:49 -06:00
Guangcong Luo
4bec670a85 Merge pull request #538 from MonoHearted/patch-1
Add a duplicate check for highlights
2015-11-03 19:41:02 -06:00
MonoHearted
2281cee252 Add a duplicate check for highlights
Removes the possibility of adding duplicate highlights to your list.
2015-11-03 14:36:22 -08:00
Guangcong Luo
8221975989 Sync data 2015-11-03 16:50:24 -05:00
Guangcong Luo
8302b3dcdb Merge pull request #537 from urkerab/right-battle-tooltip-limit
Use correct tooltip limit for right hand battles
2015-11-03 14:47:55 -06:00
urkerab
8bcfea6561 Use correct tooltip limit for right hand battles 2015-11-03 12:15:52 +00:00
urkerab
a14277365e Flip tooltips that don't fit above the element 2015-11-03 12:00:30 +00:00
Guangcong Luo
ddc87a2d1d Merge pull request #531 from urkerab/replay-user-track
Don't track users in replays
2015-11-02 04:57:10 -06:00
Guangcong Luo
1e6b4c989a Merge pull request #535 from urkerab/duplicate-challenge-notifications
Prevent duplicate challenge notifications
2015-11-02 04:56:46 -06:00
urkerab
900fe9b107 Prevent duplicate challenge notifications 2015-11-02 10:41:39 +00:00
urkerab
d0a1969fa9 Don't track users in replays 2015-11-02 10:37:53 +00:00
Guangcong Luo
24bc13d037 Revert "Adjust the top of the tooltip to fit in the window"
This reverts commit 1114cb3e6c.
2015-11-01 18:36:17 -05:00
Ivo Julca
897b4ed115 Use the move target sent by the server
Refs #354
2015-11-01 13:14:23 -05:00
Guangcong Luo
7efebdc50f Merge pull request #518 from augmt/update-teams
Update teams on deletions, undeletions, and drops
2015-10-31 20:14:18 -05:00
Hector Garcia
4c3df24c69 Adjust curTeamIndex for each room accordingly
Rooms with `button.teamselect` present have their `curTeamIndex`
adjusted on various Teambuilder operations
2015-10-31 14:31:24 +00:00
Hector Garcia
dd5a68967a Keep track of current team index in TournamentBox 2015-10-31 14:31:14 +00:00
Guangcong Luo
380c8b031e Merge pull request #530 from urkerab/faint-remove-elem
Always remove the element when a sprite faints
2015-10-31 03:02:54 -05:00
Hector Garcia
2573f85921 Update teams on deletions, undeletions, and drops 2015-10-31 07:32:49 +00:00
Quinton Lee
e4e7dc48b8 Fix item effect display in tooltip 2015-10-31 01:54:24 -05:00
Guangcong Luo
3108209c68 Merge pull request #527 from urkerab/battle-tab-complete
Allow tab completion to work in battles
2015-10-30 22:59:42 -05:00
urkerab
1c90fc6853 Always remove the element when a sprite faints 2015-10-31 00:50:52 +00:00
Guangcong Luo
bfa04628a6 Merge pull request #528 from sirDonovan/tourbracket
Tournaments: support showing users who have joined
2015-10-30 17:36:44 -05:00
sirDonovan
52cf873619 Tournaments: support showing users who have joined
During signups in elimination tournaments, show the number of users who
have joined in place of the empty bracket
2015-10-30 17:21:23 -05:00
urkerab
457bf20f16 Allow tab completion to work in battles 2015-10-30 13:58:34 +00:00
Guangcong Luo
2b4393921a Merge pull request #524 from urkerab/tooltip-previous-item
Track the previous item in the battle tooltip
2015-10-29 16:32:49 -05:00
urkerab
e23f284043 Track the previous item in the battle tooltip 2015-10-29 17:58:54 +00:00
Guangcong Luo
3533bc9ac2 Merge pull request #515 from urkerab/tour-elimination-highlight-user
Highlight the current user in elimination tournaments
2015-10-28 19:38:49 -05:00
Marty-D
5c7bdfd098 Correct Gen 6 Mud Sport start message 2015-10-28 17:55:40 -04:00
Guangcong Luo
8a4ed3fbe5 Merge pull request #525 from urkerab/tooltip-top-adjustment
Adjust the top of the tooltip to fit in the window
2015-10-28 15:00:14 -05:00
Guangcong Luo
464e4fc16c Merge pull request #523 from forsureitsme/patch-1
Fix Team Import/Export barely visible > 640px width
2015-10-28 14:41:35 -05:00
urkerab
1114cb3e6c Adjust the top of the tooltip to fit in the window 2015-10-28 17:54:06 +00:00
Pedro Cardoso da Silva
685ddab60e Fix Team Import/Export barely visible > 640px width
Yeah, you could still drag the resizer down, but this make it less worse.
2015-10-28 10:04:18 -02:00
Guangcong Luo
ca40dd0b86 Merge pull request #522 from urkerab/tooltip-item-consumed
Show items that have been consumed
2015-10-27 20:32:41 -05:00
urkerab
dc09b46382 Show items that have been consumed 2015-10-28 00:46:32 +00:00
Marty-D
74ca49920c Remove unused Speed Boost message 2015-10-27 16:03:46 -04:00
Marty-D
560de1ec56 Add Power Herb message 2015-10-27 11:16:23 -04:00
Guangcong Luo
03293249b6 Merge pull request #519 from urkerab/team-preview-switch-sides-sound
Keep sound playing when switching sides during team preview
2015-10-27 02:34:44 -05:00