Commit graph

5816 commits

Author SHA1 Message Date
JKniager
503575d86b Added More Names 2015-01-31 15:51:27 -07:00
Nick Winter
1e410e0b14 Worked around bug with item portraits disappearing after item purchase. Fixed #1980. 2015-01-31 14:38:54 -08:00
purenickery
b7624c0c58 Update names.coffee
-added new names for #53
2015-01-31 15:26:41 -07:00
Imperadeiro98
1b42dceb4f Last merge fix 2015-01-31 22:02:26 +00:00
Coderaulic
bf54331f21 Update ja.coffee
Updated translation in:
nav:
play:
login:
signup:
recover:
items:
units: Note that in Japanese, measurements of time don't have individual or singular form: As in "a year" and "years" is still the same.
play_level:
2015-01-31 13:47:40 -08:00
Imperadeiro98
95b6801dab Update about.jade 2015-01-31 21:43:43 +00:00
Imperadeiro98
128dc55c1d Merge pull request #2187 from SuperPranx/patch-2
Added a few translations
2015-01-31 21:23:08 +00:00
Nick Winter
936ebf67a7 Fixed #2140. 2015-01-31 13:18:32 -08:00
Nick Winter
26ac0c8947 Making sure tooltips are destroyed when their parent views are destroyed. 2015-01-31 12:48:44 -08:00
Nick Winter
4b388f2775 Fixed some memory leaks. Fixed a couple minor bugs. 2015-01-31 12:23:44 -08:00
Ivan Milanov
15939cbc17 Added a few translations 2015-01-31 21:19:23 +01:00
Imperadeiro98
b8214e8b3c Last merge fixes 2015-01-31 19:02:24 +00:00
Imperadeiro98
a0e4a410f7 Merge pull request #2185 from jacobakkerboom/patch-2
Update nl-NL.coffee
2015-01-31 18:53:59 +00:00
Nick Winter
b538a83fd1 Oops, that was just for testing... 2015-01-31 10:37:43 -08:00
Popey Gilbert
ec5d54cc97 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-31 10:10:24 -08:00
Popey Gilbert
8098c76ba5 Changed Particles 2015-01-31 10:08:54 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Jacob
cf76143e60 Update nl-NL.coffee
Worked upwards from the bottom until the section "about". Edited some longer sentences reasonably carefully. Made use of the word email more consistent, by changing most to email. Wiki says the official spelling is e-mail, so perhaps we should revert this, but I think consistency is most important. I suppose we should work together with our Belgian partners, but I have only looked at the NL version. Again, feel free to contact me. I will browse some more in the Dutch version to see if everything looks ok.
2015-01-31 17:28:27 +01:00
Imperadeiro98
55d9731720 Removed Scott's website
It was not working.
2015-01-31 15:04:50 +00:00
Imperadeiro98
850cd99069 i18n of teachers (part 2) 2015-01-31 14:17:24 +00:00
Imperadeiro98
06860f4338 Added teachers strings 2015-01-31 14:06:32 +00:00
Imperadeiro98
bae3053585 i18n of teachers (part 1) 2015-01-31 12:57:32 +00:00
Imperadeiro98
d497a3ac24 Update legal.jade 2015-01-31 12:42:57 +00:00
Imperadeiro98
7cb2a9403b Using .spr and .spl
Also removed an image that was not working
2015-01-31 12:35:02 +00:00
Imperadeiro98
24529d0d7c Update legal.sass 2015-01-31 12:11:09 +00:00
Rishi
106d5f640e Update hero-victory-modal.sass 2015-01-31 17:40:34 +05:30
Imperadeiro98
d99e790df1 Fixed last merge issue 2015-01-31 11:04:11 +00:00
Imperadeiro98
3db3b0790c Merge pull request #2177 from negesti/patch-2
Update de-DE.coffee
2015-01-31 11:03:48 +00:00
sotonin
751ae0fac8 Adding support for hudName property 2015-01-31 00:07:23 -06:00
Nick Winter
e59f2bcc62 Recording scores even for non-real-time-submit levels. 2015-01-30 22:06:22 -08:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Matt Lott
a092444455 Add browser info to level session 2015-01-30 14:45:36 -08:00
Nick Winter
848341dbd1 I guess I'll be finding these for a while. 2015-01-30 11:24:48 -08:00
Matt Lott
58f8eb6688 Add support for premium video tutorials 2015-01-30 10:48:49 -08:00
negesti
1eeeb25315 Update de-DE.coffee 2015-01-30 19:32:50 +01:00
Nick Winter
f78ea3d786 Yaaaaay 2015-01-30 09:40:46 -08:00
Nick Winter
2571b41cca Found another one, missed due to insufficient grep-fu. 2015-01-30 09:24:07 -08:00
Nick Winter
9ca2663e0e Fixed one more instance of the previous bug. 2015-01-30 08:12:34 -08:00
Nick Winter
36fcd1bb79 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-30 07:52:09 -08:00
Nick Winter
77cca7189f Updated a bunch of code that got busted with CoffeeScript 1.9.0. 2015-01-30 07:51:57 -08:00
Imperadeiro98
ad05ddc221 Fixed merge issues 2015-01-30 15:33:53 +00:00
Imperadeiro98
32dc5fdc34 Merge pull request #2176 from jacobakkerboom/patch-1
Update nl-NL.coffee,
2015-01-30 15:30:32 +00:00
Imperadeiro98
cd7f09e626 Merge pull request #2172 from JulR43/patch-1
Update fr.coffee
2015-01-30 15:29:23 +00:00
Jacob
6e08e5406e Update nl-NL.coffee,
Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. 

I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits.
2015-01-30 12:42:27 +01:00
Nick Winter
39ad9b8e35 Show hero unlocks in campaign editor, too. 2015-01-29 19:29:37 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
fd0e7a8c44 Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players. 2015-01-29 18:19:03 -08:00
Matt Lott
92f070ecca Fix help video events
Removing the protocol broke the video player event hooks.
2015-01-29 16:45:18 -08:00
Nick Winter
5addacddf0 First draft of ParticleMan particle emitters for showing hidden levels in CampaignView. 2015-01-29 16:11:13 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
JulR43
0c1897bbb3 Update fr.coffee
Several translates
2015-01-29 16:56:37 +00:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Imperadeiro98
239b72dd01 Merge pull request #2169 from scenix007/patch-1
add some translation for tips
2015-01-29 16:17:34 +00:00
Jhoon Saravia
8325d522fb Finished translations on tips 2015-01-29 08:57:29 -05:00
Long Shao
14af5c309d add some translation for tips
Update zh-HANS.coffee : add some translation for tips
2015-01-29 18:13:10 +08:00
Nick Winter
a6043ca1be Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-28 17:59:11 -08:00
Nick Winter
22070ddff2 Identifying lastLevel to Segment. Added Ogre Headhunter names. 2015-01-28 17:58:56 -08:00
Nick Winter
f9d2a06379 Merge pull request #2168 from yaur/master
Fix windows build
2015-01-28 17:52:49 -08:00
Matt Lott
8b51c3cb5d Stop subscribe modal A/B test
Group A (original) wins.
2015-01-28 16:20:10 -08:00
yaur
dc39a55cf8 remove logging 2015-01-28 18:37:07 -05:00
yaur
30f9188090 Remove the scheme from help videos so that they maintain the scheme of the
calling page
2015-01-28 18:33:28 -05:00
nixel2007
1ff5832436 fix ru.coffee 2015-01-28 22:07:19 +03:00
nixel2007
d086555fb7 Update ru.coffee 2015-01-28 21:50:16 +03:00
Imperadeiro98
354a7cb71b Merge pull request #2160 from rsiwady29/spanish_translations
Update es-419.coffee
2015-01-28 18:18:35 +00:00
Imperadeiro98
8cf424f7ef Update pt-PT.coffee 2015-01-28 18:16:34 +00:00
Nick Winter
bf3c997d9d Merge pull request #2139 from katemamba/long-name
#2125 Long player names overflow
2015-01-28 08:56:26 -08:00
Richard Siwady
8d001a6281 Update spanish translations for es-419 2015-01-28 00:12:40 -06:00
Richard Siwady
7cb6791a58 Fixed lua_blurb es-419 translation. 2015-01-27 23:16:08 -06:00
Nick Winter
5f8ec2b21b Propagated i18n. 2015-01-27 20:36:40 -08:00
Nick Winter
7cb92136cc Added some Skeleton names. 2015-01-27 18:04:07 -08:00
divyanshu013
cfdbabb576 Added some quotes for #710 2015-01-27 21:53:37 +05:30
Nick Winter
2e09a94736 Asking for feedback when cancelling subscriptions. 2015-01-26 16:48:32 -08:00
Matt Lott
019406a341 Update campaign analytics
Increase line graph dots for larger hover targets.
Update missing day data handling to fill in graph points for any
missing day, not just most recent end days.
Fix level completion div0 bug.
2015-01-26 14:58:38 -08:00
Nick Winter
e41652730d Don't warn about missing misc System. 2015-01-26 14:51:04 -08:00
Matt Lott
24f8029aff 🐛Fix campaign editor analytics
Line graph checkboxes need their own labels.
2015-01-26 13:36:07 -08:00
Matt Lott
48a8ed109d Update campaign editor analytics
Add line graphs to level view.
2015-01-26 13:19:10 -08:00
divyanshu013
59df5a2a8c Added some names for #53 2015-01-27 01:21:04 +05:30
Imperadeiro98
462b60191f Don't force https 2015-01-25 18:56:30 +00:00
Imperadeiro98
19c03952e1 Merge pull request #2129 from chess9876543210/patch-1
Propagated i18n.
2015-01-25 18:34:44 +00:00
Pavan Kate
2004e91e38 #2125 Long player names overflow 2015-01-25 06:03:41 +05:30
Imperadeiro98
8acb5a5ac8 Update teachers.jade 2015-01-24 12:44:06 +00:00
jmigual
5e58986e75 Added some translations 2015-01-23 22:12:18 +01:00
Nick Winter
8f4b3cb85f Deleted unneeded campaign label. 2015-01-22 16:33:35 -08:00
Nick Winter
e3bf8f74ab Trying to stagger LevelSessions saves on wins on replayable levels to see if that might help #2108 at all. 2015-01-22 12:26:37 -08:00
Imperadeiro98
0d00917ca0 Fixed order 2015-01-22 19:28:17 +00:00
Imperadeiro98
ca792b1edc Merge pull request #2133 from nixel2007/master
Update ru.coffee
2015-01-22 19:26:49 +00:00
Nick Winter
64008276c2 Finally translating level names and descriptions in the campaign view. 2015-01-22 11:22:35 -08:00
nixel2007
6b5c69f889 ru.coffee - small fix 2015-01-22 22:16:37 +03:00
nixel2007
44c97428e3 Update ru.coffee 2015-01-22 22:14:56 +03:00
Imperadeiro98
bb0a820638 Update pt-PT.coffee 2015-01-22 19:04:41 +00:00
Nick Winter
e49a70a62e Fixed mountain map background ratio. 2015-01-22 10:48:41 -08:00
Nick Winter
9e496fa9d0 Propagated i18n. 2015-01-22 10:45:51 -08:00
Nick Winter
9b1923d943 Merge pull request #2119 from AdnanZahid/patch-2
Added 6 new tips for the loading screen
2015-01-22 10:44:32 -08:00
Nick Winter
d24469d8ce Merge pull request #2118 from AdnanZahid/patch-1
Added 6 new tips for the loading screen
2015-01-22 10:44:22 -08:00
Nick Winter
ccf4f0180e Resolved ca.coffee merge conflicts. 2015-01-22 10:42:04 -08:00
Imperadeiro98
76906a15fc Uncommented an header 2015-01-22 16:28:27 +00:00
Imperadeiro98
4a45b5290e Merge pull request #2132 from z3t1/patch-1
Translation of several pharses
2015-01-22 16:27:31 +00:00
Imperadeiro98
45f4ae9e42 Merge pull request #2131 from probil/patch-1
Update Ukrainian l18n
2015-01-22 16:24:25 +00:00
z3t1
1e5ef588d8 Translation of several pharses 2015-01-21 20:56:13 -05:00
Matt Lott
3f40364616 Update campaign editor analytics
Add date range picker to level view.
2015-01-21 16:03:50 -08:00
Maks Lyashuk
82bc526bd7 Update Ukrainian l18n
Translated some new lines
2015-01-22 00:17:03 +02:00
Matt Lott
e49c74259b Update campaign editor analytics
Adding shown and purchased subscription counts.
Locking down analytics to admin-only.
2015-01-21 13:41:38 -08:00
Matt Lott
6b271799be Update level loading view sub event data
Sending level slug instead of name.
2015-01-21 13:41:38 -08:00
chess
a118a7cf75 i18 update
old non abonement text replaced with new version
2015-01-21 21:28:53 +01:00
Nick Winter
7dd128780f Unlocking all audition levels in Auditions campaign. 2015-01-21 11:49:56 -08:00
Matt Lott
3c36d1cc06 Update campaign editor analytics
Adjust level completion line graph stroke-weight based on daily started
count in campaign overview.
2015-01-20 16:04:02 -08:00
Matt Lott
d51eddef29 Update campaign editor analytics
Double-click level row in overview to open level details view.
2015-01-20 15:02:24 -08:00
Matt Lott
ffb59d5cec Disable prod admin internal analytics tracking 2015-01-20 14:18:31 -08:00
Imperadeiro98
25f01db701 Merge pull request #2116 from McGiogen/patch-1
Added some simple translations all over the file
2015-01-20 20:40:17 +00:00
Matt Lott
f38a67b96a Update campaign editor analytics
Add playtime bar graphs.
2015-01-20 11:43:13 -08:00
Matt Lott
d368e3ffd8 Fix campaign editor analytics
Dividing by zero for level completion spark lines in campaign overview
analytics modal.
2015-01-20 11:14:50 -08:00
Matt Lott
7fda59ee2d Update campaign editor analytics
Adding help click counts and help videos start counts to level view
analytics.
2015-01-20 10:43:02 -08:00
Matt Lott
d0a0c95623 Update campaign editor analytics
Display little level completion line graphs in the level completion
table cells.
2015-01-19 21:59:25 -08:00
Matt Lott
499e7c2999 Update campaign editor analytics
Color in level name based on number of users remaining.
2015-01-19 15:21:42 -08:00
Imperadeiro98
e00e699e6f Update pt-PT.coffee 2015-01-19 20:50:08 +00:00
Imperadeiro98
7e7945fc04 Activated some translations 2015-01-19 20:30:05 +00:00
Marielle Bannink
41239494e5 Update nl-NL.coffee
Added some translations to the file
2015-01-19 20:33:51 +01:00
Adnan Zahid
f46160fff9 Added 6 new tips for the loading screen (Also written in level_loading.jade)
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:12:21 +05:00
Adnan Zahid
375d388fe3 Added 6 new tips for the loading screen
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:06:29 +05:00
Matt Lott
05f028d944 Update campaign editor analytics
Adding ‘left game’ counts to overall campaign view.  This is the number
of players that left the game after playing the given level.
2015-01-18 16:29:47 -08:00
McGio
6473c7e94a Added some simple translations all over the file 2015-01-18 16:56:35 +01:00
nixel2007
19802cd0c5 Update ru.coffee 2015-01-18 00:44:31 +03:00
Imperadeiro98
c12d10a06b Fixed some issues 2015-01-17 18:54:34 +00:00
Shuyu Zhang
1bc4846c5e Update zh-HANS.coffee 2015-01-17 10:14:45 -08:00
Imperadeiro98
165582a55c Some fixes 2015-01-17 10:19:31 +00:00
Imperadeiro98
95d2d36129 Merge pull request #2110 from noiseorigin/patch-1
Update zh-HANS.coffee
2015-01-17 10:17:03 +00:00
Shuyu Zhang
13ad53ee04 Update zh-HANS.coffee 2015-01-17 00:06:04 -08:00
Nick Winter
706b2ca930 Don't includeFlow for Thangs with skipProtectAPI on, because we don't care about their flow anyway (non-read-write custom Programmables). 2015-01-16 18:47:30 -08:00
Matt Lott
d532d9fe6e Add date picker to campaign editor analytics
Only for overall campaign editor analytics.  Still need to add date
pickers to individual level views.
Moving campaign editor analytics to its own modal to support reloading
with new dates.
The date picker widget works poorly, but you can type in dates if
necessary.
Also moving analytics button up into the top right header, with a
little stats glyph icon.
2015-01-16 15:44:28 -08:00
Shuyu Zhang
1039afc85b Update zh-HANS.coffee 2015-01-16 15:03:04 -08:00
Shuyu Zhang
e46c6828b9 Update zh-HANS.coffee 2015-01-16 14:34:24 -08:00
Imperadeiro98
974c9e538d Update add-thang-components-modal.jade 2015-01-16 21:08:32 +00:00
Imperadeiro98
91515ef5a1 Update pt-PT.coffee 2015-01-16 20:58:17 +00:00
Imperadeiro98
699a15919c Update loading-error.jade 2015-01-16 20:55:20 +00:00
Nick Winter
3051dc32fa Propagated i18n. 2015-01-16 12:53:14 -08:00
Imperadeiro98
feae3694f7 Update en.coffee 2015-01-16 20:52:55 +00:00
Imperadeiro98
653263a069 Update save-version-modal.jade 2015-01-16 20:52:47 +00:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00
Imperadeiro98
08b5f0cc27 Update thang-components-edit-view.jade 2015-01-16 20:37:41 +00:00
Imperadeiro98
5981399a43 Update en.coffee 2015-01-16 20:37:32 +00:00
Nick Winter
fefc962c3c Added Mountain terrain type. 2015-01-15 17:10:52 -08:00
Matt Lott
770d3f5229 Add playtimes to overall campaign editor analytics 2015-01-15 16:07:26 -08:00
Matt Lott
e67532cf5d Mark top3 and bottom3 levels in campaign analytics 2015-01-15 15:19:16 -08:00
Imperadeiro98
5edc8543e5 Update en.coffee 2015-01-15 20:01:11 +00:00
Imperadeiro98
b6cf226a67 Update patch_modal.jade 2015-01-15 20:01:09 +00:00
Nick Winter
d69e9c43df Merge pull request #2105 from Imperadeiro98/master
Update campaign-view.jade
2015-01-15 11:34:07 -08:00
Matt Lott
116c7d0bf2 Update internal analytics
Adding level session ID where applicable.
Slimming down fields for most common events.
2015-01-15 11:04:52 -08:00
Imperadeiro98
f403c9d3e6 Update en.coffee 2015-01-15 18:36:16 +00:00
Imperadeiro98
ea07cfdd62 Update campaign-view.jade 2015-01-15 18:35:38 +00:00
Imperadeiro98
1ab2ea6910 Update pt-PT.coffee 2015-01-15 18:00:00 +00:00
Nick Winter
a329de6d90 Propagated i18n. 2015-01-15 09:37:08 -08:00
Imperadeiro98
e6234b0771 Update en.coffee 2015-01-15 17:34:49 +00:00
Imperadeiro98
fa3d8a2dd0 i18n duplicate strings 2015-01-15 17:34:39 +00:00
Imperadeiro98
ab2d3fbb10 i18n a title 2015-01-15 17:34:14 +00:00
Imperadeiro98
12be17ebd6 Update pt-PT.coffee 2015-01-15 17:11:37 +00:00
Nick Winter
e50b6f508c Propagated i18n. 2015-01-15 09:08:13 -08:00
Nick Winter
38297a1fd7 Fixed problem with levels that don't have next levels in campaign editor. 2015-01-15 09:07:47 -08:00
Imperadeiro98
b0d00ce213 Added generate terrain stuff 2015-01-15 17:07:11 +00:00
Imperadeiro98
16ad0de722 Removed spaces 2015-01-15 17:06:36 +00:00
enricpc
9dc45bdf45 Update ca.coffee 2015-01-15 09:44:27 +01:00
Matt Lott
c5977c00fe Add shortened fields to analytics.log.event
We’ll remove the old long fields after we’ve got enough data to switch
over our analytics queries without complication.
2015-01-14 17:51:34 -08:00
Matt Lott
10dc0c4794 Enable Google+ on login modal for IE 2015-01-14 14:16:08 -08:00
Scott Erickson
3c02f14f95 Reworking PlayHeroesModal to use Lanks and LayerAdapter to control hero animations. 2015-01-14 14:10:33 -08:00
Matt Lott
e79cadc761 Remove analytics.log.event created field
_id field already has created data:
http://docs.mongodb.org/manual/reference/object-id/
Also some misc analytics cleanup.
2015-01-14 13:03:02 -08:00
Matt Lott
140a93b453 Log world map and homepage events internally
Need these for conversion rates.
2015-01-14 11:09:56 -08:00
Matt Lott
3fd5f49220 Analytics data revamp
Add analytics per-day aggregation collection.
Add analytics strings collection.
Add per-day aggregation mongo insertion script.
Update campaign editor to use aggregation collection.
Update queries to use _id instead of created field.
2015-01-14 11:09:01 -08:00
Imperadeiro98
6b46e45526 Merge pull request #2097 from enricpc/patch-4
Update ca.coffee
2015-01-14 17:14:59 +00:00
Imperadeiro98
c9f0a9ec07 Merge pull request #2096 from RubenDjOn/master
Added new es-ES translations
2015-01-14 17:13:23 +00:00
enricpc
6bb3a77dad Update ca.coffee 2015-01-14 15:46:28 +01:00
RubenDjOn
ddec7b7f5a Added new es-ES translations 2015-01-14 00:53:05 +01:00
Scott Erickson
afe590c5cc Hid the misc tab until you have unlocked defense of plainswood, and by extension, the forest. 2015-01-13 15:34:06 -08:00
Imperadeiro98
6993f52740 Corrected indentation 2015-01-13 21:45:52 +00:00
Imperadeiro98
68bc4e1c39 Tried to make i18n work 2015-01-13 21:38:34 +00:00
Imperadeiro98
7f645ce019 Update pt-PT.coffee 2015-01-13 21:18:22 +00:00
Nick Winter
268f5a5b0d Propagated i18n. 2015-01-13 13:10:39 -08:00
Imperadeiro98
6491105f68 Update save-campaign-modal.jade 2015-01-13 20:06:53 +00:00
Imperadeiro98
12ada4f30c Update campaign-editor-view.jade 2015-01-13 20:04:49 +00:00
Nick Winter
beb61ba8d4 Merge pull request #2094 from rishiloyola/patch-6
Update spell_palette_entry.sass
2015-01-13 11:06:50 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Rishi
8a4b6eebf4 Update spell_palette_entry.sass 2015-01-13 15:30:37 +05:30
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
Nick Winter
38948137b9 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-12 14:43:53 -08:00
Nick Winter
382e10dbb4 Fixed missing ] in names.coffee. 2015-01-12 14:43:33 -08:00
Scott Erickson
5cb8f14065 Fixed the HeroVictoryModal handling of earned achievements which were earned a while ago. Before they were appearing as if achievements were always newly achieved. 2015-01-12 14:43:29 -08:00
Popey456963
9ecb2822c0 Removed Duplicates 2015-01-12 20:18:35 +00:00
Popey456963
8d1ae770cb Added bunch of soldier names to names.coffee
Title pretty much says it all.
2015-01-12 20:04:22 +00:00
Imperadeiro98
8480fe7836 Update names.coffee 2015-01-12 19:35:37 +00:00
Nick Winter
7230f96daa Fixed syntax errors on names.coffee from #2089. 2015-01-12 10:49:55 -08:00
Nick Winter
1f377cf7ee Merge pull request #2089 from popey456963/master
Ordered names by alphabetical order
2015-01-12 10:49:06 -08:00
Popey Gilbert
bd14892cf2 Ordered names by alphabetical order
So that it is easier to see whether the names are in order or not.
2015-01-12 11:58:11 +00:00
Nick Winter
ea2392b2fe Removed buildTime annoyance from level save diffs. 2015-01-11 10:10:55 -08:00
Nick Winter
778647bf19 Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things. 2015-01-11 10:04:24 -08:00
Imperadeiro98
a9682a8cbe Update ladder-tab-view.jade 2015-01-10 22:52:41 +00:00
RubenDjOn
a8542d8f7f New es.ES translations 2015-01-10 22:32:50 +01:00
Nick Winter
5c352699b0 buildTime stuff. 2015-01-10 09:33:41 -08:00
Imperadeiro98
b5103aaa49 Merge pull request #2075 from 182mick44/patch-1
File revision.
2015-01-10 11:19:43 +00:00
Ivan Milanov
d8c5ecbbf8 Added new translations 2015-01-09 22:35:00 +01:00
Scott Erickson
82eb47bf5f Fixed #1056. 2015-01-09 12:56:48 -08:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Miguel
f46df1de34 File revision.
There were many errors, attending grammar and ortography. Now everything is more or less correct.
2015-01-09 20:57:19 +01:00
Matt Lott
29c6b7c9f1 Prune internal analytics event data 2015-01-09 09:27:33 -08:00
Imperadeiro98
83efcb5113 Some spacing corrections 2015-01-09 15:00:38 +00:00
Imperadeiro98
3ec86b3e14 Merge pull request #2070 from steveshining/master
I hope this commit could be helpful
2015-01-09 14:59:49 +00:00
Imperadeiro98
2563c5b896 Merge pull request #2074 from nixel2007/master
Update ru.coffee
2015-01-09 14:58:29 +00:00
Imperadeiro98
b8e995c72b Merge pull request #2072 from RubenDjOn/master
Added es-ES translations
2015-01-09 14:55:38 +00:00
Nick Winter
3900af043d Added an es-419 Diplomat. 2015-01-08 20:49:18 -08:00
nixel2007
f65c464eb1 small fix 2015-01-09 05:40:11 +03:00
nixel2007
5b089c29d5 Update ru.coffee 2015-01-09 05:37:16 +03:00
RubenDjOn
6dd39dd99b Added es-ES translations 2015-01-09 01:19:28 +01:00
Matt Lott
8977450fed Add levelID to Saw Victory analytics event 2015-01-08 16:09:39 -08:00
Matt Lott
bc93a2b181 Update campaign editor analytics
Restrict level view completion rates to unique users. Super slow, perf
work to do here.
Increase level view completion rate date range to 2 weeks.
Increase level view average playtimes date range to 2 weeks.
Display player name if available in level view recent sessions.
2015-01-08 16:01:49 -08:00
Scott Erickson
d69c5941b3 Fixed #1968. 2015-01-08 11:57:31 -08:00
Nick Winter
04e0624268 Possible hacky workaround for #2068. 2015-01-08 11:42:42 -08:00
Scott Erickson
d8e89f31b1 Fixed #1967. 2015-01-08 11:29:10 -08:00
Nick Winter
c1d9a5ae13 Merge pull request #2066 from GeetikaBatra/patch-1
Added soldiers,librarian and ninja
2015-01-08 08:13:00 -08:00
Nick Winter
fbcbfc7368 Merged nl-BE.coffee. 2015-01-08 08:04:15 -08:00
izumi
6a6102fd75 I hope this commit could be helpful
Your guys realy do a great job!
2015-01-08 17:09:33 +08:00
Nick Winter
d66243ad75 Beating replayable levels now shows you the proper gems and xp. 2015-01-07 18:36:02 -08:00
Scott Erickson
aeebee891e Added 'submitting...' text to the i18n translation form button to show when a submission is successful. 2015-01-07 16:15:26 -08:00
Scott Erickson
c235b1cc15 The noty error for server errors now shows more detailed info. 2015-01-07 16:02:52 -08:00
Scott Erickson
2a4f997b1d Fixed registration point scaling for vector portraits, so they match their raster versions. 2015-01-07 15:11:43 -08:00
Matt Lott
c54fea929e Update campaign editor analytics
Optimize analytics.log.event user event data find() to use stream()
instead of exec(), which is better for large result sets
Fix startDay formatting bug
Per-level recent sessions to 100
2015-01-07 14:49:24 -08:00
Imperadeiro98
b47fc93912 Update ambassador.jade 2015-01-07 21:45:36 +00:00
Imperadeiro98
3c51d4d014 Update scribe.jade 2015-01-07 21:45:11 +00:00
Imperadeiro98
2a3892a572 Removed unnecessary titles 2015-01-07 21:44:05 +00:00
Nick Winter
1455dc0550 Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet. 2015-01-07 12:25:43 -08:00
Geetika Batra
1480baf000 Added soldiers,librarian and ninja 2015-01-07 22:56:27 +05:30
Imperadeiro98
a0a8b2a961 Merge pull request #2064 from Kindleme/patch-2
Update zh-HANS.coffee
2015-01-07 17:14:04 +00:00
Imperadeiro98
41080daaad Merge pull request #2063 from RubenDjOn/master
Added es-ES translations.
2015-01-07 17:09:43 +00:00
Kindleme
ac46e65ec9 Update zh-HANS.coffee 2015-01-07 18:24:50 +08:00
Nick Winter
4ea2a51ff6 In middle of debugging non-functioning repeatable achievements. 2015-01-06 21:32:58 -08:00
RubenDjOn
ac4925b2da Added es-ES translations. 2015-01-07 01:08:53 +01:00
Imperadeiro98
9a6933023c Update patches.jade 2015-01-06 21:22:20 +00:00
Imperadeiro98
c0c0ecace7 Update en.coffee 2015-01-06 21:22:13 +00:00
Nick Winter
9a3f18e60a Save more UserCodeProblems and LevelSessions. 2015-01-06 13:03:09 -08:00
Nick Winter
677ba56ce9 Make sure to save level sessions after difficulty increase. 2015-01-06 12:40:24 -08:00
Matt Lott
36921f7644 Fix IE9 script loading
Script tags weren’t loading sequentially.

IE9 doesn’t support the defer attribute:
https://github.com/h5bp/lazyweb-requests/issues/42
Conditional comments:
http://msdn.microsoft.com/en-us/library/ms537512%28v=vs.85%29.aspx
Breaking change:
https://github.com/codecombat/codecombat/commit/b698745e0505857ef8a21de9
fa2729ff5ab473ce
2015-01-06 10:53:32 -08:00
Imperadeiro98
54f8adb1cc Update pt-PT.coffee 2015-01-06 16:58:19 +00:00
Nick Winter
ab82bd972b Propagated i18n. 2015-01-06 08:01:42 -08:00
nixel2007
364e6c8617 Update ru.coffee
Sync to en.
2015-01-06 18:37:29 +03:00
Imperadeiro98
f723a2d5e9 Removed unnecessary title 2015-01-06 15:11:37 +00:00
Imperadeiro98
704f9e41e1 Merge pull request #2025 from A-Man/master
Added more names for #53
2015-01-06 14:37:08 +00:00
Nick Winter
9272ceb23e Trying to restore functionality of achievement plugin but without memory leak. 2015-01-05 21:57:23 -08:00
Nick Winter
45b90804ec Noting some TODOs to fix soon. 2015-01-05 20:49:59 -08:00
Nick Winter
ac525c53b5 Merge pull request #2056 from Imperadeiro98/patch-1
Trying to i18n
2015-01-05 17:39:46 -08:00
Imperadeiro98
19756b3be2 Update LevelEditView.coffee 2015-01-05 23:49:47 +00:00
Matt Lott
1a401230f4 Add recent sessions to campaign editor analytics
In level view.  Shows latest 10, and you can double-click them to open
in modalmodal.
2015-01-05 15:40:28 -08:00
Scott Erickson
ffc33279b8 Made i18n coverage more strict about making sure every property that needs to be translated is translated. 2015-01-05 15:33:20 -08:00
Imperadeiro98
b6de218fa1 Fixed typo 2015-01-05 23:14:44 +00:00
Scott Erickson
ba1ffe194c Deferring user creation until after the client app loads, to try and lower the massive number of anonymous users that are created. 2015-01-05 14:43:20 -08:00
Imperadeiro98
fb29bfa71e Merge pull request #2057 from RubenDjOn/master
Added es-ES translations
2015-01-05 22:14:29 +00:00
RubenDjOn
0bb220de81 Added es-ES translations 2015-01-05 22:55:07 +01:00
Matt Lott
b4a0fe146e Add common user code problems to campaign editor
In level view, showing data from last 30 days, with top 20 issues by
count.
2015-01-05 13:42:19 -08:00
Imperadeiro98
45b553fbcb Update en.coffee 2015-01-05 20:24:49 +00:00
Imperadeiro98
029b28853f Update LevelEditView.coffee 2015-01-05 20:24:42 +00:00
Imperadeiro98
9c0d992868 Update edit.jade 2015-01-05 20:19:46 +00:00
Imperadeiro98
0df9de551c Fixed last commit issues 2015-01-05 19:51:07 +00:00
Imperadeiro98
b7a7bb2c23 Merge pull request #2054 from Apoc-/patch-2
Update de-DE.coffee
2015-01-05 19:48:02 +00:00
Imperadeiro98
4a351e99e6 Uncommented translation 2015-01-05 19:34:56 +00:00
Imperadeiro98
e639a62085 Fixed errors from last commit 2015-01-05 19:26:23 +00:00
Imperadeiro98
97cce946eb Merge pull request #2053 from divaDseidnA/patch-7
Update hu.coffee
2015-01-05 19:25:13 +00:00
Imperadeiro98
0d8834da95 Merge pull request #2047 from Kindleme/patch-1
Update zh-HANS.coffee
2015-01-05 19:22:34 +00:00
Imperadeiro98
a3c624b061 Uncommented translation 2015-01-05 19:19:45 +00:00
Imperadeiro98
d01738755c Merge pull request #2051 from SuperPranx/patch-1
Additions and modifications
2015-01-05 19:19:01 +00:00
Imperadeiro98
7c6115ba9b Merge pull request #2050 from RubenDjOn/master
Added one translation to Spanish (es-ES). Testing github pull request.
2015-01-05 19:15:12 +00:00
Imperadeiro98
f0ffb2d576 Uncommented header 2015-01-05 19:13:15 +00:00
Imperadeiro98
d6e1902278 Merge pull request #2055 from StijnBerendse/master
Update nl-NL.coffee
2015-01-05 19:12:01 +00:00
Nick Winter
947811c01b Replayable once-per-day increasing-difficulty level basics. 2015-01-05 10:44:24 -08:00
Matt Lott
61180c640d Add completion % to campaign analytics 2015-01-05 10:28:56 -08:00
StijnBerendse
dc6995059e Update nl-NL.coffee 2015-01-05 18:33:06 +01:00
Apoc-
25b689f678 Update de-DE.coffee
Finished translation, added some remarks to words / phrases who cannot be translated directly
Fixed some translation errors
2015-01-05 14:22:00 +01:00
David Nagy
13f3f5d3af Update hu.coffee 2015-01-05 12:51:57 +00:00
Ivan Milanov
d75c45baa0 Minor correction 2015-01-05 01:49:42 +01:00
Ivan Milanov
b90d08a64d Additions and modifications
Added new translations and made minor modifications to existing ones where the translation didn't make sense in the context required.
2015-01-05 01:45:36 +01:00
RubenDjOn
a88f991a72 Added one translation to Spanish (es-ES). Testing github pull request. 2015-01-04 23:19:43 +01:00
Scott Erickson
15be292573 Added a little focus styling to treemas in editors so it's easier to copy/paste. 2015-01-04 09:26:40 -08:00
Nick Winter
6ec7066309 Using a couple more percentage margins/paddings in spell palette. 2015-01-04 09:08:59 -08:00
Nick Winter
ca4d861bac Merge pull request #2045 from Imperadeiro98/master
Update spell_palette.sass
2015-01-04 09:06:51 -08:00
Omar S.
e117c56f10 Update es-419.coffee
Almost everything is done :D
2015-01-04 11:37:21 -05:00
Imperadeiro98
41deb10a0f Uncommented translations 2015-01-04 16:17:29 +00:00
Imperadeiro98
e4e8b9bccc Merge pull request #2046 from StijnBerendse/master
Update nl-NL.coffee
2015-01-04 16:12:44 +00:00
Scott Erickson
1446f77a17 Refactored away from having the underscore string library added to the String prototype. 2015-01-04 08:05:46 -08:00
Imperadeiro98
94a1b3c06f Fixed an error I made 2015-01-04 15:20:18 +00:00
Kindleme
734b91583b Update zh-HANS.coffee 2015-01-04 22:51:43 +08:00
StijnBerendse
587dfe4c5f Update nl-NL.coffee
Translated the rest of the Home, Login, Signup, and Recover portions.
2015-01-04 14:59:35 +01:00
Imperadeiro98
28744264c5 Update level-component-edit-view.jade 2015-01-04 13:20:43 +00:00
Imperadeiro98
00550adbc7 Update level-system-edit-view.jade 2015-01-04 13:18:52 +00:00
Imperadeiro98
c529c3d874 Update spell_palette.sass 2015-01-04 12:41:16 +00:00
Nick Winter
163cf50528 Fixed processing of default Programmable config. 2015-01-03 13:22:54 -08:00
Nick Winter
c2d74a812d Updates to require/restrict level logic. 2015-01-02 15:44:43 -08:00
Matt Lott
b5969e0abc Update campaign analytics level ordering
Reading campaign levels from database.  Assumes database order is
roughly progression order.
2015-01-02 13:31:50 -08:00
Omar S.
c68cad1556 Update es-419.coffee 2015-01-02 15:49:10 -05:00
Imperadeiro98
434c921cb9 Merge pull request #2040 from SuperPranx/patch-1
Added new translations and corrected existing ones
2015-01-02 20:46:53 +00:00
Nick Winter
f66afa1dc0 Trying latest sass-brunch (which happened to alphabetize our devDependencies.) Fixed bug with required/restricted items not showing up properly. Added quick links to open level editors from campaign editor. 2015-01-02 12:40:17 -08:00
Ivan Milanov
e7b80b0a01 Added new translations and corrected existing ones 2015-01-02 16:03:17 +01:00
Imperadeiro98
42166bf623 Merge pull request #2037 from flauta/patch-4
Update it.coffee
2015-01-02 11:59:59 +00:00
Nick Winter
bf9aa27e73 Added tasks view to Thang editor search. 2015-01-01 14:59:55 -08:00
Nick Winter
dbc42fb7e1 Added task system to Thang Editor. 2015-01-01 14:07:11 -08:00
Matt Lott
2d410fa57f Update editor analytics level completions
We have to grab all the level data at once, so we should cache it all
too.  Only the first level completions call should be uncached/slow.
2015-01-01 12:26:19 -08:00
Matt Lott
e65887ec79 Add campaign drop-offs analytics to editor 2015-01-01 12:01:51 -08:00
flauta
811fd89bfe Update it.coffee 2015-01-01 16:55:29 +01:00
Nick Winter
0e9f1e0370 Fixed #2036 (making it less likely that the mistake will ercur, anyway). 2014-12-31 16:55:14 -08:00
George Saines
b0056127af changing the xp icon in the play view 2014-12-31 15:23:33 -08:00
Matt Lott
56b4346556 Update average playtimes query to match level 2014-12-31 13:19:46 -08:00
Matt Lott
9b6d327c7f Add average playtimes to levels in campaign editor 2014-12-31 12:25:18 -08:00
Matt Lott
fcf5346aa3 Add completion rates to levels in campaign editor 2014-12-31 11:49:29 -08:00
Imperadeiro98
9d55be8ab1 Merge pull request #2033 from osanseviero/patch-19
Update es-419.coffee
2014-12-31 11:41:41 +00:00
Imperadeiro98
ee206f2428 Merge pull request #2032 from Martin005/patch-8
Update cs.coffee
2014-12-31 11:39:35 +00:00
Omar S.
9e8c344208 Update es-419.coffee
More more more
2014-12-30 23:29:14 -05:00
Omar S.
58499392e8 Update es-419.coffee
Upp to line 667
2014-12-30 20:22:00 -05:00
Nick Winter
9e9d69ec9b Removed try_it text (which was accidentally used in the wrong place anyway). 2014-12-30 16:24:31 -08:00
Martin005
cf72abd2a2 Update cs.coffee 2014-12-31 00:21:22 +01:00
Imperadeiro98
72be5c35f0 Fixed link 2014-12-30 21:38:07 +00:00
Ivan Milanov
62e3b6b733 Added and modified translations
- Added new translations
- Made modifications to existing translations after consulting a friend well versed in macedonian linguistics
2014-12-30 10:38:02 +01:00
Ivan Milanov
cac2a5b7fa Added translations in the 'play' segment 2014-12-30 07:36:16 +01:00
Anshuman
287817063b Added more names for #53 2014-12-30 10:39:35 +05:30
Nick Winter
c13922a2d8 Transferring voice range from Hero Placeholder to heroes. 2014-12-29 20:06:27 -08:00
Nick Winter
a5b5bb1085 Ctrl/cmd+click a level in campign editor to open level editor in new tab. 2014-12-29 13:22:35 -08:00
Nick Winter
728f726748 Fixed problem opening GameMenuModal when there are no help videos. 2014-12-29 13:04:03 -08:00
Nick Winter
1440584633 Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting. 2014-12-29 12:47:53 -08:00
Nick Winter
c54fd5ab4b Moved editors from PUT to POST so that version saving behavior is preserved and admins can PUT without saving new versions. 2014-12-29 09:14:43 -08:00
Nick Winter
d85bf8d59a Fixed disabled level logic. 2014-12-29 08:46:02 -08:00
Omar S.
d67a329cb9 Added submitter 2014-12-29 10:51:14 -05:00
Omar S.
a9875fd19d More translations
Up to 591 + some ones that were missing
2014-12-29 10:40:29 -05:00
Imperadeiro98
3b8fdecc18 Fixed a mistake 2014-12-29 15:38:26 +00:00
Ivan Milanov
0c43b21078 Added more translations 2014-12-29 14:33:06 +01:00
Imperadeiro98
6249427103 Added 'mk-MK' to diplomat page 2014-12-29 00:03:09 +00:00
Nick Winter
664003ec4a Propagated i18n. 2014-12-28 15:28:19 -08:00
Nick Winter
913de5dc8c Additional tweak for #2005. 2014-12-28 15:26:04 -08:00
Nick Winter
aba154fad9 Merge pull request #2004 from SuperPranx/master
Initial translation for Macedonian(mk_MK)
2014-12-28 15:25:58 -08:00
Nick Winter
f5678bd536 Merge pull request #2005 from Imperadeiro98/master
Fixed a issue
2014-12-28 15:20:53 -08:00
Nick Winter
448acbb6b5 Fixed a problem choosing heroes from within levels with new level options loading. 2014-12-28 15:18:34 -08:00
Imperadeiro98
9018e41c2c Fixed a issue 2014-12-28 22:43:08 +00:00
Ivan Milanov
b371de9503 Commented out non-translated parts 2014-12-28 23:23:20 +01:00
Nick Winter
588e0266af Fixed ordering problem I introduced with /play/ladder routes. 2014-12-28 13:55:20 -08:00
Nick Winter
fa9f3e2a61 Fixed typo in HeroVictoryModal. 2014-12-28 13:53:50 -08:00
Nick Winter
fb948b19cd Merged it.coffee and uncommented section headers. 2014-12-28 13:28:50 -08:00
Nick Winter
afa9b6c544 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-28 13:25:27 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Imperadeiro98
12b5969fde Merge pull request #1997 from MinecraftWidget/patch-1
Edits and Additions
2014-12-28 20:58:21 +00:00
Imperadeiro98
cef4a09abe Merge pull request #2002 from osanseviero/patch-6
Translated up to 470
2014-12-28 20:54:21 +00:00
Ivan Milanov
03e199c127 Translated lines 19-50
Only exception is the translation for 'nav.code' because I require further clarification on the context in which it is used here
2014-12-28 21:06:54 +01:00
Nick Winter
a9c1846e41 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-28 11:15:17 -08:00
Ivan Milanov
4b59f8e0c8 Initial translate of 'home' section (4-16) 2014-12-28 20:08:47 +01:00
Ivan Milanov
af2795b4e7 Created mk-MK.coffee
The contents were copied from 'en.coffee'.
This is the initial file with no translations, just the description is set to it's proper value.
Once the translation is done the comment "Translation not finished (work in progress)", should be removed.
2014-12-28 19:13:44 +01:00
Ivan Milanov
dbf2790ae9 Added 'mk-MK' description to locale.coffee 2014-12-28 19:05:30 +01:00
Omar S.
d676bc1ea3 Translated up to 470 2014-12-28 12:24:48 -05:00
nixel2007
45fe2ca9a2 Update ru.coffee
More translations after propagination
2014-12-28 01:32:18 +03:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Imperadeiro98
2f1f4d8594 Update pt-PT.coffee 2014-12-27 18:50:58 +00:00
Nick Winter
d9265c6624 Propagated i18n. 2014-12-27 10:39:44 -08:00
Imperadeiro98
b91f8eb927 Fixed last merge issues 2014-12-27 18:27:43 +00:00
MinecraftWidget
eb60d1b186 Minor Additions 2014-12-27 11:12:24 -07:00
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