codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
234 commits 27 branches 0 tags 134 MiB
Commit graph

146 commits

Author SHA1 Message Date
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
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
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
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
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
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
8ab997680e Turned off A/B test for Break the Prison. 2014-01-12 12:00:38 -08:00
Scott Erickson
6d60221668 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 11:58:24 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -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
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
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
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
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
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
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