Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonAlling committed Jun 3, 2016
2 parents 20a5837 + 2a38ad0 commit de50a39
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion js/Zatacka.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const Zatacka = ((window, document) => {
}),
defaultPlayers: Object.freeze([
{ id: 1, name: "Red" , color: "#FF2800", keyL: KEY["1"] , keyR: KEY.Q },
{ id: 2, name: "Yellow", color: "#C3C300", keyL: KEY.CTRL , keyR: KEY.ALT },
{ id: 2, name: "Yellow", color: "#C3C300", keyL: [ KEY.CTRL, KEY.Z ] , keyR: [ KEY.ALT, KEY.X ] },
{ id: 3, name: "Orange", color: "#FF7900", keyL: KEY.M , keyR: KEY.COMMA },
{ id: 4, name: "Green" , color: "#00CB00", keyL: KEY.LEFT_ARROW , keyR: KEY.DOWN_ARROW },
{ id: 5, name: "Pink" , color: "#DF51B6", keyL: [ KEY.DIVIDE, KEY.END, KEY.PAGE_DOWN ], keyR: [ KEY.MULTIPLY, KEY.PAGE_UP ] },
Expand Down

0 comments on commit de50a39

Please sign in to comment.