Commit Graph

894 Commits

Author SHA1 Message Date
小太
b6deff3b9c Clamp the bracket position to inside the box, so it always is visible 2013-10-20 20:31:15 +11:00
The Immortal
36508c1475 Change Dream World to Hidden 2013-10-19 00:34:14 +04:00
Guangcong Luo
b4131cc739 Support for new gen 6 formes in replays 2013-10-13 21:42:10 -05:00
Guangcong Luo
1edc8749f0 Don't crash when loaded from inside a frame 2013-10-12 13:21:56 -05:00
Guangcong Luo
9e4b7929ab Support -invertboost for Topsy-turvy 2013-10-11 19:47:08 -05:00
Guangcong Luo
65a3e6b6b5 New formats-data and teambuilder changes 2013-10-11 17:03:16 -05:00
Guangcong Luo
b4b0820a97 Stub support for gen 6 2013-10-11 17:03:16 -05:00
Guangcong Luo
ef7db277f8 Add ocean background 2013-10-11 17:03:16 -05:00
Quinella
555555756f Removed requestNotifications from userdetails event of /challenge 2013-10-08 23:56:02 +02:00
Quinella
072fbec377 Behavior change of /challenge: removed lingering testing console.log 2013-10-08 23:43:29 +02:00
Quinella
d73f97d8f9 Changed the behavior of /challenge
/challenge now opens the challenge window instead of the user window (like /user does)

/challenge also accepts multiple parameters now: user, format, team
user is the name(id) of the user you want to challenge
format is the format you want. It gets changed to an id, so you can enter it in any way you want. For example: ou, ou no stealth rock, etc.
team is the name of the team you wish to use. It also gets changed to an id and stops at the first match (problem: multiple teams with the same name?)
Both the format and team parameters are optional
2013-10-08 23:34:47 +02:00
小太
6be79c6760 Fix parse error in http://pokemonshowdown.com/replay/ubers-55161015 2013-10-07 17:33:36 +11:00
Guangcong Luo
0b395ca236 Team export: 'Ability:' instead of 'Trait:'
PO will support this in their next release.
2013-10-06 13:56:58 -05:00
Guangcong Luo
ab5e6f1220 Team import: Support 'Ability:' as well as 'Trait:' 2013-10-06 13:56:58 -05:00
Guangcong Luo
63397a0562 Merge pull request #54 from Quinella/dogars
Dogars song fix
2013-10-06 09:49:28 -07:00
Quinella
e52634efe9 Dogars song fix so that it only plays when Dogars is on the field 2013-10-06 16:47:44 +02:00
Guangcong Luo
d03bea97af Rooms can now expire
Rooms send |expire| when they expire; this means that the room no
longer exists server-side but the client might want to leave the room
open.
2013-09-29 22:52:40 -05:00
Guangcong Luo
34c8607104 Change spoiler syntax
Now supports 'spoiler:' and 'spoilers:', requires the ':' so it
doesn't accidentally spoiler stuff, and the word 'spoiler' doesn't
have to be at the beginning of the line.
2013-09-29 21:32:44 -05:00
Guangcong Luo
0f4b365091 Setting to disable spoiler hiding 2013-09-29 21:15:22 -05:00
V4Victini
ccae8885bc Fix -ability parsing errors
Only Unnerve passes the side in args, so args[3] was undefined for every other ability.
2013-09-29 20:00:34 -04:00
Guangcong Luo
a48e096ebd Spoiler tag
You can now make spoilers by starting a sentence with 'spoiler:'
or 'spoiler'.
2013-09-29 17:54:20 -05:00
V4Victini
a27e420f22 Fix Unnerve's message 2013-09-28 17:06:32 -04:00
Quinella
a753f59a97 Dogars song fix 2013-09-27 10:37:34 +02:00
Quinella
fd4fdb5988 Fixes tabs so that it will show roomname instead of roomid on joining 2013-09-25 11:25:19 +02:00
Guangcong Luo
617d194478 Merge pull request #52 from Quinella/formats
Made format column index one-based
2013-09-23 11:30:42 -07:00
Quinella
5889f1680d Fixed default format column 2013-09-23 20:26:26 +02:00
Quinella
4e4c710740 Made format column index one-based 2013-09-23 20:21:30 +02:00
Guangcong Luo
0caf105732 New background: Horizon 2013-09-23 13:16:18 -05:00
Quinella
78f5247cdb Changed format column separator; prefixed by a comma 2013-09-23 19:26:46 +02:00
Quinella
51ecb2a6e6 Adds the possibility to put sections (of formats) in other columns by changing it serverside 2013-09-23 18:43:55 +02:00
Quinella
e94e2c27cf Renamed "persistent notifications" to "temporary notifications" 2013-09-22 23:00:20 +02:00
Quinella
44aceead8f Added a "persistent notifications" option.
Defaults to yes. If set to no, notifications will disappear automatically after 5 seconds.
The option will only be shown if window.Notification is available.
2013-09-22 22:47:55 +02:00
Quinella
7b26873667 Added |tc| and the like for the correct time in replays 2013-09-22 01:04:55 +02:00
Guangcong Luo
daaa6f3bfd Embed news into HTML for faster loading 2013-09-20 16:48:31 -05:00
Guangcong Luo
30490f23d7 Teambuilder: Fix deleting teams
Deleting teams now correctly updates the team list
2013-09-20 16:48:31 -05:00
Guangcong Luo
45e47c9d66 News popup 2013-09-20 16:48:31 -05:00
Guangcong Luo
a90404685d Desktop client: Make sure links open in browser 2013-09-20 16:48:31 -05:00
Quinella
e7dae9beab Fixes the teambuilder's number input's events
Only the keyup event was fired, which caused a bug where changes are not registered when the up/down buttons are clicked (in browsers that support the number input).
The keyup event still has to be fired for the sake of the browsers that haven't heard of the number input yet.
2013-09-20 23:26:00 +02:00
小太
4c7efed9c3 Update team location to match latest commits 2013-09-19 16:31:28 +10:00
小太
c88adb60c2 Merge remote-tracking branch 'upstream/master' into tournaments 2013-09-18 15:50:11 +10:00
Guangcong Luo
a171908cec Fix room links
Room links were broken by a mistake in the port number detection
commit.
2013-09-18 00:03:07 -05:00
Guangcong Luo
e47b56be18 Desktop client: Make really sure not to crash in fs callbacks 2013-09-17 21:55:43 -05:00
小太
2cbc7537e5 Add port number detection to automatic links 2013-09-17 23:22:12 +10:00
小太
13df833149 Do the last fix properly 2013-09-17 22:24:50 +10:00
小太
f0f953ba19 Fix minor display bug where incorrect links are highlighted 2013-09-17 21:12:28 +10:00
小太
4c13a800d2 Use a different library for rendering the tree and implement draggable brackets to support it 2013-09-17 20:14:17 +10:00
Guangcong Luo
fd46478a27 Desktop client: Fix intermittent crash after loading teams 2013-09-15 18:30:37 -05:00
Guangcong Luo
2c6775f5a6 Desktop client: Button to reload teams 2013-09-15 18:30:09 -05:00
Guangcong Luo
254135e620 Desktop client: Teams saved to files 2013-09-15 18:22:19 -05:00
Guangcong Luo
fc845d30d9 Desktop client: Teams saved to files 2013-09-15 18:18:03 -05:00
小太
074e712696 Fix finding the parent node, and give active edges a style change 2013-09-15 22:51:31 +10:00
小太
f1f607f547 Update to match specs 2013-09-15 19:00:24 +10:00
小太
1322025376 Add library required for previous commit 2013-09-15 15:37:16 +10:00
小太
ffcd67478e Add support for tree-type tournaments 2013-09-15 15:36:37 +10:00
Guangcong Luo
63ef9ca314 Desktop client: Support loading teams 2013-09-14 22:41:50 -05:00
Guangcong Luo
4c7eb9a3cd Move some team storage functionality to storage.js 2013-09-14 20:06:55 -05:00
Guangcong Luo
dd12515059 Fix display error with Aromatherapy in Doubles 2013-09-14 18:43:19 -05:00
小太
799d4c90ac Add notification when a new tournament is created, you have available challenges or are challenged 2013-09-13 22:37:21 +10:00
小太
c449f4ef73 Make sure to sanatise the tournament type 2013-09-13 22:16:09 +10:00
小太
a2aa4ac7d2 Automatically show tournament box when you can challenge/have challenges.
Also add functions to show/hide the box for above purpose
2013-09-13 22:12:41 +10:00
小太
dc79480f31 Merge remote-tracking branch 'upstream/master' into tournaments 2013-09-13 21:55:59 +10:00
V4Victini
bb776d8571 Use Minimum Speed IV for Hidden Power when needed 2013-09-09 02:48:44 -04:00
Guangcong Luo
1579eaa347 Add V4 to credits 2013-09-08 22:07:15 -05:00
Guangcong Luo
4fc0cfddf7 Add Quinella to credits 2013-09-08 21:18:23 -05:00
Quinella
6dd87308ee Removed for-loop and inserted them separately 2013-09-08 00:57:46 +02:00
Quinella
1227dbd1b0 Fixes PS issue 236; exact ability and item wasn't shown in doubles on second active 2013-09-07 12:56:57 +02:00
Joim
99fd72fd44 Update credits 2013-09-05 22:18:29 +02:00
Cathy J. Fitzpatrick
224a577929 Security: Fix five XSS vulnerabilities in battle.js
These vulnerabilities are more critical than usual because, for the
reasons given here,

  https://github.com/Zarel/Pokemon-Showdown-Client/issues/41

any XSS vulnerability is now a vector to execute arbitrary code and
completely take over users' computers.
2013-09-04 15:29:17 -05:00
Cathy J. Fitzpatrick
c6471c3443 Credits: Re-add missing link
The link to my website was accidentally removed in the recent
credits revision (@9384dacdd5172d934).
2013-09-04 15:26:59 -05:00
Cathy J. Fitzpatrick
50d07a6020 Connection: Fix alt port support when connecting over HTTPS
If the client fails to establish an HTTPS connection to the main server,
the page needs to be re-loaded over HTTP before attempting to connect
on an alternative port; otherwise, there will be mixed content
security errors.

I had actually implemented this feature in the old (pre-v0.90) client,
but I forgot to copy it into the new client when I implemented the
connection code.
2013-09-03 01:10:59 -05:00
Guangcong Luo
97b7bb53d4 Credits: Fix back to alphabetical order 2013-09-02 23:52:01 -05:00
Guangcong Luo
9384dacdd5 Credits: Create 'Retired Staff' section 2013-09-02 23:48:57 -05:00
Guangcong Luo
59fbdf37f4 Add Vtas to credits 2013-09-02 23:47:47 -05:00
Guangcong Luo
789411a76d Ensure roomid for logging is safe
In theory it should be safe before it gets to this point, but
we're being extra-careful since it involves the user's files.
2013-08-31 22:15:41 -05:00
Guangcong Luo
a34f30dc48 Desktop client chat logging now logs PMs too 2013-08-31 22:14:49 -05:00
Guangcong Luo
eee86662e1 Desktop client: 'log chat' in Options menu 2013-08-31 20:23:45 -05:00
Guangcong Luo
a399e19e28 Add timestamps to chat logs 2013-08-31 17:04:59 -05:00
Guangcong Luo
46de389961 Support client-side chat logging 2013-08-31 17:04:38 -05:00
Guangcong Luo
f414e8c346 Basic framework for client-side chat logging 2013-08-31 15:09:42 -05:00
Guangcong Luo
429fb88140 Notifications for desktop client 2013-08-30 01:23:12 -05:00
Guangcong Luo
9b6322a3a4 Detect when we're in node-webkit 2013-08-30 01:23:12 -05:00
Guangcong Luo
62e26bd69f Support different 'down' messages
We now have separate 'technical issues' and 'ddos' downtime messages.
2013-08-30 01:23:12 -05:00
Guangcong Luo
0941d03ca1 Make sure lodash is loaded correctly in node-webkit 2013-08-30 01:23:12 -05:00
小太
3c0e3b1a1e Merge remote-tracking branch 'upstream/master' into tournaments 2013-08-20 22:49:31 +10:00
小太
dfc2f301c7 Display final bracket at tournament end 2013-08-20 21:59:26 +10:00
小太
191237c2e3 Use the notice class for tournament messages 2013-08-20 20:29:59 +10:00
小太
4503e271fb Fix code not using tabs for indenting 2013-08-18 22:54:42 +10:00
小太
cf699c0494 Obliterate trailing whitespace 2013-08-18 22:48:11 +10:00
小太
64aa248ff8 Fix some cases where the tournament box didn't update properly 2013-08-18 20:57:21 +10:00
小太
bccc89c2e0 Fix runner up grammar 2013-08-18 20:14:09 +10:00
小太
a8dc8e2089 Add most remaining tournament messages 2013-08-18 19:34:38 +10:00
小太
b2b8b8280e Remove some unnessasary .join('|')s 2013-08-18 18:06:36 +10:00
小太
e3ef08de55 Hide the tournament toolbox if the tournament has started and the user is not in the tournament 2013-08-18 18:00:45 +10:00
Guangcong Luo
3b06c3d3d8 Update footer links
Smogon is now a footer link
2013-08-14 21:48:55 -05:00
小太
648f183122 Actually commit the tournament library 2013-08-10 19:22:16 +10:00
小太
a7e69c0810 Basic tournament support 2013-08-10 19:19:52 +10:00
Guangcong Luo
8beb563042 Correct capitalization/punctuation on imported pokemon 2013-07-31 17:40:07 -05:00
Guangcong Luo
11b00b1c2a Convert species to PS format when importing teams
This fixes the bug where imported teams would sometimes have icon
problems.
2013-07-31 17:33:39 -05:00
Guangcong Luo
f7badc0a44 Simplify usercount/battlecount code
The number of servers that support one but not the other is on the
order of zero.
2013-07-30 21:55:07 -05:00
Guangcong Luo
57f2bd57c3 Display user/battle count in roomjoin menu 2013-07-28 01:57:03 -05:00
Guangcong Luo
7498395ab8 You no longer need to be logged in to join chatrooms 2013-07-27 12:39:51 -05:00
Guangcong Luo
007c8ec1e0 Support initializing to a room other than lobby 2013-07-26 15:39:38 -05:00
Guangcong Luo
4af225997f Close button for roomjoin menu 2013-07-26 15:39:38 -05:00
Joimer
2f237eb80c Preparing client for triple battles: Team Preview
Edit the client so it acts correctly in triples and the team preview lets you choose three Pokémon.
2013-07-26 22:03:24 +02:00
Guangcong Luo
77876a3975 Support + button on all servers 2013-07-14 17:05:45 -05:00
Guangcong Luo
48520361cc Normal size for join room panel 2013-07-14 17:05:34 -05:00
Guangcong Luo
b0bb9ba07f More generalizable room join code 2013-07-13 16:25:12 -05:00
Guangcong Luo
d78fff6e15 More generic downtime message 2013-07-13 16:24:34 -05:00
Guangcong Luo
a58db30d39 Fix crash 2013-07-12 19:01:28 -05:00
Guangcong Luo
1fd488600e /ignore now affects PMs in lobby log 2013-07-12 15:36:30 -05:00
Guangcong Luo
3327263226 Voices can now be ignored 2013-07-12 15:36:30 -05:00
Marty-D
f6f453a5d4 Merge pull request #33 from Joimer/patch-5
Fix Perish Song volatile tag
2013-07-08 06:45:43 -07:00
The Immortal
7ec562a2b9 Ladder shows top 500 now 2013-07-08 03:37:22 -07:00
Marty-D
d74ac275c4 Confusion is Baton Passed. 2013-07-07 19:38:30 -04:00
Guangcong Luo
52de565905 Minor visual changes to room add page 2013-07-07 16:18:27 -05:00
Guangcong Luo
aab9e8a115 Type changes aren't Baton Passed 2013-07-07 16:18:27 -05:00
Joim
e4c2884f51 Fix Perish Song volatile tag
Fix Perish Song being shown more than once if the attack is repeated in subsequent turns.
2013-07-05 18:22:42 +02:00
Guangcong Luo
e978b4c47f New file for room list 2013-07-03 03:18:07 -05:00
Guangcong Luo
60ce7dc72f Support chat room lists
Currently hardcoded for the official server only.
2013-07-03 02:32:27 -05:00
Guangcong Luo
120beff911 The # rank is now Room Owner
Locked users are now represented by interrobang
2013-07-02 16:30:44 -05:00
Guangcong Luo
4611f07292 The staff room is always joined in background 2013-07-01 23:39:32 -05:00
Guangcong Luo
399964249a Fix userlist bugs when showjoins=true 2013-07-01 22:28:42 -05:00
Guangcong Luo
3f7678a1d4 Don't show error message for ban/lock in battles 2013-07-01 18:18:45 -05:00
Guangcong Luo
706097a442 Update rules 2013-06-27 22:27:45 -05:00
Guangcong Luo
a6968899f9 Support custom group symbols 2013-06-24 14:06:57 -05:00
Cathy J. Fitzpatrick
f46d1330ad Support markup in assertion errors 2013-06-22 02:38:22 -05:00
Cathy J. Fitzpatrick
77c6bac6a3 Links in sanitized HTML always have target="_blank" 2013-06-21 16:38:09 -05:00
Cathy J. Fitzpatrick
7598b31871 Fix XSS in room titles 2013-06-14 22:43:17 -05:00
Marty-D
2ef0e0748c Re-add Heal Block message. 2013-06-14 12:29:59 -04:00
Marty-D
e2dc9012ae Add 'nopp' message, fix 'flinch' message. 2013-06-12 12:27:14 -04:00
Marty-D
30cbd98f97 Fix blocking PMs with /ignore. 2013-06-10 20:47:33 -04:00
Cathy J. Fitzpatrick
5355b8ec8e Fix more XSS in battle.js 2013-06-08 14:13:08 -06:00
Cathy J. Fitzpatrick
7e47ac8fc7 Fix XSS in Skill Swap code 2013-06-08 04:24:29 -06:00
Marty-D
4b6b1cefeb Support Skill Swap displaying swapped Abilities. 2013-06-07 20:25:51 -04:00
Cathy J. Fitzpatrick
6b2f938d84 Fix accidental global 2013-06-07 01:57:48 -06:00
Cathy J. Fitzpatrick
c2dcaa21e1 Support |unlink| message 2013-06-07 01:24:14 -06:00
Guangcong Luo
9e29dfd8ed Update moderator discretion rule 2013-06-05 17:21:05 -05:00
Guangcong Luo
57691ce358 EV recommender: Prevent +/- same stat in nature 2013-06-05 17:13:23 -05:00
Guangcong Luo
c213b0de71 Pokedex: Workaround for searching for Psychic 2013-06-04 16:27:36 -05:00
Guangcong Luo
61709650ac Teambuilder: Fixes to EV recommender
+Spe is now the default nature for Scarf
2013-06-04 16:26:53 -05:00
Guangcong Luo
5f7b870fed Teambuilder: Fix EVs>252 bug in suggester 2013-06-04 13:04:07 -05:00
Guangcong Luo
4f0c7eb66f Utilichart layout tweaks 2013-06-04 12:52:54 -05:00
Guangcong Luo
2d2f6d760b Add Pokedex link to main menu 2013-06-04 12:52:17 -05:00
Cathy J. Fitzpatrick
e6bab11019 Add Register button in settings 2013-06-04 00:35:35 -06:00
Guangcong Luo
1e5b0df33e PP column for moves 2013-06-03 06:01:05 -05:00
Cathy J. Fitzpatrick
474e3ad4a0 Re-enable HTTPS URIs 2013-06-03 01:54:36 -05:00
Guangcong Luo
703de08105 Minor GUI tweaks 2013-06-02 21:52:41 -05:00
Cathy J. Fitzpatrick
2163057c2e Change port of main server to 8080 2013-06-02 21:51:32 -05:00
Guangcong Luo
aafd7546c1 Suppress any crashes from playing sounds 2013-06-02 21:50:44 -05:00
Guangcong Luo
ab806a6be4 Support |title| 2013-06-02 02:30:47 -05:00