codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 11:27:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-08-28 11:24:08 -07:00
commit ea28d2a93b
6 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/services/facebook.coffee
View file

@ -17,7 +17,7 @@ module.exports = initializeFacebook = ->
if response.status is 'connected' if response.status is 'connected'
# They have logged in to the app. # They have logged in to the app.
Backbone.Mediator.publish 'facebook-logged-in', response: response Backbone.Mediator.publish 'auth:logged-in-with-facebook', response: response
else if response.status is 'not_authorized' else if response.status is 'not_authorized'
# #

2
app/lib/surface/Surface.coffee
View file

@ -424,7 +424,7 @@ module.exports = Surface = class Surface extends CocoClass
oldHeight = parseInt @canvas.attr('height'), 10 oldHeight = parseInt @canvas.attr('height'), 10
aspectRatio = oldWidth / oldHeight aspectRatio = oldWidth / oldHeight
pageWidth = $('#page-container').width() - 17 # 17px nano scroll bar pageWidth = $('#page-container').width() - 17 # 17px nano scroll bar
if @realTime if @realTime or @options.spectateGame
pageHeight = $('#page-container').height() - $('#control-bar-view').outerHeight() - $('#playback-view').outerHeight() pageHeight = $('#page-container').height() - $('#control-bar-view').outerHeight() - $('#playback-view').outerHeight()
newWidth = Math.min pageWidth, pageHeight * aspectRatio newWidth = Math.min pageWidth, pageHeight * aspectRatio
newHeight = newWidth / aspectRatio newHeight = newWidth / aspectRatio

22
app/locale/pt-PT.coffee
View file

@ -126,8 +126,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
level_difficulty: "Dificuldade: " level_difficulty: "Dificuldade: "
play_as: "Jogar Como" play_as: "Jogar Como"
spectate: "Espectar" spectate: "Espectar"
# players: "players" players: "jogadores"
# hours_played: "hours played" hours_played: "horas jogadas"
contact: contact:
contact_us: "Contacte o CodeCombat" contact_us: "Contacte o CodeCombat"
@ -513,7 +513,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
toggle_grid: "Ativar/desativar a sobreposição da grelha." toggle_grid: "Ativar/desativar a sobreposição da grelha."
toggle_pathfinding: "Ativar/desativar a sobreposição do encontrador de caminho." toggle_pathfinding: "Ativar/desativar a sobreposição do encontrador de caminho."
beautify: "Embelezar o código ao estandardizar a formatação." beautify: "Embelezar o código ao estandardizar a formatação."
# maximize_editor: "Maximize/minimize code editor." maximize_editor: "Maximizar/minimizar o editor de código."
move_wizard: "Mover o seu Feiticeiro pelo nível." move_wizard: "Mover o seu Feiticeiro pelo nível."
admin: admin:
@ -910,7 +910,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
unknown: "Erro desconhecido." unknown: "Erro desconhecido."
resources: resources:
# sessions: "Sessions" sessions: "Sessões"
your_sessions: "As Suas Sessões" your_sessions: "As Suas Sessões"
level: "Nível" level: "Nível"
social_network_apis: "APIs das Redes Sociais" social_network_apis: "APIs das Redes Sociais"
@ -926,7 +926,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
patched_model: "Documento Fonte" patched_model: "Documento Fonte"
model: "Modelo" model: "Modelo"
system: "Sistema" system: "Sistema"
# systems: "Systems" systems: "Sistemas"
component: "Componente" component: "Componente"
components: "Componentes" components: "Componentes"
thang: "Thang" thang: "Thang"
@ -941,16 +941,16 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
source_document: "Documento Fonte" source_document: "Documento Fonte"
document: "Documento" document: "Documento"
sprite_sheet: "Folha de Sprite" sprite_sheet: "Folha de Sprite"
# employers: "Employers" employers: "Empregadores"
# candidates: "Candidates" candidates: "Candidatos"
candidate_sessions: "Sessões de Candidatos" candidate_sessions: "Sessões de Candidatos"
user_remark: "Observação do Utilizador" user_remark: "Observação do Utilizador"
# user_remarks: "User Remarks" user_remarks: "Observações de Utilizador"
versions: "Versões" versions: "Versões"
items: "Itens" items: "Itens"
# wizard: "Wizard" wizard: "Feiticeiro"
# achievement: "Achievement" achievement: "Conquista"
# clas: "CLAs" clas: "CLAs"
# play_counts: "Play Counts" # play_counts: "Play Counts"
delta: delta:

2
app/schemas/subscriptions/misc.coffee
View file

@ -22,7 +22,7 @@ module.exports =
'router:navigate': c.object {required: ['route']}, 'router:navigate': c.object {required: ['route']},
route: {type: 'string'} route: {type: 'string'}
view: {type: 'object'} view: {type: 'object'}
viewClass: {type: 'object'} viewClass: {type: 'function'}
viewArgs: {type: 'array'} viewArgs: {type: 'array'}
'achievements:new': c.object {required: 'earnedAchievements'}, 'achievements:new': c.object {required: 'earnedAchievements'},

7
app/styles/play/spectate.sass
View file

@ -38,17 +38,12 @@
margin: 0px auto margin: 0px auto
#canvas-wrapper #canvas-wrapper
height: 100% width: 100%
position: relative position: relative
margin: 0 auto margin: 0 auto
canvas#surface canvas#surface
background-color: #333 background-color: #333
max-height: 93%
max-height: -webkit-calc(100% - 60px)
max-height: calc(100% - 60px)
height: auto
max-width: 100%
display: block display: block
z-index: 1 z-index: 1
margin: 0 auto margin: 0 auto

2
app/templates/play/spectate.jade
View file

@ -3,7 +3,7 @@
.level-content .level-content
#control-bar-view #control-bar-view
#canvas-wrapper #canvas-wrapper
canvas(width=1848, height=1178)#surface canvas(width=924, height=589)#surface
#canvas-left-gradient.gradient #canvas-left-gradient.gradient
#canvas-top-gradient.gradient #canvas-top-gradient.gradient
#gold-view.secret.expanded #gold-view.secret.expanded