Commit Graph

2607 Commits

Author SHA1 Message Date
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
Guangcong Luo
44526f7863 Move toggleFormatChar from Tools to ConsoleRoom
The name is a bit unfortunate, but Tools is specifically for data
access for game stats/mechanics and other things relevant to
battles, it's not supposed to be a generic place to stick
miscellaneous functions.
2015-11-05 03:29:42 -05:00
Guangcong Luo
f8e89a7ce3 Remove some outdated comments 2015-11-05 03:21:34 -05:00
Guangcong Luo
ccdd3fbf96 Fix minor error when Referer header not sent 2015-11-05 03:21:26 -05:00
Hector Garcia
0b8e862506 Pass roomid when adding TeamPopup from TournamentBox 2015-11-05 06:30:16 +00:00
Guangcong Luo
53dc1a1f71 Sync data 2015-11-04 22:34:10 -05:00
Guangcong Luo
68352742be Teambuilder: Support importing packed teams
Packed teams are not currently considered an officially supported
team format, but since they're now stored in localStorage for
long-term, we'll need to support them long-term, anyway.

This is currently mostly for debugging purposes.
2015-11-04 22:34:10 -05:00
Guangcong Luo
f6f929efe0 Merge pull request #539 from Layell/gsc_bgs
Gen 1/2 bg update
2015-11-04 03:19:02 -06:00
Layell
1cd72de452 Gen 1/2 bg update 2015-11-04 03:22:00 -05:00
Guangcong Luo
122dbeb426 Merge pull request #536 from urkerab/tooltip-flip
Flip tooltips that don't fit above the element
2015-11-03 19:41:49 -06:00
Guangcong Luo
4bec670a85 Merge pull request #538 from MonoHearted/patch-1
Add a duplicate check for highlights
2015-11-03 19:41:02 -06:00
MonoHearted
2281cee252 Add a duplicate check for highlights
Removes the possibility of adding duplicate highlights to your list.
2015-11-03 14:36:22 -08:00
Guangcong Luo
8221975989 Sync data 2015-11-03 16:50:24 -05:00
Guangcong Luo
8302b3dcdb Merge pull request #537 from urkerab/right-battle-tooltip-limit
Use correct tooltip limit for right hand battles
2015-11-03 14:47:55 -06:00
urkerab
8bcfea6561 Use correct tooltip limit for right hand battles 2015-11-03 12:15:52 +00:00
urkerab
a14277365e Flip tooltips that don't fit above the element 2015-11-03 12:00:30 +00:00
Guangcong Luo
ddc87a2d1d Merge pull request #531 from urkerab/replay-user-track
Don't track users in replays
2015-11-02 04:57:10 -06:00
Guangcong Luo
1e6b4c989a Merge pull request #535 from urkerab/duplicate-challenge-notifications
Prevent duplicate challenge notifications
2015-11-02 04:56:46 -06:00
urkerab
900fe9b107 Prevent duplicate challenge notifications 2015-11-02 10:41:39 +00:00
urkerab
d0a1969fa9 Don't track users in replays 2015-11-02 10:37:53 +00:00
Guangcong Luo
24bc13d037 Revert "Adjust the top of the tooltip to fit in the window"
This reverts commit 1114cb3e6c.
2015-11-01 18:36:17 -05:00
Ivo Julca
897b4ed115 Use the move target sent by the server
Refs #354
2015-11-01 13:14:23 -05:00
Guangcong Luo
7efebdc50f Merge pull request #518 from augmt/update-teams
Update teams on deletions, undeletions, and drops
2015-10-31 20:14:18 -05:00
Hector Garcia
4c3df24c69 Adjust curTeamIndex for each room accordingly
Rooms with `button.teamselect` present have their `curTeamIndex`
adjusted on various Teambuilder operations
2015-10-31 14:31:24 +00:00
Hector Garcia
dd5a68967a Keep track of current team index in TournamentBox 2015-10-31 14:31:14 +00:00