V4Victini
c81bb0e5ab
Add Electrify and Ion Deluge messages
2013-12-14 12:32:03 -05:00
Guangcong Luo
9b0e40a0aa
Merge pull request #95 from Slayer95/patch-1
...
Actually fix CAP teambuilder
2013-12-11 13:00:24 -08:00
Slayer95
84913e1815
Actually fix CAP teambuilder
...
Had miscounted the length of "cap"...
2013-12-11 15:58:45 -05:00
Guangcong Luo
6d8a817bdd
Merge pull request #94 from Slayer95/patch-1
...
Fix CAP not having legal moves in Teambuilder
2013-12-11 12:53:03 -08:00
Slayer95
85bcee40f7
Fix CAP not having legal moves in Teambuilder
2013-12-11 15:48:40 -05:00
Guangcong Luo
d76f1bff4d
Merge pull request #93 from Layell/patch-8
...
Animation Update Dec 10
2013-12-10 13:03:33 -08:00
Layell
0ad4b97eb2
Animation Update Dec 10
...
To be added with Dec 10 Sprite Patch.
2013-12-10 15:51:08 -05:00
Guangcong Luo
70e0eeddd5
Merge pull request #91 from kotarou3/tournaments
...
Fix a vulnerability in not correctly sanatising an HTML parameter (in tournaments)
2013-12-08 23:46:49 -08:00
小太
1a82357a95
Fix a vulnerability in not correctly sanatising an HTML parameter
2013-12-09 18:42:58 +11:00
Guangcong Luo
6022eb50cc
Merge pull request #90 from kotarou3/tournaments
...
Fix injection vulnerability in tournaments
2013-12-08 23:37:56 -08:00
小太
1e61d88116
Fix injection vulnerability
...
From the incorrect assumption that BattleFormats was sanatised
2013-12-09 18:23:48 +11:00
Guangcong Luo
c95ca6ec57
Merge pull request #88 from kotarou3/tournaments
...
Tournaments
2013-12-08 23:13:24 -08: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
Guangcong Luo
be30f0471b
Merge pull request #89 from Layell/patch-7
...
Animation Update Dec 08
2013-12-08 19:52:02 -08:00
Layell
90ac942ef2
Animation Update Dec 08
...
To be updated with Dec 08 sprite updated.
2013-12-08 22:48:06 -05: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
Guangcong Luo
3c902dace0
Sync learnsets
2013-12-07 20:25:39 -06:00
The Immortal
c52674faed
Change Sticky Web -start to -activate
...
-start adds a volatile
2013-12-06 14:01:16 +04:00
Guangcong Luo
b15c097e45
Fairy move-button colors
2013-12-06 03:35:27 -06:00
Guangcong Luo
9c3ad9e3d0
Support any megas in replayer
2013-12-06 03:26:58 -06:00
Guangcong Luo
cba29fcbab
Sync gen 6 data
2013-12-06 03:26:58 -06:00
Guangcong Luo
97fae302be
Merge pull request #87 from Slayer95/master
...
Desktop app: properly save teams to alternate paths
2013-12-05 14:17:22 -08:00
Slayer95
3db4ca69d6
Desktop app: properly save teams to alternate paths
...
If the Documents folder was unexistent, Storage would not work at all
2013-12-05 16:22:25 -05:00
Guangcong Luo
4dc5d34963
Merge pull request #86 from V4Victini/patch-15
...
Animation message for Geomancy
2013-12-05 11:13:47 -08:00
V4Victini
6d5a05cd25
Animation message for Geomancy
...
and a placeholder charging animation.
2013-12-05 06:58:00 -05:00
The Immortal
453cbc75ef
Merge pull request #85 from V4Victini/patch-14
...
Activation message for Infestation
2013-12-05 03:16:25 -08:00
V4Victini
5527618e53
Activation message for Infestation
2013-12-05 06:05:59 -05:00
The Immortal
6a4cd2f7da
Add Sticky Web messages
2013-12-05 12:59:06 +04: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
