Commit graph

5914 commits

Author SHA1 Message Date
Nick Winter
4cbbcdad6d Merge pull request #2359 from laituan245/master
Added ability to delete account
2015-02-24 09:30:22 -08:00
laituan245
a588a3b2c8 Some updates to the PR #2359 2015-02-25 02:12:39 +09:00
laituan245
eb53381083 Don't delete the User object, just remove all the properties except for _id 2015-02-24 22:36:12 +09:00
Aman Kumar
0df2dea469 Issue #2387: Accounts setting toggle all fix 2015-02-24 17:25:18 +05:30
Divyanshu Maithani
335e1d96e8 Update hi.coffee 2015-02-24 02:48:20 -08:00
ITz7
5d6b2a890c Update zh-HANT.coffee
wondered why Herotype isnt translated o.o
2015-02-24 14:41:18 +08:00
ITz7
a326361e42 Update zh-HANS.coffee
Many Minor Updates + FInalization :D
2015-02-24 14:36:46 +08:00
Nick Winter
c43ddda235 Reduced number of events being sent by cutting out simulator results. 2015-02-23 16:56:16 -08:00
Nick Winter
34a92838a5 Propagated i18n. 2015-02-23 16:01:06 -08:00
Nick Winter
69959caba5 Using common.play instead of home.play for a more-common use of it. 2015-02-23 15:59:42 -08:00
Nick Winter
88c55fa7fd Fix for making ja start game text break lines in the right places. #2386 2015-02-23 15:57:43 -08:00
Nick Winter
4d35c2cefc Merged. 2015-02-23 15:05:54 -08:00
Nick Winter
0f6404fea1 Being a tiny bit more idiomatic about CoffeeScript ranges. 2015-02-23 15:03:48 -08:00
Nick Winter
6d9e7a76ce Merge pull request #2389 from amankr/bug/duplicates
Issue #2267: Removed duplicates from TreemaData
2015-02-23 15:02:20 -08:00
Nick Winter
fb10de5023 Merge pull request #2376 from amankr/login
Issue #2082: Campaign editor login fixed
2015-02-23 14:54:15 -08:00
Nick Winter
1513e20486 Merge pull request #2370 from amankr/newfeature
Issue #1785: Empty level editor folders removed
2015-02-23 14:53:08 -08:00
Nick Winter
1314695382 Merge pull request #2385 from nixel2007/master
Update diplomat.jade
2015-02-23 14:50:04 -08:00
Nick Winter
61831e83c2 Merge pull request #2368 from rmarren1/master
Slight cleanup to level indicator code
2015-02-23 14:49:13 -08:00
Aman Kumar
d8a4803268 Issue #2267: Removed duplicates from TreemaData 2015-02-24 03:18:35 +05:30
Coderaulic
21ddb9ca59 Update ja.coffee
Some minor fixes added based on last changes.
Can you tell me how to add a line break?
Is it " text \ text " for:
text
text
as output? Or "ABC '\' DEF" for:
ABC
DEF
Not familiar with line breaks in coffee script.
2015-02-23 12:24:00 -08:00
Imperadeiro98
6afad49d8f Some fixes to last merge 2015-02-23 20:21:10 +00:00
Imperadeiro98
c375a8ed12 Merge pull request #2384 from etem/master
Update bg.coffee
2015-02-23 20:16:08 +00:00
Imperadeiro98
aad40bbe33 Merge pull request #2383 from musicogeek/patch-1
Update es-419.coffee
2015-02-23 20:12:01 +00:00
Imperadeiro98
7ea804458c Merge pull request #2382 from ITz7/patch-3
Update zh-HANT.coffee
2015-02-23 19:59:01 +00:00
Imperadeiro98
0d0dc5597d Merge pull request #2380 from ITz7/patch-2
Update zh-HANS.coffee
2015-02-23 19:57:54 +00:00
Imperadeiro98
9acea40089 Uncommented an header for last commit 2015-02-23 19:52:22 +00:00
Imperadeiro98
f392ffcb71 Merge pull request #2362 from leotada/patch-1
Translation PT-BR
2015-02-23 19:51:21 +00:00
nixel2007
a3afec0989 Update diplomat.jade
Fix >100% of translation.
2015-02-23 21:18:00 +03:00
Etem Hyusnev
7d7b77e753 Updated translation 2015-02-23 20:15:01 +02:00
Etem Hyusnev
3baf791e77 Updated translation 2015-02-23 19:00:09 +02:00
Etem Hyusnev
68b46778ad Updated translation 2015-02-23 18:01:32 +02:00
Orlando Hernández
887936fd79 Update es-419.coffee 2015-02-23 11:29:19 -04:30
ITz7
56feac3f5f Update zh-HANS.coffee 2015-02-23 23:47:37 +08:00
ITz7
2c301df0ba Update zh-HANS.coffee 2015-02-23 22:36:58 +08:00
ITz7
8c64a69012 Update zh-HANT.coffee 2015-02-23 21:39:14 +08:00
ITz7
faa5b43902 Update zh-HANS.coffee 2015-02-23 19:58:38 +08:00
Etem Hyusnev
9280444f57 Updated translation 2015-02-23 09:11:23 +02:00
Nick Winter
63b24b9bf1 Properly showing the back of wizards' robes. 2015-02-22 21:50:56 -08:00
Etem Hyusnev
ce074921b4 Updated translation 2015-02-22 22:29:04 +02:00
divyanshu013
5ad23fc354 Fix for Campaign editor login not working for #2082
Overiding the login and signup listener clicks in CampaignEditorView so that
the child can call them.
2015-02-23 01:34:33 +05:30
divyanshu013
dc953431ec Fix for long names in leader board for #2373
Reduced the max-width component to fit ellipsis properly.
2015-02-23 01:03:35 +05:30
Nick Winter
7d7db5dafe Thang Editor can now drag Thangs to adjust registration points. Fixed missing terrain save property on ThangTypes. Fixed text search test. Added new Talus (mountain floors) to floor ThangType list for proper stretching. 2015-02-22 11:07:56 -08:00
Imperadeiro98
2e25beccd4 Uncommented some translations from last merge 2015-02-22 16:10:20 +00:00
Imperadeiro98
da4a160f54 Merge pull request #2377 from etem/master
Updated Bulgarian translation
2015-02-22 16:04:27 +00:00
Matt Lott
7e46b819c4 Stripe API version update fixes
Using customer sources instead of cards so we can update our API
version:
https://stripe.com/docs/upgrades?since=2014-11-05#api-changelog
2015-02-22 07:54:36 -08:00
Etem Hyusnev
3179546430 Updated Bulgarian translation 2015-02-22 17:43:44 +02:00
Aman Kumar
7f442a32a3 Issue #2082: Campaign editor login fixed 2015-02-22 20:26:13 +05:30
Coderaulic
8915f0a98e Update ja.coffee
Various translations added and some minor fixes.
2015-02-21 23:49:48 -08:00
Aman Kumar
436594555c Issue #1785: Empty level editor folders removed 2015-02-22 05:11:02 +05:30
Ryan Marren
b16c44da63 Merge remote-tracking branch 'upstream/master' 2015-02-21 17:31:30 -05:00
Ryan Marren
320e8c401a level indicator code cleanup 2015-02-21 17:30:32 -05:00
Nick Winter
40ff7d4116 Harmonized enter shortcut for PlayHeroesModal. 2015-02-21 14:22:51 -08:00
Matt Lott
ecd9abc3b6 Merge pull request #2366 from rmarren1/master
Clarified level indicator for #2351
Fixes #2351
2015-02-21 11:41:35 -08:00
Ryan Marren
f850409dbe made "level" display in other languages 2015-02-21 14:29:40 -05:00
Nick Winter
e3d13f6dd0 Merge pull request #2363 from ChaosCat/patch-1
Update he.coffee
2015-02-21 09:21:41 -08:00
Ryan Marren
a7dadc34aa Added level indicator 2015-02-20 23:50:42 -05:00
Nick Winter
0e135ac07f Fixed blank language selector row. 2015-02-20 15:20:44 -08:00
Shady Kamal
f32572e94c Update he.coffee
+Another update for "he.coffe" file
2015-02-20 20:38:30 +02:00
Leonardo
de7f216d22 translation
translation.
2015-02-20 15:35:37 -02:00
enricpc
e113c7accb Update ca.coffee 2015-02-20 08:51:29 +01:00
Nick Winter
ab252adf90 Better detection and error handling of unsupported WebGL context creation failures. 2015-02-19 19:57:10 -08:00
laituan245
d325623699 Added ability to delete account 2015-02-20 08:19:30 +09:00
sohalya
a3ce088657 Update fr.coffee
Some translations and french grammar corrections.
2015-02-19 17:21:46 +01:00
Shady
928748ff5f Update he.coffee
a minor update for he.coffee
2015-02-19 14:16:23 +02:00
Nick Winter
8355ba5a6d Replayable level awards now count up from where they were last time instead of from 0. 2015-02-18 18:01:22 -08:00
Nick Winter
f2a5c4bc5a Merge pull request #2353 from amankr/sound
Volume bug fix #2202
2015-02-18 13:36:59 -08:00
Nick Winter
a81663f06a CampaignView shouldn't use localStorage backups unless it's in editor mode. 2015-02-18 13:35:47 -08:00
Imperadeiro98
227a8edffa Merge pull request #2350 from vampirelower/patch-2
Update uk.coffee
2015-02-18 20:45:49 +00:00
Aman Kumar
e4a3890f39 fixed volume bug #2202 2015-02-19 02:05:41 +05:30
Aman Kumar
a74c2a58e2 fixed volume bug #2202 2015-02-19 01:58:24 +05:30
Shady
a7bff7a011 Update he.coffee - 2
second update done
2015-02-18 22:16:12 +02:00
Edward Litvinchyck
ff4487d79f Update uk.coffee 2015-02-18 21:10:33 +02:00
Nick Winter
178082d4e8 Fixed bug with dragging an item to unequip it not updating rest of state. 2015-02-18 09:57:03 -08:00
Imperadeiro98
0a332073e9 Merge pull request #2347 from divyanshu013/patch-1
Update hi.coffee
2015-02-18 17:35:37 +00:00
Imperadeiro98
35284a3d18 Uncommented some translations from last commit 2015-02-18 17:35:15 +00:00
Imperadeiro98
8b0a9a5c68 Merge pull request #2346 from ChaosCat/patch-2
Update he.coffee
2015-02-18 17:32:12 +00:00
Imperadeiro98
639da031fc Uncommented an header for last commit 2015-02-18 17:31:15 +00:00
Imperadeiro98
04daa08a97 Merge pull request #2345 from wakeup/patch-2
Update tr.coffee
2015-02-18 17:28:46 +00:00
Nick Winter
1795891933 Added new pow function for simulated ladder games achievement. 2015-02-18 09:06:32 -08:00
Nick Winter
1a44b3ff5a Merge pull request #2344 from laituan245/master
Fix issue #1832 (Equipping with little equip button doesn't update big equip button)
2015-02-18 08:58:36 -08:00
Divyanshu Maithani
e55d3251bc Update hi.coffee 2015-02-18 21:26:36 +05:30
ChaosCat
0b1b28ff8e Update he.coffee
some updates to he.coffee
2015-02-18 17:33:19 +02:00
Volkan Gezer
375a61fcc6 Update tr.coffee 2015-02-18 16:13:35 +01:00
Imperadeiro98
055922a967 Some fixes to last merge 2015-02-18 12:06:38 +00:00
Imperadeiro98
30f451985d Merge pull request #2340 from ChaosCat/patch-1
Fixed errors and added more translations to he.coffee
2015-02-18 12:05:24 +00:00
Imperadeiro98
993ca19da2 Removed blank line from names.coffee 2015-02-18 12:02:17 +00:00
laituan245
0cf16e157c Fix issue #1832 2015-02-18 16:12:19 +09:00
Nick Winter
5bc99d7c0d Merge pull request #2338 from Raxerz/patch-1
Added more ninja names for #53
2015-02-17 15:28:14 -08:00
Nick Winter
dc703c40b0 Merge pull request #2336 from divyanshu013/master
Added some Hindi localizations for hi.coffee
2015-02-17 15:26:41 -08:00
Imperadeiro98
ef8f3cff1a Couple fixes to pt-PT 2015-02-17 22:33:14 +00:00
ChaosCat
589ab03438 תיקון שגיאות והוספת מידע
חלק מהתרגומום שונו לנוסח רשמי\ברור יותר
נא לתקן במידת הצורך
2015-02-17 23:37:20 +02:00
Imperadeiro98
697e5a0ab3 Uncommented an header for last commit 2015-02-17 20:09:47 +00:00
Imperadeiro98
59aa6e257a Merge pull request #2337 from laituan245/master
Update ko.coffee
2015-02-17 20:09:12 +00:00
Nick Winter
f308379453 Fixed typo in LevelSession busting readyToRank check. 2015-02-17 11:51:52 -08:00
divyanshu013
d8716ed40b Added CodeCombat navigation from /play to / for #2044 2015-02-17 23:49:34 +05:30
Nick Winter
7d582b5cfa Better targeting of multiplayer sessions for user profile completed levels view. 2015-02-17 09:49:56 -08:00
Nick Winter
ae07a25657 Fixed #2329: ordered spoken languages first by popularity (for top 8), then by alphabetical. 2015-02-17 09:29:21 -08:00
Rajath
31c6d9069b Added more ninja names for #53
Added 'Itachi', 'Madara' and 'Obito' to the set of ninja names.
2015-02-17 21:52:20 +05:30
Tuan Manh Lai
e09d6fd709 Update ko.coffee 2015-02-17 22:07:13 +09:00
Tuan Manh Lai
b1e280ccd3 Update ko.coffee 2015-02-17 21:44:41 +09:00