Commit Graph

1761 Commits

Author SHA1 Message Date
Guangcong Luo
cc6d441d15 Fix [NaN:NaN:NaN] timestamp bug
Bug from 5196f8cbcb
2014-09-18 22:57:30 -05:00
Guangcong Luo
e5e8d3d573 Sync data 2014-09-18 22:35:42 -05:00
Guangcong Luo
723803b57f Console log all SockJS I/O
Previously, we only logged non-lobby server->client messages,
but since lobby is no longer on default autojoin, it makes
sense to just log everything. Useful to anyone who wants to
learn more about how PS's protocol works.
2014-09-18 22:32:52 -05:00
Guangcong Luo
626a2eef2d Update teambuilder for PU 2014-09-18 22:32:51 -05:00
Guangcong Luo
f2e6c2db16 Minor rephrase of Username popup 2014-09-18 22:31:19 -05:00
Guangcong Luo
d0f29abeab Tournaments: Support user cap 2014-09-18 22:31:19 -05:00
Guangcong Luo
c4b8caba59 Merge pull request #201 from Morfent/patch-2
Allow regex quantifiers with commas in highlights
2014-09-09 13:47:56 -05:00
Guangcong Luo
4a00930a38 Fix Shell Bell message 2014-09-04 12:50:00 -05:00
Guangcong Luo
bc22aad75f Merge pull request #243 from Slayer95/lint
Fix issues with semicolons and variable declaration
2014-09-04 00:55:42 -05:00
Ivo Julca
5196f8cbcb Fix issues with semicolons and variable declaration
Also remove duplicate of method 'joinRoom' from MainMenuRoom, as well as unused methods 'updateCurrentUser' and 'buttonOnClick' from UserList.
2014-09-03 23:28:18 -05:00
V4Victini
563b1e4864 Revert "Fix Team Preview details being ignored on reconnection"
This reverts commit 54fba6e985.
2014-09-03 20:00:01 -04:00
The Immortal
a377625d79 Update client-teambuilder.js
Hackmons doesn't exist so remove illegal from BH instead
2014-09-04 02:27:03 +04:00
The Immortal
45be30a721 Add PU to teambuilder 2014-09-02 19:35:29 +04:00
Guangcong Luo
9e02658bea Show Spe ranges for enemy pokemon on hover 2014-08-31 23:09:03 -05:00
Guangcong Luo
768d46bb93 Main Menu and Rematch buttons
Gives players a more obvious path to what to do next after a battle
ends.
2014-08-31 23:08:37 -05:00
Guangcong Luo
75b5553616 Battle remember names after disconnection
This is useful for getting the name of a player who's disconnected,
which will be used in future commits.
2014-08-31 23:01:54 -05:00
Guangcong Luo
9414b6a987 Remove old hardcoded sprite IDs
They haven't been used for anything in a long time.
2014-08-31 22:51:59 -05:00
Robin Vandenbrande
f7eeda46ae Merge pull request #242 from Quinella/hooks
Fix path issues with update hook
2014-09-01 02:12:51 +02:00
Robin Vandenbrande
414bef6525 Fix path issues with update hook 2014-09-01 02:11:36 +02:00
Robin Vandenbrande
72fc3464e3 Merge pull request #241 from Quinella/tb-pokemon-importexport
Import/export on a per Pokemon basis
2014-08-30 00:52:16 +02:00
Robin Vandenbrande
154c50d1be Import/export on a per Pokemon basis 2014-08-29 13:24:26 +02:00
Guangcong Luo
005cfc3a8e Merge pull request #240 from Quinella/femalesprites
Fix female sprites when animations are disabled
2014-08-28 18:17:55 -05:00
Robin Vandenbrande
60f75f89fa Fix female sprites when animations are disabled 2014-08-28 22:51:42 +02:00
Robin Vandenbrande
89b15073ab Merge pull request #239 from Quinella/hooks
Have git hooks use node.js rather than PHP
2014-08-28 21:14:32 +02:00
Robin Vandenbrande
2cf20ff643 Have git hooks use node.js rather than PHP
Also remove the dynamic hook since it's unused
2014-08-28 20:30:04 +02:00
Guangcong Luo
30f3003155 Sync tiers 2014-08-25 02:18:56 -05:00
Guangcong Luo
668c4c4b26 Support user symbols in battle rooms
Battle rooms and chat rooms now use roughly the same chat system.
2014-08-25 02:18:56 -05:00
Guangcong Luo
05ae8ea6fb Support new |:| and |c:| messages
These message types are used to send message times, replacing the
old |ct| system, and are more efficient server-side.
2014-08-25 02:18:56 -05:00
The Immortal
d33c71836b Hackmons is now called Classic Hackmons 2014-08-24 12:13:24 +04:00
The Immortal
9f03bd49a7 Restore EV spread for Hackmons 2014-08-23 13:18:55 +04:00
Guangcong Luo
11f4b3dcbb Fix crash in teambuilder 2014-08-21 19:15:11 -05:00
Guangcong Luo
1f6bea9579 Fix teams not loading on desktop 2014-08-19 17:50:25 -05:00
Slayer95
54fba6e985 Fix Team Preview details being ignored on reconnection 2014-08-19 11:04:54 -05:00
Guangcong Luo
72a724fe7b Merge pull request #237 from Slayer95/hackmons
Remove illegal EV spread suggestion for Hackmons
2014-08-18 15:34:28 -05:00
Slayer95
c193491370 Remove illegal EV spread suggestion in Hackmons
The format 'Modified Hackmons' will feature it instead.
2014-08-18 14:44:05 -05:00
Guangcong Luo
6a3f6f9c3d Merge pull request #236 from Layell/patch-1
Update pokedex-mini-bw.js
2014-08-14 17:03:56 -05:00
Layell
f98f779639 Update pokedex-mini-bw.js 2014-08-14 17:09:04 -04:00
The Immortal
bbe277e0c8 Merge pull request #235 from Layell/patch-1
pokedex mini vivillon back fix
2014-08-14 10:33:29 +04:00
Layell
b7cd114049 pokedex mini vivillon back fix
Size was improper, was likely due to forme difference.
2014-08-14 01:14:18 -04:00
Guangcong Luo
f61e1a1539 Sync formats 2014-08-10 04:00:24 -05:00
Guangcong Luo
09b0ae1862 Merge pull request #234 from Quinella/bwgfx
BW animated sprites option
2014-08-10 00:06:04 -05:00
Robin Vandenbrande
7e5ceba041 BW animated sprites option
Also rename pokedex-mini-g5 to -bw for consistency purposes
2014-08-09 16:28:54 +02:00
V4Victini
284fb82bd5 Use id of room in joinRoomPrompt 2014-08-07 00:05:41 -04:00
Guangcong Luo
2e1b122580 Updates to downtime message 2014-08-04 01:27:33 -05:00
Guangcong Luo
eea8da305f Merge pull request #232 from sphericalice/patch-1
Add classes for /weakness command's labels
2014-07-31 19:38:08 -05:00
sphericalice
515b410f75 Add classes for /weakness command's labels
This adds in style for the new labels for the /weakness command, so that "Weaknesses:" is coloured red (the same as the red for .message-learn-cannotlearn for consistency reasons), "Resistances" is coloured blue, and "Immunities" is coloured grey. This reflects the changes to the command made in this pull request: https://github.com/Zarel/Pokemon-Showdown/pull/1116
2014-08-01 01:36:07 +01:00
Guangcong Luo
c75eb80e0b Merge pull request #229 from Quinella/warn
Make rules window show when not in lobby when warned
2014-07-28 13:50:52 -05:00
Robin Vandenbrande
3a2bc9efb7 Make rules window show when not in lobby when warned 2014-07-28 20:41:39 +02:00
Guangcong Luo
ce178c262d Merge pull request #227 from Quinella/popup
Add 'app.addPopupPrompt()' for a more beautiful prompt() alternative
2014-07-25 19:35:47 -05:00
Robin Vandenbrande
e1040fe0aa Add 'app.addPopupPrompt()' for a more beautiful prompt() alternative
Also changed all current prompt()'s to the alternative
2014-07-26 01:49:51 +02:00