Commit graph

4044 commits

Author SHA1 Message Date
GlenDC
2e762f0920 Applied code review on pull request #185 2014-01-14 19:00:38 +01:00
Nick Winter
6a40e27bdd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-14 09:15:32 -08:00
Nick Winter
bd1c07d45c Merge pull request #186 from armaldio/patch-2
Update fr.coffee
2014-01-14 09:15:14 -08:00
armaldio
a0f5eece96 Update fr.coffee
just stay few english words that I can't translate
2014-01-14 12:37:40 +01:00
GlenDC
e6e83d76c0 Merge https://github.com/GlenDC/codecombat 2014-01-14 10:26:15 +01:00
GlenDC
b7986a94f4 Added batch file for Windows developers. The file allows you to start the develop environment in one click. 2014-01-14 10:24:46 +01:00
GlenDC
c50e78b897 Added batch file for Windows developers. The file allows you to start the develop environment in one click. 2014-01-14 10:18:07 +01:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Scott Erickson
37f1ccdb51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 20:32:41 -08:00
Scott Erickson
810eabef46 Tweaked some copy in prep for the new translations to be sent out. 2014-01-13 20:32:21 -08:00
Nick Winter
1041ce4b17 Added GitHub stars button. 2014-01-13 18:19:28 -08:00
Nick Winter
5405423510 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 17:17:48 -08:00
Nick Winter
40bd91f415 Working on adding i18n tags from #23. 2014-01-13 17:17:41 -08:00
Scott Erickson
8096c0e2d2 Merge branch 'master' into production 2014-01-13 17:01:32 -08:00
Scott Erickson
0fda326858 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 16:59:13 -08:00
Scott Erickson
05f4840369 Added tracking properties to systems. 2014-01-13 16:58:56 -08:00
Michael Schmatz
eb04575294 Merge pull request #157 from shiyingzheng/master
Randomized Thang Names #128
2014-01-13 16:50:55 -08:00
Paul Buser
f6ada477ef Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-13 16:59:36 -05:00
Michael Schmatz
36d18be889 Merge pull request #183 from codecombat/master
Merging a few days of progress into the production branch
2014-01-13 13:59:30 -08:00
Paul Buser
b0ad3f5700 Add regex event checker in level.coffee 2014-01-13 16:56:08 -05:00
Nick Winter
69a6070e02 Merge branch 'master' of git://github.com/p-buse/codecombat into p-buse-master 2014-01-13 13:18:52 -08:00
Michael Schmatz
662f0c1bb5 Merge pull request #178 from phansch/GermanTranslation
Update de.coffee
2014-01-13 10:38:07 -08:00
Michael Schmatz
5c7c11d4a8 Merge pull request #179 from schmatz/fix-camera-coordinates-in-tests
Fixed some camera coordinates in Camera tests to deal with axis switch
2014-01-13 10:14:58 -08:00
Michael Schmatz
f93fab2d10 Fixed some camera coordinates in Camera tests, others still need to be done 2014-01-13 10:02:15 -08:00
Philipp Hansch
ee06d40974 Update de.coffee
Updated missing translations with the translations from the
Google Doc.

Ref #123
2014-01-13 14:54:55 +01:00
Paul Buser
bfe2ab0f1e Add regexp event checking 2014-01-12 21:26:07 -05:00
Paul Buser
485bc4d6cf Remove common scripts from user-created levels 2014-01-12 21:15:31 -05:00
Paul Buser
8838903d58 Remove common scripts from user-created level packaging 2014-01-12 21:13:03 -05:00
Michael Schmatz
60abd9f794 Merge pull request #168 from schmatz/master
Fixed some client-side tests
2014-01-12 14:04:57 -08:00
Michael Schmatz
37ce387f5c Removed references to validator, fixed paths 2014-01-12 13:54:26 -08:00
Michael Schmatz
08805b6470 Disabled outdated router test 2014-01-12 13:29:42 -08:00
Michael Schmatz
128c0b3ba3 Disabled outdated ScriptManager tests 2014-01-12 13:24:45 -08:00
Michael Schmatz
718e7ebd22 Fixed failing createPath test
There was a misnamed variable, incorrect expect, and outdated calling
style
2014-01-12 12:44:22 -08:00
Scott Erickson
dbbfbcf861 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:27:26 -08:00
Scott Erickson
de258fdf20 Set up wizard sprites to use the color config. 2014-01-12 12:27:10 -08:00
Nick Winter
d6f2f41cf8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:24:24 -08:00
Nick Winter
acc6c2e4e6 Fixed a couple typos. 2014-01-12 12:24:02 -08:00
Scott Erickson
c4028a8036 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:06:48 -08:00
Nick Winter
1572228aa5 Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master 2014-01-12 12:01:56 -08:00
Nick Winter
f367315183 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:00:42 -08:00
Nick Winter
8ab997680e Turned off A/B test for Break the Prison. 2014-01-12 12:00:38 -08:00
Michael Schmatz
43f6834db8 Merge pull request #166 from schmatz/master
Renamed all client-side tests to .spec.coffee
2014-01-12 11:59:09 -08:00
Scott Erickson
6d60221668 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 11:58:24 -08:00
Michael Schmatz
1f4bcd0073 Renamed all client-side tests to .spec.coffee 2014-01-12 11:57:13 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
Michael Schmatz
7f61ebe3a5 Added Travis CI build status indicator 2014-01-12 11:42:49 -08:00
Nick Winter
fbd7d4a0c5 Fixed up some syntax errors in #147. 2014-01-12 11:40:38 -08:00
Nick Winter
34ee6778b9 Merge pull request #147 from mlewisno/master
Added a file and translations for Bahasa Malaysia
2014-01-12 11:37:25 -08:00
Michael Schmatz
4afef46230 Merge pull request #165 from rdxiang/master
Added support for travis CI
2014-01-12 11:31:00 -08:00
Mischa Lewis-Norelle
958c3e5bae Made it clear that this is the Bahasa region of the Malay macro language 2014-01-12 14:20:29 -05:00