Michael Schmatz d8df61f94b Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder.jade		2014-05-19 19:43:47 -07:00
..
common	Rules wording tweaks; highlighting new matches and end of ranking with sounds.	2014-05-19 19:13:36 -07:00
ladder	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 19:43:47 -07:00
level	Added a status message to the goals view.	2014-05-19 16:36:45 -07:00
ladder_home.jade	Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view.	2014-05-19 11:58:53 -07:00
level.jade	Set up the goals view to be more hidden by default, and shows up on mouse hover.	2014-05-19 11:31:18 -07:00
spectate.jade	Brought the canvas size down again because it halves the FPS in Firefox at least.	2014-05-09 16:35:10 -07:00