codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 10:56:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/campaign-editor

Browse source
This commit is contained in:
Scott Erickson 2014-12-22 16:39:07 -05:00
commit d18260c20c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/LevelOptions.coffee
View file

@ -107,7 +107,7 @@ module.exports = LevelOptions =
hidesRealTimePlayback: true hidesRealTimePlayback: true
requiredGear: {feet: 'simple-boots', 'right-hand': 'simple-sword', torso: 'tarnished-bronze-breastplate'} requiredGear: {feet: 'simple-boots', 'right-hand': 'simple-sword', torso: 'tarnished-bronze-breastplate'}
restrictedGear: {feet: 'leather-boots', 'programming-book': 'programmaticon-i'} restrictedGear: {feet: 'leather-boots', 'programming-book': 'programmaticon-i'}
'the-first-kithmaze': 'riddling-kithmaze':
hidesRunShortcut: true hidesRunShortcut: true
hidesHUD: true hidesHUD: true
hidesSay: true hidesSay: true

2
app/templates/contribute/diplomat.jade
View file

@ -17,7 +17,7 @@ block content
p p
span(data-i18n="contribute.diplomat_introduction_pref") span(data-i18n="contribute.diplomat_introduction_pref")
| So, if there's one thing we learned from the | So, if there's one thing we learned from the
a(href="blog.codecombat.com/post/64658141307/codecombat-in-y-combinator", data-i18n="contribute.diplomat_launch_url") a(href="http://blog.codecombat.com/post/64658141307/codecombat-in-y-combinator", data-i18n="contribute.diplomat_launch_url")
| launch in October | launch in October
span , span ,
span(data-i18n="contribute.diplomat_introduction_suf") span(data-i18n="contribute.diplomat_introduction_suf")