Nick Winter
|
83dd053540
|
Merge branch 'JKniager-patch-2'
|
2015-02-09 08:34:25 -08:00 |
|
Nick Winter
|
b2dc80b467
|
Merged those loading tips.
|
2015-02-09 08:34:13 -08:00 |
|
Nick Winter
|
7ee7269d39
|
Merge pull request #2191 from JKniager/patch-1
Added More Names
|
2015-02-09 08:32:32 -08:00 |
|
Nick Winter
|
760f2d35bb
|
Fixed bug with checkStripeCharges also trying to match iOS charges.
|
2015-02-09 08:31:44 -08:00 |
|
Nick Winter
|
0cee873157
|
Moved new buy gems background from compiled output to input dir.
|
2015-02-09 08:31:06 -08:00 |
|
Nick Winter
|
22c2c7df63
|
Fixed bug with incompletely added levels jamming the campaign editor.
|
2015-02-09 08:19:59 -08:00 |
|
TJ Ledwith
|
292e679cc6
|
Update level_loading.jade
|
2015-02-09 07:08:33 -05:00 |
|
Nick Winter
|
38c6d6f531
|
Merge pull request #2263 from divyanshu013/master
Improved upon the Buy Gems Window for #2238
|
2015-02-08 21:44:57 -08:00 |
|
divyanshu013
|
4269f6a652
|
Improved upon the Buy Gems Window for #2238
Added the header and close button for the Buy Gems Window.
|
2015-02-09 02:31:03 +05:30 |
|
Imperadeiro98
|
983d8c761a
|
Merge pull request #2262 from ArthurLu/master
Update zh-HANT.coffee
|
2015-02-08 19:55:00 +00:00 |
|
Imperadeiro98
|
2bca3e1733
|
Merge pull request #2255 from tutosfaciles48/patch-1
Update fr.coffee
|
2015-02-08 19:47:43 +00:00 |
|
TJ Ledwith
|
a7b7d61c08
|
Update en.coffee
|
2015-02-08 14:06:25 -05:00 |
|
Barney
|
245de23aff
|
Update zh-HANT.coffee
|
2015-02-08 21:21:32 +08:00 |
|
Barney
|
5f0adfae0c
|
Update zh-HANT.coffee
|
2015-02-08 20:56:23 +08:00 |
|
Barney
|
c88ccd7d8f
|
Update zh-HANT.coffee
|
2015-02-08 20:41:20 +08:00 |
|
Erik Mogensen (@mogsie)
|
00f4e1e894
|
lint complained
|
2015-02-08 12:47:49 +01:00 |
|
Erik Mogensen (@mogsie)
|
eab4174f78
|
More norwegian translations.
|
2015-02-08 12:38:17 +01:00 |
|
Nick Winter
|
bac8d28ec2
|
Merge pull request #2257 from Imperadeiro98/master
Made #back-button a button
|
2015-02-07 22:36:23 -08:00 |
|
Imperadeiro98
|
d876c81c97
|
Made #back-button a button
|
2015-02-07 22:33:48 +00:00 |
|
tutosfaciles48
|
6ccba1b1a9
|
Update fr.coffee
changement d'une phrase encore en anglais.
|
2015-02-07 22:23:09 +01:00 |
|
Imperadeiro98
|
8b721a7c47
|
Better indentation
|
2015-02-07 10:47:31 +00:00 |
|
Matt Lott
|
d5ac001a55
|
Restrict share progress prompt to named players
|
2015-02-06 19:49:13 -08:00 |
|
Nick Winter
|
58edc6d033
|
Fixed #2173: Campaigns now update adjacent campaign i18n when saved.
|
2015-02-06 19:23:11 -08:00 |
|
Nick Winter
|
3e07e45766
|
Merge pull request #2246 from h3yduck/master
Fix bug: cannot upload profile picture
|
2015-02-06 18:15:15 -08:00 |
|
Nick Winter
|
de89e84c1e
|
Merge branch 'h3yduck-fix-profile-pic-bug'
|
2015-02-06 18:10:25 -08:00 |
|
Nick Winter
|
cf09f01b03
|
Some style fixes to prettify the new background image avatars in user dropdown for #2247.
|
2015-02-06 18:10:12 -08:00 |
|
Nick Winter
|
9a29f898a9
|
Merge branch 'fix-profile-pic-bug' of git://github.com/h3yduck/codecombat into h3yduck-fix-profile-pic-bug
|
2015-02-06 18:01:25 -08:00 |
|
Nick Winter
|
8ab6f36364
|
Crude initial version of ASCII representation for blind players.
|
2015-02-06 16:54:55 -08:00 |
|
Matt Lott
|
972c3d0d6f
|
Share progress modal
Shown after forgetful-gemsmith
|
2015-02-06 14:49:50 -08:00 |
|
Nick Winter
|
e311eb2700
|
Fixed preloading of level sessions before starting a level.
|
2015-02-06 13:04:15 -08:00 |
|
Imperadeiro98
|
d2f0f3d1fc
|
Update pt-PT.coffee
|
2015-02-06 20:49:51 +00:00 |
|
Nick Winter
|
0f7b7c7a9c
|
Propagated i18n. Fixed #2253.
|
2015-02-06 12:08:31 -08:00 |
|
Imperadeiro98
|
b30de2bfa8
|
Small fix to last commit
|
2015-02-06 20:04:44 +00:00 |
|
Imperadeiro98
|
5b04bdcaba
|
Merge pull request #2252 from JulR43/patch-3
Update fr.coffee
|
2015-02-06 20:04:14 +00:00 |
|
Nick Winter
|
2bd7c86638
|
Added bottom footer background texture.
|
2015-02-06 11:17:48 -08:00 |
|
Nick Winter
|
3da36ccc5d
|
Added new level loading bar art. Using illustrated Start Level button.
|
2015-02-06 10:26:38 -08:00 |
|
JulR43
|
ef2f610ba2
|
Update fr.coffee
Translations
|
2015-02-06 19:06:10 +01:00 |
|
Matt Lott
|
f6bcc94bf8
|
Fix oneTimes email schema
Changing ‘targetEmail’ field to ‘email’.
|
2015-02-06 09:47:06 -08:00 |
|
Matt Lott
|
771437abb5
|
Turn off parent email hipchat messages
|
2015-02-06 09:11:49 -08:00 |
|
Imperadeiro98
|
b3d432d3ae
|
Some fixes to last commit
|
2015-02-06 15:19:05 +00:00 |
|
Imperadeiro98
|
cb74fc603e
|
Merge pull request #2249 from ArthurLu/master
Update zh-HANT.coffee
|
2015-02-06 15:17:24 +00:00 |
|
newmilktea
|
5e0c266094
|
Update zh-HANT.coffee
|
2015-02-06 22:14:15 +08:00 |
|
newmilktea
|
5e4a1ba4c8
|
Update zh-HANT.coffee
|
2015-02-06 22:08:26 +08:00 |
|
newmilktea
|
cf5b14e2c5
|
Update zh-HANT.coffee
|
2015-02-06 21:13:06 +08:00 |
|
newmilktea
|
6f4897da4d
|
Update zh-HANT.coffee
|
2015-02-06 21:08:39 +08:00 |
|
newmilktea
|
1752f12b32
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/locale/zh-HANT.coffee
|
2015-02-06 20:52:02 +08:00 |
|
newmilktea
|
cee95397fa
|
Update zh-HANT.coffee
|
2015-02-06 20:49:09 +08:00 |
|
Nick Winter
|
860868c285
|
Stopped preloading sessions for now, since it's buggy.
|
2015-02-05 16:14:32 -08:00 |
|
Nick Winter
|
3cbf11d404
|
Added a back button to hit campaign selector view.
|
2015-02-05 15:40:45 -08:00 |
|
Scott Erickson
|
097dbd11dd
|
Added a script for getting some subscription data more easily.
|
2015-02-05 15:32:15 -08:00 |
|