Commit graph

5718 commits

Author SHA1 Message Date
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
Rachel Xiang
85f81a3ffe added npm install 2014-01-12 14:15:40 -05:00
Rachel Xiang
ce9550779e Enabled Travis CI and edited .gitignore for bin files 2014-01-12 14:10:36 -05:00
Mischa Lewis-Norelle
1d7a01fd5c Fixed the language issues
Still not sure about the language code, as there are several Malay
languages, but since this is the only one we have right now, I suppose
it’ll do. Google has it as .my, but BCP 47 says that is Burmese. I’ll
look into this more later on.
2014-01-12 14:09:56 -05:00
SHIYING
b6c499db72 Better randomized orders. Better styled code. 2014-01-12 12:59:51 -05:00
Michael Schmatz
502fe4fa6b Merge pull request #161 from smoratinos/master
Fix and add test in LevelComponent on the server side.
2014-01-12 08:10:41 -08:00
Sébastien Moratinos
4f62448d74 Fix and add test in LevelComponent on the server side. 2014-01-12 16:16:56 +01:00
GlenDC
1032fdb1d3 Enchangement for issue #23. Removed classes related ids from account_settings to classes category 2014-01-12 11:20:07 +01:00
SHIYING
524b2318f8 Better comment for randArray 2014-01-11 16:15:46 -05:00
SHIYING
08a1668bcc Bug fixed where ordering of thang names becomes undefined sometimes 2014-01-11 16:09:25 -05:00
SHIYING
ae67a9dc23 Added comments and made code more readable 2014-01-11 15:43:34 -05:00
SHIYING
00cdb1e5ad Randomized naming for Thangs 2014-01-11 15:41:13 -05:00
Nick Winter
76b795a8e6 Merge pull request #154 from deepak1556/karma-upgrade
update config to latest karma specs
2014-01-11 08:57:05 -08:00
Nick Winter
c8a1b93a73 Merge pull request #155 from Adam23/master
Chinese (Traditional)
2014-01-11 08:52:30 -08:00
GlenDC
683b72f67a First big fix for issue #23. The issue is as good as fixed besides some details I think. 2014-01-11 17:25:04 +01:00
Adam23
0fc8643133 update zh-HANT.coffee + zh-HANS.coffee
fix something
2014-01-11 21:45:08 +08:00
Adam23
016dc1a3f6 Chinese (Traditional)
zh-HANT.coffee  +  zh-HANS.coffee
2014-01-11 21:17:47 +08:00
deepak1556
36167379db update config to latest karma specs 2014-01-11 14:20:28 +05:30
Michael Schmatz
bd8ece2645 Put raw_input() into loop to fix #144 2014-01-10 22:36:49 -08:00
Nick Winter
00f4699ce5 Further fixes for save modals. 2014-01-10 17:32:29 -08:00
Scott Erickson
52eae882e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:14:31 -08:00
Scott Erickson
ecd9ed8fef Fixed the save version modal. 2014-01-10 17:11:13 -08:00
Nick Winter
033e3a6c0b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:04:21 -08:00
Nick Winter
2383d5dd3a An improvement for containingString in #133. 2014-01-10 17:04:12 -08:00
Scott Erickson
1f9c531938 Got rid of a bunch of logs. 2014-01-10 16:57:38 -08:00
Scott Erickson
95900f230f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00