Commit Graph

1379 Commits

Author SHA1 Message Date
Guangcong Luo
95f2b90d9a Work around teambuilder virus issue
There's a virus floating around that's causing teambuilder not to work
for many users. Further investigation shows that it deletes the tenth
byte before the utilichart.js include, changing a </script> into
</sript> and preventing the utilichart.js include from working.

This change prevents the virus from interfering with utilichart.js,
and also makes it possible to detect the virus. We currently don't
do anything after detecting it, though.
2014-01-03 22:45:43 -06:00
The Immortal
925df76a8d Add Happy Hour and Celebrate messages 2014-01-03 13:47:14 +04:00
Guangcong Luo
256bcf5457 Sync gen 6 data 2014-01-02 23:31:03 -06:00
Guangcong Luo
140e2db291 Merge pull request #112 from Layell/patch-16
Swirlix add animation
2014-01-02 15:11:26 -08:00
Layell
67a4e8a096 Swirlix add animation
Adding now that graphical glitch was fixed in latest sprite update.
2014-01-02 18:09:22 -05:00
Guangcong Luo
bbb1867b70 Merge pull request #111 from Layell/patch-15
Froakie animation restoration
2014-01-02 14:57:34 -08:00
Layell
49c4cfcfa7 Froakie animation restoration 2014-01-02 17:38:29 -05:00
Guangcong Luo
47dcd510bd Merge pull request #110 from Layell/patch-14
Froakie animation removal, Talonflame edit
2014-01-01 01:39:58 -08:00
Layell
5bbfb0ac32 Froakie animation removal, Talonflame edit
Froakie is appearing smaller than it should, see https://github.com/Zarel/Pokemon-Showdown-Client/blob/master/data/pokedex-mini.js

Talonfame size fixed
2014-01-01 00:54:55 -05:00
Guangcong Luo
e6c037e674 Merge pull request #108 from Layell/patch-13
Fix Spelling in pokedex-mini
2013-12-30 18:59:43 -08:00
Layell
6d052fa76b Fix Spelling in pokedex-mini 2013-12-30 21:59:05 -05:00
Guangcong Luo
d1d9c87e8b Merge pull request #107 from Layell/patch-12
Update pokedex-mini.js
2013-12-30 18:57:48 -08:00
Layell
798b30eeb8 Update pokedex-mini.js 2013-12-30 21:57:04 -05:00
Guangcong Luo
894b96eb45 Merge pull request #105 from kotarou3/tournaments
Some bugfixes for tournaments
2013-12-30 10:04:44 -08:00
小太
819dbcc6fa Fix bug where the tournament box doesn't disappear when the box is open and the tournament ends, but the user is in a different room 2013-12-31 02:22:04 +11:00
小太
de83dd14ce Fix team selection bug in tournaments
along with a more intuitive naming for team selection variables and classes
2013-12-31 00:48:26 +11:00
Guangcong Luo
52103a4157 Merge pull request #104 from kotarou3/tournaments
Update to the tournaments
2013-12-28 18:50:31 -08:00
Guangcong Luo
a063e7403f Merge pull request #103 from Slayer95/patch-1
Fix teambuilder false illegalities on moves search
2013-12-27 13:17:19 -08:00
Slayer95
f3bf4bc2e2 Fix typo 2013-12-27 16:15:35 -05:00
Slayer95
110653616e Fix teambuilder false illegalities on moves search 2013-12-27 15:21:51 -05:00
Guangcong Luo
5f8da954ac Fix syntax error in animations list 2013-12-27 01:54:22 -06:00
Guangcong Luo
602ee9a7ca Pokebank is now out 2013-12-27 01:48:35 -06:00
Guangcong Luo
c310a6837b Sync gen 6 data 2013-12-27 01:48:35 -06:00
小太
a20a59f94a Change client-tournament.js -> client-chat-tournament.js reference in client.css 2013-12-26 23:17:31 +11:00
小太
e2c9ede115 Add support for popping out the tournament bracket 2013-12-26 22:49:45 +11:00
Guangcong Luo
5788e8e703 Merge pull request #102 from Layell/patch-10
Animation Christmas update
2013-12-25 19:19:28 -08:00
Layell
a635d74008 Animation Christmas update 2013-12-25 22:19:03 -05:00
小太
db4d92cabc Show challenging as tournament status 2013-12-25 14:10:21 +11:00
小太
a72a4b7850 Minor reordering of some updates 2013-12-24 20:26:20 +11:00
小太
13581580b0 Remember to clear updates object when the tournament ends 2013-12-24 17:07:15 +11:00
小太
7abca6e893 Reduce amount of page updates per tournament update 2013-12-24 17:05:45 +11:00
小太
8b01f241ea Only use this.updates to check if there is an update; use this.info to access the actual information 2013-12-24 14:02:15 +11:00
小太
abd2b35457 Position the draggable element by it's right offset instead of it's left
...because when a battle room is opened, the left side moves but the right doesn't,
so we have to use the right side to keep the element in the same location.
2013-12-24 13:57:23 +11:00
The Immortal
94dad460b2 Update -hitcount message 2013-12-24 00:58:07 +04:00
小太
6ab557c86f Add a tournament status indicator 2013-12-22 17:24:13 +11:00
小太
5b4c769afe Minor refactoring of tournament box toggling code 2013-12-22 16:56:09 +11:00
小太
4b44cf1801 Only run updates sent by the server 2013-12-22 09:24:05 +11:00
小太
eb64bcfe33 Fix tournament box not disappearing if it was hidden when the tournament ends 2013-12-22 09:05:09 +11:00
小太
923216e184 Fix a ghost tournament header appearing when there are past tournament messages in the log 2013-12-22 08:56:28 +11:00
小太
f2d3388cf2 Automatically hide bracket if the user isn't in the tournament 2013-12-22 08:45:54 +11:00
小太
4b056b7416 Add toggle button to tournaments 2013-12-22 08:36:49 +11:00
The Immortal
1642233959 Merge pull request #100 from V4Victini/patch-18
Add Powder tag
2013-12-21 10:19:40 -08:00
V4Victini
e10574e07d Add Powder tag 2013-12-21 12:56:14 -05:00
Guangcong Luo
67a31bd2b8 Merge pull request #99 from Layell/patch-9
Animation Update Dec 19
2013-12-19 16:11:18 -08:00
Layell
6c562d8228 Animation Update Dec 19
To be updated with Dec 19 sprite update.
2013-12-19 17:47:01 -05:00
Guangcong Luo
8da30ea195 Allow seeing user list at low resolutions 2013-12-18 19:11:06 -06:00
Guangcong Luo
905745f614 Update search indexes 2013-12-18 19:11:06 -06:00
小太
40d68bb406 Only delete the old bracket after the new one is generated
to prevent it from "flashing"
2013-12-18 15:17:35 +11:00
Guangcong Luo
d57a9feb7a Merge pull request #98 from Slayer95/patch-1
Highlight notifications: display the room title
2013-12-16 21:01:34 -08:00
Slayer95
ac62058596 Highlight notifications: display the room title 2013-12-16 22:28:38 -05:00