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

5210 commits

Author SHA1 Message Date
Omar S.
1b0ab789ca Checked up to line 340 
Checked the translations of the next lines and added one tip translation
 2014-12-27 10:35:46 -05:00
Imperadeiro98
598ca7d2ad Merge pull request #1995 from mileshayter/patch-1 
Update de-AT.coffee
 2014-12-27 11:48:01 +00:00
MinecraftWidget
b4f48764ff More Additions 2014-12-26 23:47:39 -07:00
MinecraftWidget
af7dbfb9ca Edits and Additions 2014-12-26 22:59:28 -07:00
Omar S.
b91f9e8e65 Checked and improved all up to timeunits (line 210) 
I will continue tomorrow. I have changed some lines and added somemore
 2014-12-26 23:29:24 -05:00
mileshayter
4719818dad Update de-AT.coffee 
Some translation done, will try to continue ASAP :)
 2014-12-26 22:38:55 +01:00
Imperadeiro98
9fbd1076f9 Fixed a link 2014-12-26 18:02:40 +00:00
Imperadeiro98
4dbdf60f10 Fixed link 2014-12-26 18:01:57 +00:00
flauta
4e93b3628d Update it.coffee 2014-12-26 17:49:04 +01:00
flauta
8edb13b18d Update it.coffee 
una piccola parte delle stringhe delle schermate iniziali, come esperimento
 2014-12-26 15:29:18 +01:00
Martin005
ca810dd142 Update cs.coffee 
Fixed missing space.
 2014-12-26 12:17:25 +01:00
Imperadeiro98
f6576d3984 Merge pull request #1989 from nixel2007/master 
Update ru.coffee
 2014-12-26 10:32:49 +00:00
Martin005
275b66eb07 Update cs.coffee 
Finally translate ALL of the strings!!! *celebrate time* :)
 2014-12-26 01:21:23 +01:00
Nick Winter
b116321deb Tested and cleaned up comment detection for space disablement sensitivity. 2014-12-24 12:37:25 -08:00
Nick Winter
c7eadb5670 Merge branch 'patch-4' of git://github.com/rishiloyola/codecombat into rishiloyola-patch-4 2014-12-24 12:24:27 -08:00
nixel2007
b3bced93ac Update ru.coffee 2014-12-24 22:57:54 +03:00
nixel2007
917a61b310 Revert "Fixed i18n-coverage bug" 
This reverts commit 97cdb76b82.
 2014-12-24 22:15:52 +03:00
Nick Winter
1c1f2008a5 Now able to suggest required items for purchase before level start. 2014-12-24 11:01:50 -08:00
nixel2007
d74a86d06a Merge remote-tracking branch 'upstream/master' 2014-12-24 15:19:43 +03:00
Nick Winter
f361674fb4 Enabling new levels for playtesting. 2014-12-23 17:14:59 -08:00
Nick Winter
f0826c865e Preparing new campaign levels for migration to new campaign editor. 2014-12-23 17:14:35 -08:00
Nick Winter
f17b3bd03b Fixed indentation and punctuation for superpower tip. 2014-12-23 07:57:07 -08:00
Nick Winter
48603e5bc8 Merge pull request #1985 from osanseviero/patch-3 
New tip
 2014-12-23 07:56:19 -08:00
Omar S.
9a30c35a3b New tip 
Added superpower tip
 2014-12-23 09:54:57 -05:00
Omar S.
f48c2b0def New tip 
Added superpower tip
 2014-12-23 09:54:31 -05:00
Scott Erickson
96c8e035cf Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema. 2014-12-23 09:42:24 -05:00
Scott Erickson
b567e737cd Tweaked campaign editor styling. 2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443 Tweaked campaign editor styling. 2014-12-23 09:19:08 -05:00
Scott Erickson
1bb76d5902 Fixed shadow placements. 2014-12-23 09:12:41 -05:00
Imperadeiro98
31ed540964 Merge pull request #1983 from tpai/patch-1 
Update zh-HANT.coffee
 2014-12-23 09:06:33 +00:00
tonypai
30eb96f151 Update zh-HANT.coffee 2014-12-23 16:01:33 +08:00
Nick Winter
5e3ae981d7 Merge pull request #1981 from Lynxbob/master 
Added 3 new name lists and 10 new names
 2014-12-22 17:40:51 -08:00
Branden Webb
eb3e0621f2 Added Sand Yak name list, Ogre Scout M name list, and Ogre Scout F name list. Also added 10 names, 5 for Sand Yak, 3 for Ogre Scout M, and 2 for Ogre Scout F. 2014-12-22 20:07:22 -05:00
Omar S.
3ed3dd00fa Added two names 2014-12-22 18:19:57 -05:00
Scott Erickson
d18260c20c Merge branch 'master' into feature/campaign-editor 2014-12-22 16:39:07 -05:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
George Saines
116feb5bea turning off realtime playback on the riddling kithmaze 2014-12-22 11:11:43 -08:00
Imperadeiro98
72e426c0e0 Fixed another link 2014-12-22 18:16:06 +00:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Scott Erickson
0d45e4a889 Set up the CampaignEditorView to trigger the CampaignView to re-render when things change. 2014-12-22 12:06:17 -05:00
Scott Erickson
1db8284236 When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView. 2014-12-22 11:09:58 -05:00
Scott Erickson
a31b385a4d Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView. 2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0 Hooked up the CampaignView to show adjacent campaigns based on the data. 2014-12-22 10:29:29 -05:00
Rishi
364f40274d Update SpellView.coffee 
hey i made changes. due to some error in downloading your data base i cannot test it. but check it . i think it will work .
 2014-12-22 18:06:32 +05:30
Imperadeiro98
2bca94161e Fixed a link 2014-12-22 11:22:06 +00:00
Nick Winter
e153a7ecce Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking. 2014-12-21 21:38:12 -08:00
Matt Lott
e7c626656e No-cache User fetch in hero victory 
After earning achievements.  On IE, this call results in a cache hit,
so the User object was never updated with the sweet sweet loot you just
earned.  Like a sword you need for True Names.
 2014-12-21 21:14:38 -08:00
Imperadeiro98
8da578e106 Update en.coffee 2014-12-21 21:46:45 +00:00
Imperadeiro98
393860ffa4 Update en.coffee 2014-12-21 21:30:15 +00:00
Imperadeiro98
0c00f9f0c1 Delete contribute_nav.jade 2014-12-21 21:09:52 +00:00
Imperadeiro98
5d9e303fb1 Added Martin005 2014-12-21 20:53:43 +00:00
Imperadeiro98
2b0757810c Merge pull request #1973 from uaMithril/patch-3 
Update uk.coffee
 2014-12-21 20:11:47 +00:00
Imperadeiro98
0cbf76bc36 Merge pull request #1972 from uaMithril/patch-2 
Update uk.coffee
 2014-12-21 20:09:58 +00:00
Imperadeiro98
81eb028025 Merge pull request #1971 from tpai/patch-1 
Update zh-HANT.coffee
 2014-12-21 20:09:14 +00:00
Imperadeiro98
0c01a4ed8c Merge pull request #1964 from Martin005/patch-5 
Update cs.coffee
 2014-12-21 20:02:27 +00:00
Mithril
837b62ee9d Update uk.coffee 2014-12-21 13:51:18 +02:00
Mithril
7ad505252b Update uk.coffee 2014-12-21 13:03:48 +02:00
tonypai
e815dff1de Update zh-HANT.coffee 
Hi, I've already sign the CLA, and this is my PR. :)
 2014-12-21 16:13:40 +08:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Nick Winter
f26b43f8a5 Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings. 2014-12-20 16:02:41 -08:00
Nick Winter
8528f5039b Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level. 2014-12-20 14:40:28 -08:00
Nick Winter
e4c6d07a4a Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699. Fixed #57. Colored collision overlays according to collision categories. 2014-12-20 13:39:51 -08:00
Martin005
eed3043a6d Update cs.coffee 2014-12-20 19:00:56 +01:00
Imperadeiro98
a52bf08792 Fixed links 2014-12-20 09:32:59 +00:00
Imperadeiro98
6ebf25ad15 Linked community page to new i18n 2014-12-20 09:28:56 +00:00
Imperadeiro98
bd5184c23b Update pt-PT.coffee 2014-12-20 09:12:31 +00:00
Nick Winter
08cb87c84d Automatically take screenshots when submitting contact form from level view. 2014-12-19 18:37:42 -08:00
Nick Winter
0041ffe423 Propagated i18n. 2014-12-19 15:36:16 -08:00
Nick Winter
2df1318e1b Hooked up i18n for redesigned contribute view. 2014-12-19 15:35:18 -08:00
Scott Erickson
0cd85d7aba Got the CampaignView mostly off the hardcoded data. 2014-12-19 16:46:01 -05:00
Imperadeiro98
4ca342c389 Fixed spacing 2014-12-19 20:46:34 +00:00
Imperadeiro98
560a3aaf44 Merge pull request #1940 from uaMithril/patch-1 
Update uk.coffee
 2014-12-19 20:45:19 +00:00
David Nagy
0c88f9f39c Update hu.coffee 2014-12-19 20:18:08 +00:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Scott Erickson
23da22a559 Added a new CampaignView, cloned from WorldMapView. Will migrate to using db data rather than hardcoded data. 2014-12-19 13:04:04 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
George Saines
31fb5fe80e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-18 16:31:33 -08:00
George Saines
9e88caf1e1 redesigned the contribute page 2014-12-18 16:31:30 -08:00
Matt Lott
f853259304 Updating help videos 
Moving dungeons-of-kithgard to Vimeo
Adding original style for haunted-kithmaze
 2014-12-18 14:04:48 -08:00
Matt Lott
f2835a998a Add second kith maze help video 2014-12-18 12:05:10 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Matt Lott
70cd8aa20d Update Vimeo embed player params 2014-12-17 23:59:59 -08:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Scott Erickson
b63b4d64da More work on the CampaignEditorView. Data gets saved to models now. 2014-12-17 22:53:04 -08:00
Matt Lott
d494dc9c79 Add video tutorials to game guide 2014-12-17 22:26:36 -08:00
Nick Winter
fe0c89e433 Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler. 2014-12-17 21:54:56 -08:00
Nick Winter
1b584ae72c Some fixes for desert campaign options. 2014-12-17 19:37:57 -08:00
nemoyatpeace
0496c9338d Update SpellView.coffee 
Fixed issue #1950 so attack defaults to enemy if player has findNearest or findNearestEnemy
 2014-12-18 09:10:07 +08:00
Nick Winter
da72991260 A few misc tweaks for the new desert level options. 2014-12-17 12:42:42 -08:00
nixel2007
97cdb76b82 Fixed i18n-coverage bug 
Added analysis of the translation of all available properties
 2014-12-17 23:21:54 +03:00
Imperadeiro98
d1e4a98981 Merge pull request #1947 from Martin005/patch-4 
Update cs.coffee
 2014-12-17 15:42:48 +00:00
Martin005
821f31f02e Update cs.coffee 2014-12-17 12:19:17 +01:00
Fernando H. Crozetta
a248828493 Update pt-BR.coffee 2014-12-17 08:56:31 -02:00
Nick Winter
a98deb1ff8 Making item requiring smarter about which slots can be required for non-warriors. 2014-12-16 18:57:54 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Nick Winter
6e6ce6cd27 Added Minesweeper original. 2014-12-16 16:40:14 -08:00
Matt Lott
1167655faf Disable internal event tracking 
Tracking down a server CPU issue.
 2014-12-16 16:38:17 -08:00
Nick Winter
688a8dc624 Thangs can now respect custom Component colorization. 2014-12-16 12:59:39 -08:00
Imperadeiro98
31953660f4 Fixed some commented translations 2014-12-16 20:16:42 +00:00
Martin005
50058147ed Update cs.coffee 
Adding some translations again, hopefully will do them all.
 2014-12-16 21:05:50 +01:00
George Saines
9d72c37876 removing gradient 2014-12-16 11:41:07 -08:00
Nick Winter
17db7c111c Merged zh-HANS.coffee again. 2014-12-16 10:49:01 -08:00
Nick Winter
79b3d8d1a2 Merged zh-HANS.coffee. 2014-12-16 10:47:48 -08:00
nixel2007
fcc5fb7537 Update ru.coffee 
problem_alert_help
 2014-12-16 15:28:02 +03:00
Eric Shen
ec00b74c92 Update zh-HANS.coffee - account profile & employer 2014-12-16 15:57:23 +08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -08:00
Mithril
6554800fbd Update uk.coffee 
Added some translations
 2014-12-16 00:38:55 +02:00
Matt Lott
eadde0590e Turn off fast hero victory modal A/B test 
Didn’t make a difference in level completion, opting for no delay in
showing the modal buttons.
 2014-12-15 14:05:37 -08:00
Matt Lott
c76662c967 Log analytics events internally 2014-12-15 11:45:12 -08:00
Matt Lott
5817553d54 Remove virtual page view tracking 
Wasn’t useful, and distorts our GA real page view analytics.
 2014-12-15 10:28:40 -08:00
Rubiconline
52853a31b5 Update fr.coffee 
Only minor corrections
 2014-12-14 21:06:06 +01:00
Igzok
d6642d83d2 Update fr.coffee 2014-12-14 18:48:42 +00:00
Rubiconline
37476e7849 Update fr.coffee 2014-12-14 19:30:44 +01:00
Nick Winter
72d4cad858 Fixed analytics tracking a whole level instead of just its name in one case. Fixed a Sarven typo. 2014-12-14 07:54:50 -08:00
Nick Winter
68678a6057 Add upcoming desert levels to the world map. 2014-12-13 19:43:12 -08:00
Nick Winter
3b2bebf427 Ended HoC sale. 2014-12-13 09:00:33 -08:00
nixel2007
6d480820f3 Update ru.coffee 2014-12-13 17:45:24 +03:00
Nick Winter
dec11d77f5 Uncommented some zh-HANT section headers. 2014-12-13 06:32:59 -08:00
Nick Winter
62ad7a3d10 Merge pull request #1927 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-13 06:30:52 -08:00
jibaigao
77202c9bd7 Update zh-HANT.coffee 2014-12-13 13:13:35 +01:00
Imperadeiro98
2c6756675d Update pt-PT.coffee 2014-12-13 08:58:45 +00:00
Nick Winter
4d347e0d5f Propagated i18n. 2014-12-12 16:13:18 -08:00
Nick Winter
719ca503fb Merge pull request #1925 from jibaigao/patch-1 
Update zh-HANT.coffee
 2014-12-12 16:12:09 -08:00
Nick Winter
25b91f900d Merge pull request #1926 from Imperadeiro98/master 
Internationalized more stuff
 2014-12-12 16:11:03 -08:00
Scott Erickson
b0de331a10 Shored up stripe transaction payment defences to try and fix #1906. 2014-12-12 15:27:58 -08:00
Imperadeiro98
a6653501e5 Update en.coffee 2014-12-12 22:35:22 +00:00
Imperadeiro98
f98469122a Update i18n-edit-model-view.jade 2014-12-12 22:35:16 +00:00
Imperadeiro98
9c911ce149 Update thang-type-edit-view.jade 2014-12-12 22:32:19 +00:00
Imperadeiro98
e609ea7c5c Update edit.jade 2014-12-12 22:25:17 +00:00
jibaigao
023f150b5a Update zh-HANT.coffee 2014-12-12 23:16:30 +01:00
Imperadeiro98
3ab5ee22c9 Update versions-modal.jade 2014-12-12 22:15:10 +00:00
Imperadeiro98
72485eb5a9 Update patches.jade 
Couldn't figure out how to handle "Pending", "Accepted", etc.
 2014-12-12 22:04:21 +00:00
Imperadeiro98
237b022147 Update edit.jade 2014-12-12 21:43:20 +00:00
Scott Erickson
e5c5f0ba04 Fixed Karma client test runner. 2014-12-12 13:12:35 -08:00
Nick Winter
71ad9248ca Merge pull request #1923 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-12 10:01:31 -08:00
Imperadeiro98
93e8691291 Update pt-PT.coffee 2014-12-12 16:55:08 +00:00
nixel2007
050de32163 Update ru.coffee 2014-12-12 19:51:49 +03:00
Nick Winter
f04bb3d030 Propagated i18n. 2014-12-12 08:40:57 -08:00
Imperadeiro98
091f80daff Update en.coffee 2014-12-12 16:33:16 +00:00
Imperadeiro98
a793339ee1 Update contact.jade 2014-12-12 16:28:56 +00:00
Nick Winter
b897055618 Added translation key for subscription status label. 2014-12-12 07:27:28 -08:00
Nick Winter
5d030a96ac Fixed some indentation typos in es-419.coffee. 2014-12-12 06:59:44 -08:00
Nick Winter
d90fb60eb2 Merge pull request #1910 from FedericoTomas/patch-5 
Updated..
 2014-12-12 06:58:01 -08:00
Nick Winter
ea22264d68 Fixed some indentation typos in de-CH.coffee. 2014-12-12 06:57:13 -08:00
Nick Winter
31ded35a97 Merge pull request #1899 from LetsPlentendo/patch-1 
Some more translations made...
 2014-12-12 06:55:42 -08:00
Nick Winter
3941606912 Merge pull request #1913 from Rubiconline/patch-4 
Update fr.coffee
 2014-12-12 06:48:37 -08:00
Nick Winter
5a66a914eb Temporarily turning off achievement popups in IE and synchronous multiplayer sessions in PlayLevelView for non-admins due to bugginess. 2014-12-12 06:40:32 -08:00
Matt Lott
d17cd6a2c1 No multiplayer in game-menu for non-ladder levels 
This is a point fix to prevent single player level sessions from
setting multiplayer=true, which results in a bus.connect() in
playlevelview, which can result in a Firebase blocking error.
 2014-12-11 22:05:18 -08:00
Matt Lott
0c81942c71 2nd HoC sub sale 2014-12-11 18:39:03 -08:00