Ruben Vereecken
|
3fd396974d
|
Merge branch 'master' into achievements
Conflicts:
app/views/DemoView.coffee
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
server/users/User.coffee
|
2014-08-13 10:43:42 +02:00 |
|
Ruben Vereecken
|
9f0add22a5
|
Worked in a lot of changes Scott proposed
|
2014-08-08 11:54:53 +02:00 |
|
Ruben Vereecken
|
06ba50f5e2
|
Added user images
|
2014-08-05 18:58:37 +02:00 |
|
Ruben Vereecken
|
6267352c6e
|
Drastically changed the way achievements get grayscaled
|
2014-08-04 15:29:46 +02:00 |
|
Ruben Vereecken
|
7987e1d05b
|
Did a bunch related to achievements and user profile page
|
2014-07-28 20:04:44 +02:00 |
|
Ruben Vereecken
|
a8df3df095
|
Default image for achievements. Redid border logic
|
2014-07-28 15:14:11 +02:00 |
|
Ruben Vereecken
|
5dc54c784d
|
Added case and demo for user not found. Should be made prettier as soon as users can be queried by name
|
2014-07-09 18:13:22 +02:00 |
|
Ruben Vereecken
|
45798aab02
|
added images for achievements! Demo is now operational
|
2014-07-04 19:27:37 +02:00 |
|