Commit Graph

1304 Commits

Author SHA1 Message Date
小太
4b056b7416 Add toggle button to tournaments 2013-12-22 08:36:49 +11: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
小太
ab9d2cc59b Change to a more JSON-type update format 2013-12-11 18:13:41 +11:00
小太
1a82357a95 Fix a vulnerability in not correctly sanatising an HTML parameter 2013-12-09 18:42:58 +11:00
小太
1e61d88116 Fix injection vulnerability
From the incorrect assumption that BattleFormats was sanatised
2013-12-09 18:23:48 +11:00
小太
2cbc43d22d Only initialise the tournament box when a tournament packet is detected, rather than for every room 2013-12-09 16:38:50 +11:00
小太
59ccc575a9 Add a comment explaining the fallthrough in client-chat.js
And clean up a bit of trailing whitespace
2013-12-09 16:38:01 +11:00
小太
ef69e954c2 Rename client-tournament.js to client-chat-tournament.js 2013-12-09 16:16:11 +11:00
小太
8ec4a07c52 Add tournament includes to index.template.html 2013-12-09 12:00:48 +11:00
小太
4b08cc1f5c Restrict usage of Tournaments to TBT only (for now)
This is because this is still in alpha so the intended purpose of use for now is just for testing on TBT rather than releasing it for use on all servers.
2013-12-09 11:59:25 +11:00
小太
0812a41172 Merge remote-tracking branch 'upstream/master' into tournaments 2013-12-02 16:55:01 +11:00
The Immortal
874ccaec28 Sync data 2013-12-02 01:28:04 +04:00
Guangcong Luo
ae12fbbd09 Fix error in ladder rating calculation 2013-11-30 00:54:42 -06:00
Guangcong Luo
8237e25b93 Desktop client main menu links now open in browser 2013-11-30 00:54:42 -06:00
Guangcong Luo
77e8d12190 New replay uploading system 2013-11-30 00:54:42 -06:00
Guangcong Luo
ea2fc9f625 Fix horizontal scrollbar in Windows main menu 2013-11-30 00:54:42 -06:00
The Immortal
793b01912d Add Rage Powder message 2013-11-29 20:43:35 +04:00
Guangcong Luo
a2c160c220 Allow access outside of CloudFlare 2013-11-20 18:15:13 -06:00
Guangcong Luo
550071c0e1 Newest jQuery versions 2013-11-20 17:55:59 -06:00
Guangcong Luo
f00ac6fda0 Merge pull request #83 from V4Victini/patch-12
New types (type change) are now delimited by /
2013-11-20 13:29:24 -08:00
V4Victini
70f43c7a4b New types (type change) are now delimited by / 2013-11-20 16:28:30 -05:00
Guangcong Luo
5279d100bc Merge pull request #82 from V4Victini/patch-11
Properly display type changes
2013-11-20 10:21:13 -08:00
V4Victini
4d22fe006e Display type icons for each type in the hover panel 2013-11-20 11:01:52 -05:00
V4Victini
37cb0c9bd8 Properly display type changes
A Pokemon can have their type changed to be multiple types. This possible through usage of Reflect Type, Trick-or-Treat, or Forest's Curse.
2013-11-20 10:38:42 -05:00
The Immortal
0346c454c4 Merge pull request #75 from V4Victini/patch-8
Add 'trapped' status activation message
2013-11-20 01:25:05 -08:00
Guangcong Luo
7a595fd32e Merge pull request #81 from V4Victini/typechange
Add Trick-or-Treat and Forest's Curse messages
2013-11-18 22:35:18 -08:00
Guangcong Luo
f2cbaad0cc Merge pull request #80 from Layell/patch-6
Animation Update Nov 18
2013-11-18 22:32:12 -08:00
V4Victini
c4d13a83d7 Add Trick-or-Treat and Forest's Curse messages 2013-11-19 00:26:51 -05:00
Layell
72aeed80fc Animation Update Nov 18
To be merged with the Nov 18 Sprite Update
2013-11-18 23:21:51 -05:00
Guangcong Luo
486a19d211 Don't show Mega-evolution button after mega evolving 2013-11-17 22:46:05 -06:00
Guangcong Luo
f84aa03de8 Cawmodore minisprite 2013-11-17 22:46:05 -06:00
Guangcong Luo
7e2ccdad0c Sync gen 6 data 2013-11-17 22:46:05 -06:00
Guangcong Luo
11a0a09c72 Merge pull request #79 from V4Victini/patch-10
Give Stun Spore and Powder the Spore Animation
2013-11-16 20:34:07 -08:00
V4Victini
0be61f7758 Give Stun Spore and Powder the Spore Animation 2013-11-16 23:29:10 -05:00
The Immortal
e34a851a32 Merge pull request #78 from Layell/patch-5
Remove Swirlix Animation
2013-11-16 13:16:50 -08:00
Layell
4921c09a68 Remove Swirlix Animation
Is buggy, we were going to replace it anyways.
2013-11-16 16:15:28 -05:00
The Immortal
815084c1f5 Merge pull request #76 from V4Victini/patch-9
Add Powder messages
2013-11-16 01:13:48 -08:00
V4Victini
dc4182a130 No need for empty string 2013-11-16 04:12:33 -05:00
V4Victini
f23b58854d Just use é 2013-11-16 04:08:57 -05:00
V4Victini
a28573aa3b Add Powder messages 2013-11-16 02:19:16 -05:00
V4Victini
814cf7f06c Add 'trapped' status activation message 2013-11-15 03:11:32 -05:00
Guangcong Luo
c59fdc50f2 Sync gen 6 data 2013-11-14 22:54:42 -06:00
Guangcong Luo
3bc58d4f3c Merge pull request #74 from V4Victini/patch-7
Add Mat Block messages
2013-11-14 20:53:59 -08:00
V4Victini
d899a62eec Add Mat Block messages 2013-11-14 23:06:54 -05:00
Guangcong Luo
d649f80a02 Merge pull request #73 from V4Victini/patch-5
Remove outdated weather code
2013-11-14 14:45:56 -08:00
V4Victini
8737b22c98 Remove outdated weather code 2013-11-14 16:25:15 -05:00
小太
cf48b94fa3 Fix tournament bracket being unscrollable when it is updated when the user has another tab open 2013-11-13 18:32:38 +11:00
Guangcong Luo
46de7f09bd Updates to search code
Egg groups can now be searched
2013-11-12 16:28:06 -06:00
Guangcong Luo
031a272c3e Sync gen 6 data 2013-11-12 16:28:06 -06:00
Guangcong Luo
400d25f059 Merge pull request #72 from Quinella/friendlist-server
Friendlist: serverside client code (so that friends can be added etc.)
2013-11-12 14:26:02 -08:00