codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
200 commits 27 branches 0 tags 134 MiB
Commit graph

200 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
de258fdf20 Set up wizard sprites to use the color config. 2014-01-12 12:27:10 -08:00
Scott Erickson
c4028a8036 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:06:48 -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
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
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
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
Nick Winter
a6f1ce53ba Merged #152, and slightly improved update interval handling. 2014-01-10 16:36:36 -08:00
dristic
21915f358c Add clear timers to not have timer running in the background on home page. 2014-01-10 16:18:39 -08:00
Nick Winter
cf41f6e3d0 I guess we just renamed brunch.coffee to config.coffee. 2014-01-10 15:51:26 -08:00
Scott Erickson
c768d5cb7c Merge pull request #150 from GlenDC/master 
Fixes issue #26
 2014-01-10 14:15:41 -08:00
GlenDC
6323ba4965 Renamed brunch.coffee => config.coffee 2014-01-10 22:37:31 +01:00
GlenDC
a8e3d2d751 ignored ./db folder 2014-01-10 22:37:12 +01:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
2b6a7cf753 Merge pull request #145 from fess89/master 
Update uk.coffee
 2014-01-10 09:42:16 -08:00
mlewisno
c6e81f909c Added a file and translations for Bahasa Malaysia 2014-01-10 10:09:45 -05:00
mlewisno
9318675447 Merge remote-tracking branch 'upstream/master' 
Updated my local copy to match the public copy
 2014-01-10 10:08:02 -05:00
Oleksii Chyrkov
8902ba91e2 Update uk.coffee 
Copied Ukrainian strings from Google doc to uk.coffee.
 2014-01-10 14:55:56 +02:00
Nick Winter
a72eb4d3e7 Merge pull request #142 from Adam23/master 
updating zh-HANS.coffee
 2014-01-09 22:56:25 -08:00
Adam23
29a302aaa9 update zh-HANS.coffee 
make the string blank, and comment out the line
 2014-01-10 14:54:22 +08:00
Adam23
cf6b6c11ce update zh-HANS.coffee 
two places
 2014-01-10 14:19:25 +08:00
Adam23
e01db58608 updating zh-HANS.coffee 
I have finished the  first draft.
 2014-01-10 13:43:59 +08:00
Nick Winter
69df0079af Fixed bug returning to normal selection from talking portrait in HUD. 2014-01-09 18:30:18 -08:00
Nick Winter
25d2f95db9 Not using subreddit any more. 2014-01-09 18:29:57 -08:00
Nick Winter
027cddd151 Increased matching bracket highlighting visibility. 2014-01-09 18:02:16 -08:00