Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-01 07:10:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,633 Commits 34 Branches 0 Tags
f5a8bba54cff08f8a65b2c8aeb1910ff2afbade0
Commit Graph

2633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marty-D
f5a8bba54c Fix default heal messages 
And avoid repeating Ability names upon activation.
 2015-11-21 22:27:48 -05:00
Marty-D
4692234af3 Ignore boosted weather duration prior to Gen 4 
Weather Rocks don't exist, and are unusable even in Custom Games.
 2015-11-21 12:53:43 -05:00
Guangcong Luo
6d057e637a Move Change Password button 
It's now above Log Out instead of inline with it.

(In preparation for some changes to how Log Out works.)
 2015-11-19 06:56:06 -05:00
Guangcong Luo
f8ec5b9142 Redesign Mega Evolution checkbox 2015-11-19 06:55:22 -05:00
Guangcong Luo
52a81e2a25 Merge pull request #556 from bumbadadabum/uri 
Allow data URIs in <img> tags
 2015-11-19 00:00:14 +00:00
Bär Halberkamp
6ef09c14a3 Allow data URIs in <img> tags 2015-11-19 00:54:06 +01:00
Ivo Julca
33dd5259bb Fix highlights in focused rooms 
While they needn`t raise popups, they should still format the chat messages.
 2015-11-17 10:51:11 -05:00
Marty-D
dec3e8305e Add Illusion end message 2015-11-15 20:34:54 -05:00
Marty-D
37d767e2c1 Teambuilder: Default Gen 4 LC to level 5 2015-11-14 16:59:29 -05:00
The Immortal
cd454a2c40 Add PU suspect COIL 2015-11-15 00:52:37 +04:00
Guangcong Luo
bf15ac6876 Merge pull request #499 from Slayer95/notifications-tone-down 
Tone down excessive notifications
 2015-11-14 04:47:54 +00:00
Guangcong Luo
1b6c40fa4e Merge pull request #549 from urkerab/tooltip-pokemon-fainted 
Fix HP display for fainted Pokemon
 2015-11-13 21:50:36 +00:00
Guangcong Luo
fe33dcc514 Merge pull request #550 from urkerab/teambuilder-ignore-ev-limits-gen-1-2 
Teambuilder should ignore EV limits prior to Generation 3
 2015-11-13 21:50:07 +00:00
The Immortal
e6f5747838 Fix past gens teambuilder 
It selects the correct input for past gens now.

Gen 1: When you choose a Pokemon it goes to moves
Gen 2: When you choose an item it goes to moves.
 2015-11-13 22:48:23 +04:00
Guangcong Luo
3614714452 Merge pull request #552 from urkerab/teambuilder-drag-evs-lc 
Automatically drag EVs appropriately for LC
 2015-11-12 22:31:24 +00:00
urkerab
e440c276cf Guess EVs for Generations 1 and 2 2015-11-12 21:20:33 +00:00
urkerab
a52fa302df Teambuilder should ignore EV limits prior to Generation 3 2015-11-12 21:18:54 +00:00
Slayer95
9ff7a6a4b0 Merge pull request #551 from Layell/patch-1 
Stratagem dimension fix
 2015-11-12 11:41:04 -05:00
urkerab
15b32d4e97 Automatically drag EVs appropriately for LC 2015-11-12 16:15:52 +00:00
Layell
5e0ce223d1 Stratagem dimension fix 
From before at https://github.com/Zarel/Pokemon-Showdown-Client/pull/526#issuecomment-156150836
 2015-11-12 11:11:41 -05:00
urkerab
9394e33bfc Fix HP display for fainted Pokemon 2015-11-12 10:24:02 +00:00
Guangcong Luo
5e7f8780dc Merge pull request #548 from Joimer/mutilgen-teambuilder 
Past generation adaptation for the teambuilder
 2015-11-11 22:24:00 +00:00
Juanma Serrano
981fced511 Teambuilder: Filter Pokémon, moves, items, abilities by gen 
Do not show Pokémon, moves, abilities, or items from future generations in teams in formats of past generations.
Also fix indentation.
 2015-11-11 23:19:45 +01:00
Juanma Serrano
cabf8699f3 Teambuilder: Don't show ability and irrelevant stats on gens 1 and 2 
Hides the ability for gens 1 and 2.
Shows Spc (Special) instead of SpA and SpD for gen 1.
Hides item, happiness, shinyness for gen 1.
Shows proper EV count for gens 1 and 2.
 2015-11-11 19:47:21 +01:00
Juanma Serrano
cd3cfed675 Teambuilder: Store the generation of the current team 2015-11-11 19:05:58 +01:00
Guangcong Luo
13d69757a3 Support importing sets when adding sets in Teambuilder 2015-11-09 02:57:12 -05:00
Guangcong Luo
ef97c80ced Merge pull request #526 from Layell/patch-1 
Stratagem dimensions added
 2015-11-08 02:27:32 -06:00
Guangcong Luo
2daf2c826e Fix unnecessary pause when switching sides 2015-11-07 20:41:48 -05:00
Guangcong Luo
c6e72245e6 Fix win message not appearing 2015-11-07 00:31:48 -05:00
Guangcong Luo
5f023548fa Fix Lovely Kiss miss animation 
It now works like Will-O-Wisp.
 2015-11-07 00:31:48 -05:00
Guangcong Luo
2f7d7c7c4e Merge pull request #540 from sirDonovan/user-popup 
Add /ignore to the user popup
 2015-11-06 23:25:09 -06:00
sirDonovan
900809631c Add /ignore to the user popup 2015-11-06 23:05:18 -06:00
Guangcong Luo
3f0eea7e52 Redesign replay buttons to be larger 
This only affects the replay player, but it makes the replay player's
Play/Pause/etc buttons two lines (with the icon on a separate line),
for easier-to-click and narrower buttons.
 2015-11-06 22:00:37 -05:00
Guangcong Luo
d7b19f9d1a Fix battle.switchSides when battle is paused 2015-11-06 22:00:37 -05:00
Guangcong Luo
a66d32b5f1 Move Switch Sides icon to left 
Convention is only for Next Turn and Skip to End buttons to have the
icon on the right, all other icons have the icon on the left.
 2015-11-06 22:00:37 -05:00
Guangcong Luo
d304e8ac0f Fix forfeit confirmation appearing during replays 
When closing a battle that's in the middle of a replay, PS asks for
a forfeit even if the battle is over. This fixes that.
 2015-11-06 22:00:37 -05:00
Guangcong Luo
c0f18d1ff4 Fix Will-O-Wisp miss animation 
Will-O-Wisp's miss animation is really frustrating because it's
very hard to distinguish from its hit animation. The new version
now doesn't do the 'orbit' if it misses.
 2015-11-06 22:00:37 -05:00
The Immortal
5f7671268c Add COIL for Monotype 2015-11-06 22:46:07 +04:00
The Immortal
1306ad814c Capitalize Evolution in Mega Evolution 2015-11-06 20:41:30 +04:00
Guangcong Luo
cbd398cdeb Update CSS file standards 
This commit updates battle.css, replay.css, and utilichart.css to
match the new standard set in client.css.

Specifically: { is now inline with the last line of the selector.
 2015-11-06 06:20:45 -05:00
Guangcong Luo
cf12ca5be4 Tweak replay player CSS 
This fixes the option-box vertical alignment on the replay player for
modern rendering engines.
 2015-11-06 06:20:45 -05:00
Guangcong Luo
63cd9ae162 Refactor battle.switchSides 
The details of maintaining the current battle state while switching
sides is now handled in battle.js rather than client-battle.js, to
help the replay player support it more easily.
 2015-11-06 06:20:44 -05:00
Guangcong Luo
50f475ca5b Fix battle.fastForwardTo(0) 
This is currently just treated as a reset. The important thing is, it
doesn't behave erratically as it did previously.
 2015-11-06 06:20:44 -05:00
Guangcong Luo
1b5538896e Fix music when rewinding with battle.fastForwardTo 
Previously, using battle.fastForwardTo on a turn before the current
turn would make music behave strangely. This fixes it so that
music keeps playing as expected.
 2015-11-06 06:20:44 -05:00
Guangcong Luo
0552e02254 Stop animations when pausing battle 2015-11-06 06:20:44 -05:00
Guangcong Luo
78f0a0bfbe Merge pull request #542 from MasterFloat/patch-3 
menugroup button - disabled state color change
 2015-11-05 05:22:25 -06:00
MasterFloat
a6291fe315 menugroup button - disabled state color change 
When you looks for a battle you get this grey color which doesn't really suite the red button: http://prntscr.com/8z9e9g
So I changed it to the border's color (a bit darker): http://prntscr.com/8z9hx4
 2015-11-05 12:00:41 +01:00
Guangcong Luo
fefc779c04 Merge pull request #541 from augmt/patch-1 
Pass roomid when adding TeamPopup from TournamentBox
 2015-11-05 04:08:39 -06:00
Guangcong Luo
395f7676f4 Sanitizer: target="_blank" only on <a> and <form> tags 
This is mostly just to make sanitized HTML more readable.
 2015-11-05 03:47:17 -05:00
Guangcong Luo
5dfce38dd1 Drop outdated <a room="roomid"> syntax 
We now automatically handle room links using <a href="/roomid">.

In fact, the handling is currently done using a global click
handler, the same one in client.js that handles external links for
the desktop client, so it's like extra fancy.
 2015-11-05 03:34:31 -05:00