Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-21 06:37:09 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,026 Commits 99 Branches 6 Tags 863 MiB
bb98c7e382
Commit Graph

9026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marty-D
bb98c7e382 Merge pull request #2044 from ascriptmaster/move-fixes 
Fix Hoopa, Diancie, and Volcanion's Pokedex colors
 2015-07-09 17:31:26 -04:00
Kevin Lau
7608237e64 Fix Hoopa, Diancie, and Volcanion's Pokedex colors 2015-07-09 14:01:21 -07:00
Guangcong Luo
7af6b81c17 Merge pull request #2032 from Slayer95/battle-prototype 
Shrink needlessly long prototype chains for battles
 2015-07-09 04:45:24 -05:00
Guangcong Luo
77a45a3bac Don't gmodlog DNSBL/spammode unlocks 2015-07-09 05:50:47 -04:00
Guangcong Luo
fdfb8f168f Fix ac accounts getting around roombans 2015-07-09 05:50:47 -04:00
Ivo Julca
cee748b28d Shrink needlessly long prototype chains for battles 
Properties should now be searched in this order:
- Instance
- Scripts installed
- Battle.prototype properties
- Tools properties
- Object properties
 2015-07-09 00:48:53 -05:00
Marty-D
0f7f238a10 Gen I: Prevent Cosplay Pikachu from appearing in Challenge Cup 2015-07-08 20:27:09 -04:00
The Immortal
f27e55dce9 Theorymon: Add new changes 2015-07-08 05:17:44 +04:00
Marty-D
c85622391f Gen III: Fix sleep count interaction with Sleep Talk/Snore 
- Basically, a counter separate from the sleep counter starts at 0, and
attempting to use Sleep Talk or Snore while asleep increments it by 1.
- If the Pokemon attempts to use any other move while asleep, this
counter is reset to 0.
- If the Pokemon switches out while asleep, the current value of the
counter is added to the sleep counter.
 2015-07-07 20:30:39 -04:00
Kevin Lau
e991c70f4c Update Intimidate test to check activation order 2015-07-07 13:20:32 -07:00
Ivo Julca
9cec432a99 Fix toId on numbers 2015-07-07 12:06:23 -05:00
The Immortal
e0c6abccb6 Merge pull request #2038 from Irraquated/patch-3 
Add mega pokemon aliases.
 2015-07-07 20:40:12 +04:00
Guangcong Luo
aa4d6e1752 Merge pull request #2039 from Slayer95/replay-name 
Improve player identity checks in battles
 2015-07-07 03:38:01 -05:00
Jackson
68eae04884 Add mega pokemon aliases. 
Add mega pokemon aliases: maero and mray.
 2015-07-07 18:20:22 +10:00
Ivo Julca
24aa7e3136 Consolidate player identity checks in rated or tour battles 
By matching the user ids in `Battle#lastPlayers`.
 2015-07-07 03:19:50 -05:00
Guangcong Luo
3444f79989 Merge pull request #2029 from SolarisFox/patch-1 
Output command used in search result: /ds, /ms, and /itemsearch
 2015-07-07 03:18:09 -05:00
Ivo Julca
a0d2a59875 Fix replays being uploaded under an alt after player rename 2015-07-07 03:18:08 -05:00
Guangcong Luo
f67fd91590 Merge pull request #2037 from Slayer95/test 
Add regression test for players being unable to join battles
 2015-07-07 03:17:40 -05:00
Ivo Julca
43e20ebf24 Add regression test for issue described in b3b435c 2015-07-07 03:11:49 -05:00
Ivo Julca
b441375b5a Test: move utility functions to dev-tools/ 2015-07-07 03:08:18 -05:00
Guangcong Luo
8c3a5cabe4 Merge pull request #2035 from ascriptmaster/move-fixes 
Fix behavior with Ability activation in double-KO scenarios
 2015-07-07 02:59:03 -05:00
Kevin Lau
3c33a363fa Add Intimidate test to check simultaneous switches 2015-07-07 00:15:10 -07:00
Guangcong Luo
5a3fba09a0 Merge pull request #2036 from ascriptmaster/move-fixes-3 
Replace TryWeather event with battle.suppressingWeather
 2015-07-07 01:13:14 -05:00
Kevin Lau
70c8ca45ff Fix behavior with Ability activation in double-KO scenarios 
Add new function battle.insertQueue that inserts a decision into the
correct position in an already-sorted queue instead of re-sorting. Also,
to prevent code reuse, add new funciton battle.resolvePriority to deal
with shared code between battle.addQueue and battle.insertQueue.
 2015-07-06 20:33:40 -07:00
Kevin Lau
be03f23c78 Replace TryWeather event with battle.suppressingWeather 2015-07-06 17:00:41 -07:00
SolarisFox
3c8481fd12 Output command used in search result: /ds, /ms, and /itemsearch 2015-07-06 13:30:45 -07:00
Ivo Julca
32c120fab1 More lightweight implementation of nature data 2015-07-06 04:03:16 -05:00
Guangcong Luo
e6c9ce2cfb Merge pull request #2028 from Slayer95/tools 
Move globals toName|toString to Tools: Tools.[getName|getString]
 2015-07-06 02:45:02 -05:00
Ivo Julca
e92bb1b07f Rename globals toName|toString to Tools.[getName|getString] 2015-07-06 00:34:44 -05:00
Guangcong Luo
d0c718c7bc Merge pull request #2030 from SolarisFox/patch-7 
Use single constant for search outputs: /ds, /ms, /itemsearch
 2015-07-06 00:17:53 -05:00
Ivo Julca
b791a86325 Mix and Mega: display the megaevo item/move rather than the species 
Fixes unintended empirical demonstration of Stroop Effect.
 2015-07-05 23:29:26 -05:00
Ivo Julca
d0b59f5cca Mix and Mega: remove Mega-Rayquaza theorybans 
- Its exact implementation method is ultimately theorymon-based and policy-dependent.
- Keeping the current implementation is furthermore a maintenance burden.
 2015-07-05 23:16:02 -05:00
Ivo Julca
41e6aad4e4 Gen 1: residual damage fixes 
- Fix Poison/Burn displaying the opponent as source of the damage.
- Fixes inconsistent volatile state after Haze usage.
- Closes #2010
 2015-07-05 23:00:52 -05:00
SolarisFox
e1604b60e3 Use single constant for search outputs: /ds, /ms, /itemsearch 2015-07-05 18:28:53 -07:00
Ivo Julca
029846a6b7 Update Mix and Mega 
- Dragonite has been banned from holding stones.
- Baton Pass Clause has been added.
- Mawile and Medicham can hold Medichamite and Mawilite respectively.
 2015-07-05 19:01:35 -05:00
Guangcong Luo
24d9fd8d24 Merge pull request #1901 from SolarisFox/patch-1 
Add /itemsearch
 2015-07-05 18:36:51 -05:00
SolarisFox
3e6b7a747d Add /itemsearch 2015-07-05 14:32:17 -07:00
Guangcong Luo
89169fa03d Merge pull request #2027 from Rhythms88/master 
Wifi Plugin: Add two aliases
 2015-07-05 14:07:42 -05:00
Rhythms
c72ee7d331 Wifi Plugin: Add two aliases 2015-07-05 13:02:19 -06:00
Marty-D
0739d7eea5 Gen III, IV: Fix Taunt 2015-07-05 13:40:30 -04:00
Guangcong Luo
ebc82089ec Specify roomid in mute popup 2015-07-05 13:07:41 -04:00
Guangcong Luo
bdf86ab128 Merge pull request #2026 from panpawn/patch-75 
Make mute popups modal
 2015-07-05 11:56:55 -05:00
panpawn
6f95276fa4 Make mute popups modal 
Since lock and ban popups are modal, I see no reason why mute popups shouldn't be as well.
 2015-07-05 05:02:33 -04:00
Marty-D
51e9c3d922 Fix Taunt duration on targets switched in during the turn 2015-07-04 22:04:28 -04:00
Marty-D
e8991f8573 Gen I: Fix fast asleep message showing every sleep turn 2015-07-04 11:14:51 -04:00
Kevin Lau
c2043c5258 Merge pull request #2004 from Zipzapadam/patch-2 
Add BD (Belly Drum), Tflame, and Smogon Bird
 2015-07-03 19:14:04 -07:00
The Immortal
15761b8ddf Info: Add Doubles Ubers and update Doubles UU 2015-07-04 05:49:50 +04:00
Ivo Julca
a2d2a52301 Chain Room#update to Room#[add|addRaw] everywhere 2015-07-03 20:45:57 -05:00
Ivo Julca
5cf2c2740c Room#add and Room#addRaw now return the room 2015-07-03 20:45:57 -05:00
The Immortal
863c9b9e14 Mix and Mega: Fix multiple Blue Orbs 
And use single quotes.
 2015-07-04 05:42:03 +04:00