Merge branch 'master' of https://github.com/codecombat/codecombat
Josh Callebaut
|
|
@ -25,7 +25,7 @@ before_script:
|
|||
- export DISPLAY=:99.0
|
||||
- sh -e /etc/init.d/xvfb start
|
||||
- "node index.js --unittest &"
|
||||
- "sleep 10" # to give node a chance to start
|
||||
- "sleep 15" # to give node a chance to start
|
||||
|
||||
script:
|
||||
- "./node_modules/karma/bin/karma start --browsers Firefox --single-run --reporters progress"
|
||||
|
|
|
|||
BIN
app/assets/docs/CodeCombatCoursesGettingStartedGuide.pdf
Normal file → Executable file
BIN
app/assets/docs/CodeCombatTeacherGuideCourse2.pdf
Normal file
|
Before 
(image error) Size: 979 B After 
(image error) Size: 917 B
|
|
Before 
(image error) Size: 4.3 KiB After 
(image error) Size: 2.6 KiB
|
|
Before 
(image error) Size: 4.4 KiB After 
(image error) Size: 2.5 KiB
|
|
Before 
(image error) Size: 4.3 KiB After 
(image error) Size: 2.2 KiB
|
|
Before 
(image error) Size: 1.7 KiB After 
(image error) Size: 1.2 KiB
|
|
Before 
(image error) Size: 29 KiB After 
(image error) Size: 22 KiB
|
|
Before 
(image error) Size: 27 KiB After 
(image error) Size: 16 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 9.1 KiB
|
|
Before 
(image error) Size: 12 KiB After 
(image error) Size: 6.1 KiB
|
|
Before 
(image error) Size: 12 KiB After 
(image error) Size: 8.5 KiB
|
|
Before 
(image error) Size: 12 KiB After 
(image error) Size: 5.8 KiB
|
|
Before 
(image error) Size: 10 KiB After 
(image error) Size: 7.2 KiB
|
|
Before 
(image error) Size: 10 KiB After 
(image error) Size: 5.2 KiB
|
|
Before 
(image error) Size: 15 KiB After 
(image error) Size: 11 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 7.2 KiB
|
|
Before 
(image error) Size: 6.8 KiB After 
(image error) Size: 4.5 KiB
|
|
Before 
(image error) Size: 5.6 KiB After 
(image error) Size: 3.9 KiB
|
|
Before 
(image error) Size: 8.3 KiB After 
(image error) Size: 7.2 KiB
|
|
Before 
(image error) Size: 9.6 KiB After 
(image error) Size: 8.8 KiB
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 1.2 KiB
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 619 B
|
|
Before 
(image error) Size: 6.9 KiB After 
(image error) Size: 4.2 KiB
|
|
Before 
(image error) Size: 8.7 KiB After 
(image error) Size: 5.8 KiB
|
|
Before 
(image error) Size: 7.8 KiB After 
(image error) Size: 5 KiB
|
|
Before 
(image error) Size: 8.8 KiB After 
(image error) Size: 8 KiB
|
|
Before 
(image error) Size: 7.1 KiB After 
(image error) Size: 4.6 KiB
|
|
Before 
(image error) Size: 4.2 KiB After 
(image error) Size: 2.4 KiB
|
|
Before 
(image error) Size: 3.5 KiB After 
(image error) Size: 2.3 KiB
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 705 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 705 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 810 B
|
|
Before 
(image error) Size: 3.7 KiB After 
(image error) Size: 1.4 KiB
|
|
Before 
(image error) Size: 3.1 KiB After 
(image error) Size: 1.4 KiB
|
|
Before 
(image error) Size: 4.1 KiB After 
(image error) Size: 2.3 KiB
|
|
Before 
(image error) Size: 3.7 KiB After 
(image error) Size: 2.5 KiB
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 810 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.2 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.4 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 705 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 705 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 704 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 1.3 KiB After 
(image error) Size: 703 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 811 B
|
|
Before 
(image error) Size: 3 KiB After 
(image error) Size: 227 B
|
|
Before 
(image error) Size: 3.5 KiB After 
(image error) Size: 2.8 KiB
|
|
Before 
(image error) Size: 3 KiB After 
(image error) Size: 194 B
|
|
Before 
(image error) Size: 5.1 KiB After 
(image error) Size: 3.8 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 174 B
|
|
Before 
(image error) Size: 4.4 KiB After 
(image error) Size: 3.3 KiB
|
|
Before 
(image error) Size: 3 KiB After 
(image error) Size: 231 B
|
|
Before 
(image error) Size: 3.9 KiB After 
(image error) Size: 2.8 KiB
|
|
Before 
(image error) Size: 3 KiB After 
(image error) Size: 217 B
|
|
Before 
(image error) Size: 3.6 KiB After 
(image error) Size: 2.6 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 165 B
|
|
Before 
(image error) Size: 3.9 KiB After 
(image error) Size: 2.8 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 163 B
|
|
Before 
(image error) Size: 2.8 KiB After 
(image error) Size: 2.3 KiB
|
|
Before 
(image error) Size: 3 KiB After 
(image error) Size: 197 B
|
|
Before 
(image error) Size: 3.8 KiB After 
(image error) Size: 3.1 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 157 B
|
|
Before 
(image error) Size: 2.3 KiB After 
(image error) Size: 2.1 KiB
|
|
Before 
(image error) Size: 2.8 KiB After 
(image error) Size: 132 B
|
|
Before 
(image error) Size: 3.5 KiB After 
(image error) Size: 2.8 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 218 B
|
|
Before 
(image error) Size: 3.3 KiB After 
(image error) Size: 2.5 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 188 B
|
|
Before 
(image error) Size: 4.1 KiB After 
(image error) Size: 3.2 KiB
|
|
Before 
(image error) Size: 3 KiB After 
(image error) Size: 254 B
|
|
Before 
(image error) Size: 2.7 KiB After 
(image error) Size: 2.5 KiB
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 170 B
|
|
Before 
(image error) Size: 2.6 KiB After 
(image error) Size: 2.1 KiB
|
|
Before 
(image error) Size: 7.5 KiB After 
(image error) Size: 3.1 KiB
|
|
Before 
(image error) Size: 662 B After 
(image error) Size: 443 B
|
|
Before 
(image error) Size: 1.8 KiB After 
(image error) Size: 1.4 KiB
|
|
Before 
(image error) Size: 110 KiB After 
(image error) Size: 76 KiB
|
|
Before 
(image error) Size: 11 KiB After 
(image error) Size: 7.2 KiB
|
|
Before 
(image error) Size: 15 KiB After 
(image error) Size: 14 KiB
|
|
Before 
(image error) Size: 5.5 KiB After 
(image error) Size: 3.5 KiB
|
|
Before 
(image error) Size: 2.5 KiB After 
(image error) Size: 2.4 KiB
|
|
Before 
(image error) Size: 76 KiB After 
(image error) Size: 68 KiB
|
|
Before 
(image error) Size: 44 KiB After 
(image error) Size: 32 KiB
|
|
Before 
(image error) Size: 34 KiB After 
(image error) Size: 25 KiB
|
|
Before 
(image error) Size: 9.3 KiB After 
(image error) Size: 4.5 KiB
|
|
Before 
(image error) Size: 1.9 KiB After 
(image error) Size: 825 B
|