codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
7496 commits 27 branches 0 tags 134 MiB
Commit graph

5915 commits

Author SHA1 Message Date
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
Imperadeiro98
5c91c7a237 Merge pull request #2334 from Kyezil/patch-1 
Update ca.coffee
 2015-02-17 11:00:27 +00:00
Tuan Manh Lai
f99239c11a Update ko.coffee 2015-02-17 15:36:51 +09:00
divyanshu013
82b3221e0d Added some Hindi localizations 2015-02-17 11:28:38 +05:30
Nick Winter
141e11f918 Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master 2015-02-16 17:13:24 -08:00
Louis Clergue
7f128f6773 Update ca.coffee 2015-02-17 00:26:58 +01:00
Imperadeiro98
158560f42d Merge pull request #2331 from vampirelower/patch-1 
Update uk.coffee
 2015-02-16 23:20:02 +00:00
Imperadeiro98
3f9169a18f Uncommented an header 2015-02-16 23:18:23 +00:00
ptsoumaki
ef5363c1cb Update el.coffee 2015-02-17 00:21:38 +02:00
Ryan Marren
b2d881807a Merge branch 'master' of https://github.com/rmarren1/codecombat 2015-02-16 17:12:38 -05:00
Ryan Marren
1a60b004a7 added achievement editor for #2304 2015-02-16 17:12:05 -05:00
Edward Litvinchyck
8ffe11fd05 Update uk.coffee 2015-02-17 00:10:58 +02:00
divyanshu013
036b72ca19 Font size tweak for #2324 
Also reduced the size for tbody data to fit properly
 2015-02-17 00:44:08 +05:30
Nick Winter
de11743df9 Merge pull request #2326 from laituan245/master 
Add type (warrior/ranger/wizard)  to hero selector modal (Issue #2307)
 2015-02-16 10:29:26 -08:00
Nick Winter
5645f7779b Changed isMultiplayer check to fix #2325. 2015-02-16 10:24:00 -08:00
Imperadeiro98
a73ccbc037 Changed language specific style in home.sass 
So that it only affects pt-BR instead of pt-PT.
 2015-02-16 18:23:42 +00:00
Nick Winter
83c25efa40 Merge pull request #2317 from rmarren1/master 
added famous computer scientist names for #53
 2015-02-16 09:33:49 -08:00
Nick Winter
c0f738d736 Fixed bug with Campaign i18n not showing fullNames properly. 2015-02-16 09:21:59 -08:00
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
Imperadeiro98
f0619e08f3 Merge pull request #2323 from ZeAntwan/patch-2 
FR Translations and corrections
 2015-02-16 13:49:41 +00:00
Imperadeiro98
d575bb2992 Small spacing fix 2015-02-16 13:33:44 +00:00
ZeAntwan
1d332f2afe FR Translations and corrections 
Categories Translated :
- contact
- classes

Corrections :
(Note aux français) : Il faut différencier les "Subscribe" des "Sign Up". Subscribe équivaut à l'abonnement payant !
- legal > page-title

ATTENTION :
- (417) parent_button : The translation is out of box, text size need to be reduced to around 21px to fit.
 2015-02-16 14:15:17 +01:00
Imperadeiro98
b29bb787d8 Merge pull request #2320 from laituan245/laituan245-patch-1 
Update vi.coffee
 2015-02-16 11:48:58 +00:00
Imperadeiro98
6ff6d11323 Merge pull request #2322 from ZeAntwan/patch-1 
Update fr.coffee
 2015-02-16 11:46:28 +00:00
ZeAntwan
91313a0015 Update fr.coffee 
Translated following strings : 
share_progress_modal 
(309) tip_reticulating
(326) tip_superpower
(329) tip_code_never_lies
(335) : tip_move_forward
(337) : tip_adding_evil (Traduction approximative de "evil" vers "mechanceté")
subscribe (lots of things)

Correction 427 (ecriVant pas ecriSant)
 2015-02-16 03:47:57 +01:00
Tuan Manh Lai
6377484db5 Update vi.coffee 2015-02-16 01:38:58 +09:00
Tuan Manh Lai
f01b0d1b9a Update vi.coffee 2015-02-15 05:41:06 +09:00
Tuan Manh Lai
5421c4ec46 Update vi.coffee 2015-02-15 05:35:57 +09:00
Tuan Manh Lai
377d8a768d Update vi.coffee 2015-02-15 05:21:31 +09:00
Ryan Marren
0a961b03c5 added famous computer scientist names for #53 2015-02-14 11:07:24 -05:00
Barney
dd40a07fc0 Update zh-HANT.coffee 2015-02-14 21:22:02 +08:00
Barney
00242f5767 Merge remote-tracking branch 'upstream/master' 2015-02-14 16:03:22 +08:00
Nick Winter
7f2e5c4404 Achievements list now shows proper amount of gems and exp for repeatable achievements. 2015-02-13 18:55:23 -08:00
Nick Winter
c29bb432e1 Merge pull request #2314 from laituan245/master 
A small fix to the PR #2313
 2015-02-13 13:46:45 -08:00
Matt Lott
81678e81d9 Merge pull request #2315 from amankr/autocomplete2 
Autocomplete bug fix #2233 - method 2

Thanks @amankr!
 2015-02-13 13:12:22 -08:00
Aman Kumar
85a024546b Autocomplete bug fix #2233 2015-02-14 02:21:54 +05:30
Aman Kumar
224213ccb0 Autocomplete bug fix #2233 2015-02-14 02:11:00 +05:30
Imperadeiro98
8b978c0047 Removed unused string 2015-02-13 20:39:03 +00:00
laituan245
93bbedd02d A small fix to the PR #2313 2015-02-14 05:27:58 +09:00
Aman Kumar
80fb124772 Autocomplete bug fix #2233 2015-02-14 01:56:05 +05:30
Barney
140ba5f9e0 Update zh-HANT.coffee 2015-02-14 03:57:09 +08:00
Barney
248d6dd1ef Merge remote-tracking branch 'upstream/master' 2015-02-14 03:53:47 +08:00
Barney
dde3546564 Update zh-HANT.coffee 2015-02-14 03:53:44 +08:00
Scott Erickson
52e5dc4719 Removed another instance of the old scope, for #2067. 2015-02-13 11:24:06 -08:00
Scott Erickson
9b86e5872f Fixed #2067 2015-02-13 11:18:00 -08:00
Barney
e6008f2a5c Merge remote-tracking branch 'upstream/master' 2015-02-14 02:46:11 +08:00
Nick Winter
574f0b1442 Fixed #2303. Sorry, TBL. 2015-02-13 09:29:18 -08:00
Nick Winter
a9fddb8eb2 Propagated i18n. 2015-02-13 09:13:24 -08:00
Nick Winter
4fec64c3ca Merge pull request #2313 from laituan245/master 
Added a "god mode" button to the local dev environment  (issue #2164)
 2015-02-13 09:08:09 -08:00
Nick Winter
937bbf211c Thang Editor now centers unit better, lists action names in a more useful order. 2015-02-13 09:03:22 -08:00
laituan245
9c754bbd96 Added a "god mode" button to the local dev environment #2164 2015-02-14 01:46:04 +09:00
Barney
ae2d52d31a Merge remote-tracking branch 'upstream/master' 2015-02-13 23:50:25 +08:00
Barney
6f88af50f9 Update zh-HANT.coffee 2015-02-13 23:50:12 +08:00
Gutierri Barboza
74babe01ea more translations pt-br 2015-02-13 13:22:48 -02:00
Imperadeiro98
9ddbf1a102 Fixed i18n in buy-gems-modal.jade 2015-02-13 14:54:19 +00:00
Imperadeiro98
c54cd428ad Removed unused strings 2015-02-13 14:54:04 +00:00
Imperadeiro98
2785d3fa2b Fixed indentation issue in last merge 2015-02-13 14:40:36 +00:00
Imperadeiro98
6bd56e040c Merge pull request #2310 from jimmysvk/patch-3 
Around hundred new lines of Slovak translation
 2015-02-13 14:38:08 +00:00
Imperadeiro98
306c76d41d Merge pull request #2308 from ArthurLu/master 
Update zh-HANT.coffee
 2015-02-13 14:35:54 +00:00
Nick Winter
5cf37d1796 A few tweaks to visuals on PlayHeroesModal hero previews. 2015-02-13 04:09:40 -08:00
jimmysvk
6574a4b978 Around hundred new lines of Slovak translation 
Completed translations of home, nav, diplomat_suggestion, play, common, general, almost whole play_level, buy_gems, skill_docs, versions
 2015-02-13 10:19:13 +01:00
Barney
6917ebc110 Update zh-HANT.coffee 2015-02-13 13:02:47 +08:00
Barney
295ecf53c2 Merge remote-tracking branch 'upstream/master' 2015-02-13 12:34:37 +08:00
Nick Winter
991a374da2 Fixed up SpectateView for hero ladder games. Addd player names to their heroes in spectate and observation mode. Fixed #1679. 2015-02-12 19:47:57 -08:00
Nick Winter
a8dc353f86 Aether now loading all code languages possibly used in a match before the level can begin. Hopefully, this will fix #1943 and fix #1892. 2015-02-12 18:40:38 -08:00
Nick Winter
7000048bee Fixed a few more issues with the headless simulator. 2015-02-12 17:07:29 -08:00
Nick Winter
1aa738b256 Fixed up headless client, I hope. 2015-02-12 16:07:19 -08:00
Matt Lott
c4f46faf25 🐛Fix leaderboard level popup stacked buttons 
CSS initial keyword isn’t supported in IE.

Fixes #2301
 2015-02-12 14:19:19 -08:00
Matt Lott
d937feb3de 🐛Fix share progress title wrap on IE11 
Fixes #2301
 2015-02-12 13:38:55 -08:00
Nick Winter
e01e71d5e8 Fixed #2181, I hope. 2015-02-12 11:59:38 -08:00
Nick Winter
6b9d8161ef Found another place missing cache: false. 2015-02-12 11:17:23 -08:00
Nick Winter
8936d5fa40 Simulator version 2 takes into account flag history when simulating matches. 2015-02-12 10:59:34 -08:00
Imperadeiro98
1f20402bb0 Update pt-PT.coffee 2015-02-12 18:31:01 +00:00
Barney
df0a588870 Update zh-HANT.coffee 2015-02-13 02:21:52 +08:00
Imperadeiro98
42a4ca9299 Uncommented some headers 2015-02-12 17:25:31 +00:00
jimmysvk
03800e4360 Update of SVK translation 
Translated achievments, user, article, save_load, inventory, game_menu, some of play_level, some of general, rest of login, rest of nav
 2015-02-12 18:17:03 +01:00
Imperadeiro98
cf5aa3bc25 Uncommented some headers 2015-02-12 17:02:13 +00:00
Imperadeiro98
ff183b683d Merge pull request #2299 from jimmysvk/patch-1 
Some lines of SVK translation updated
 2015-02-12 17:00:37 +00:00
Nick Winter
a2a4303a83 Fixed #2109. Much less fragile naming of opponents on My Matches tab. 2015-02-12 08:50:55 -08:00
jimmysvk
892ea201eb Some lines of SVK translation updated 
Just for the begining. Looking forward to complete translation ; )
 2015-02-12 16:54:06 +01:00
Imperadeiro98
3188ba15b8 Merge pull request #2297 from laituan245/laituan245-patch-1 
Update vi.coffee
 2015-02-12 14:22:00 +00:00
Imperadeiro98
838363fd63 Uncommented an header 2015-02-12 14:20:13 +00:00
Tuan Manh Lai
cf9da099a5 Update vi.coffee 2015-02-12 17:17:19 +07:00
Tuan Manh Lai
f0ca5d1a5b Update vi.coffee 2015-02-12 17:05:41 +07:00
Melondonut
4f3ae1b73d Update ko.coffee 2015-02-12 16:26:24 +09:00
Barney
b63bbf870b Update zh-HANT.coffee 2015-02-12 13:15:22 +08:00
Nick Winter
63fa2f86d4 Tracking who is simulating matches so we can see patterns in ill-reported matches. Rejecting simulations from simulators with old versions of the Simulator code. 2015-02-11 20:24:12 -08:00
Nick Winter
2efb6aafbc Fixed #1632. 2015-02-11 16:12:26 -08:00
Nick Winter
5ee6eaf8b4 Fixed audio upload nodes to work in Firefox. Fixed #445. 2015-02-11 15:52:15 -08:00
Nick Winter
3bdede3587 Fixed #141. 2015-02-11 15:13:38 -08:00
Nick Winter
53621f0d5d Merge pull request #2294 from mogsie/i18n-norwegian 
i18n norwegian
 2015-02-11 14:10:07 -08:00
Nick Winter
85ad3f5960 Fixed #2293. 2015-02-11 14:09:00 -08:00
Erik Mogensen (@mogsie)
fc46075b35 Merge remote-tracking branch 'upstream/master' into i18n-norwegian 2015-02-11 23:03:20 +01:00
Erik Mogensen (@mogsie)
102bb50870 i18n/nb: wording, punctuation. 2015-02-11 23:02:59 +01:00
Nick Winter
2a9bb0292d Don't dispatch simulations to old ladders, just new hero-ladder levels. Fixed typo in last cache commit. 2015-02-11 14:01:38 -08:00
Erik Mogensen (@mogsie)
71ff84538e i18n/nb: capitalization, wording. 2015-02-11 22:17:33 +01:00
Nick Winter
d09636306c Toggling all plausibly-buggy AJAX requests to cache: false for better IE behavior. Look out for bugs! 2015-02-11 13:12:54 -08:00
Tuan Manh Lai
01f5ff9d1a Update vi.coffee 2015-02-12 05:49:09 +09:00
Erik Mogensen (@mogsie)
8029ce22f0 i18n/nb: Teacher page grammar, typos, wording. 2015-02-11 21:15:30 +01:00
Erik Mogensen (@mogsie)
5dc4d52c27 Merge remote-tracking branch 'upstream/master' 2015-02-11 20:54:31 +01:00