Merge branch 'master' of https://github.com/codecombat/codecombat

2025-04-26 14:03:28 -04:00 · 2014-01-12 12:00:42 -08:00 · 2014-01-12 12:00:42 -08:00 · f367315183
commit f367315183
parent 8ab997680e 43f6834db8
18 changed files with 1 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -2,6 +2,7 @@ CodeCombat
 ==========

 ![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png)
+[![Build Status](https://travis-ci.org/codecombat/codecombat.png?branch=master)](https://travis-ci.org/codecombat/codecombat)

 CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage developer wiki](https://github.com/codecombat/codecombat/wiki) for a dev setup guide, extensive documentation, and much more.**

--- a/test/app/lib/forms.spec.coffee
+++ b/test/app/lib/forms.spec.coffee
--- a/test/app/lib/goal_manager.spec.coffee
+++ b/test/app/lib/goal_manager.spec.coffee
--- a/test/app/lib/path.spec.coffee
+++ b/test/app/lib/path.spec.coffee
--- a/test/app/lib/router.spec.coffee
+++ b/test/app/lib/router.spec.coffee
--- a/test/app/lib/script_manager.spec.coffee
+++ b/test/app/lib/script_manager.spec.coffee
--- a/test/app/lib/surface/camera.spec.coffee
+++ b/test/app/lib/surface/camera.spec.coffee
--- a/test/app/lib/world/goal_manager.spec.coffee
+++ b/test/app/lib/world/goal_manager.spec.coffee
--- a/test/app/lib/world/rectangle.spec.coffee
+++ b/test/app/lib/world/rectangle.spec.coffee
--- a/test/app/lib/world/thang.spec.coffee
+++ b/test/app/lib/world/thang.spec.coffee
--- a/test/app/lib/world/vector.spec.coffee
+++ b/test/app/lib/world/vector.spec.coffee
--- a/test/app/lib/world/world.spec.coffee
+++ b/test/app/lib/world/world.spec.coffee
--- a/test/app/views/editor/components_tab_view.spec.coffee
+++ b/test/app/views/editor/components_tab_view.spec.coffee
--- a/test/app/views/editor/editor_view.spec.coffee
+++ b/test/app/views/editor/editor_view.spec.coffee
--- a/test/app/views/editor/scripts_tab_view.spec.coffee
+++ b/test/app/views/editor/scripts_tab_view.spec.coffee
--- a/test/app/views/editor/settings_tab_view.spec.coffee
+++ b/test/app/views/editor/settings_tab_view.spec.coffee
--- a/test/app/views/editor/systems_tab_view.spec.coffee
+++ b/test/app/views/editor/systems_tab_view.spec.coffee
--- a/test/app/views/editor/thangs_tab_view.spec.coffee
+++ b/test/app/views/editor/thangs_tab_view.spec.coffee