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

7100 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
255cc28c93 Merge branch 'ArthurLu-master' 2015-02-03 12:30:30 -08:00
Nick Winter
d341e59b54 Merge branch 'master' of git://github.com/ArthurLu/codecombat into ArthurLu-master 2015-02-03 12:29:16 -08:00
Imperadeiro98
dc312a247a Merge pull request #2235 from bardeh/patch-2 
Update nb.coffee
 2015-02-03 19:39:55 +00:00
Bård Eik-Hvidsten
5159ff56f7 Update nb.coffee 2015-02-03 20:25:05 +01:00
Imperadeiro98
2448be11b3 Small fix 2015-02-03 18:25:13 +00:00
Imperadeiro98
fc3196e40c Merge pull request #2234 from codecombat/revert-2229-patch-1 
Revert "Update zh-HANT.coffee"
 2015-02-03 18:16:51 +00:00
Imperadeiro98
036ae7d7f7 Revert "Update zh-HANT.coffee" 2015-02-03 18:16:32 +00:00
Imperadeiro98
51f55bb376 Merge pull request #2230 from Coderaulic/patch-1 
Update ja.coffee
 2015-02-03 18:03:47 +00:00
Imperadeiro98
5fb9268603 Merge pull request #2229 from ArthurLu/patch-1 
Update zh-HANT.coffee
 2015-02-03 18:02:26 +00:00
Nick Winter
86aa265679 Added campaign label banner art. 2015-02-03 09:56:27 -08:00
Pammer
bd5ddab9e9 Update ru.coffee 2015-02-04 01:18:49 +09:00
newmilktea
275fb219a3 Update zh-HANT.coffee 2015-02-03 23:54:13 +08:00
newmilktea
89d4ca6039 Update zh-HANT.coffee 2015-02-03 23:26:17 +08:00
Pammer
641e8d7abf Update ru.coffee 2015-02-03 14:37:58 +09:00
Coderaulic
d8cdb6960c Update ja.coffee 
Updated misc translations.
 2015-02-02 20:13:58 -08:00
Arthur
d47a04208a Update zh-HANT.coffee 
Finish the rest of general
 2015-02-03 11:50:55 +08:00
Arthur
752e71f74c Update zh-HANT.coffee 
update the part of general
 2015-02-03 11:36:21 +08:00
Nick Winter
60d68ca23c Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings. 2015-02-02 18:02:57 -08:00
JKniager
bc48cd8448 Moved 'Steve' to Ogre M 2015-02-02 14:17:06 -07:00
Imperadeiro98
837ad8b5a4 Update pt-PT.coffee 2015-02-02 20:20:41 +00:00
Nick Winter
b3db9962bd Propagated i18n. 2015-02-02 11:51:15 -08:00
Nick Winter
3f78071e5e A few small fixes. 2015-02-02 11:50:25 -08:00
Imperadeiro98
cd61969475 Small fixes for last PR 2015-02-02 19:48:42 +00:00
Imperadeiro98
3d5ae45565 Merge pull request #2201 from Coderaulic/patch-1 
Update ja.coffee
 2015-02-02 19:44:55 +00:00
Nick Winter
c8a5712d43 Merge pull request #2197 from purenickery/patch-3 
Update en.coffee
 2015-02-02 09:24:32 -08:00
Nick Winter
730753d67b Merge pull request #2196 from purenickery/patch-2 
Update level_loading.jade
 2015-02-02 09:24:25 -08:00
Nick Winter
6e9db9f39b Merge pull request #2189 from purenickery/patch-1 
Update names.coffee
 2015-02-02 09:20:36 -08:00
Nick Winter
59a6d369a3 Merge pull request #2183 from rishiloyola/patch-7 
Update hero-victory-modal.sass
 2015-02-02 09:00:27 -08:00
Coderaulic
92e779259a Update ja.coffee 
Fixed miscellaneous translations from previous.
Updated all of -
game_menu:
inventory:
buy_gems:
choose_hero:
general:
I left in the original English as comments for long translations should there be a need to revisit, unless single words.

Lines 179, 186, 155, 396 all seem to cause 'compiler error'. They begin with key words so not sure how to fix those...maybe senior coder can take a look and fix?
 2015-02-01 21:38:38 -08:00
Michael Schmatz
6ca92e1278 Fix #2180 2015-02-01 15:37:28 -05:00
Imperadeiro98
6551395278 A little fix 2015-02-01 19:19:22 +00:00
Imperadeiro98
734a401974 Merge pull request #2199 from nixel2007/master 
Update ru.coffee
 2015-02-01 19:18:20 +00:00
Imperadeiro98
afe188104b Fixed a typo 2015-02-01 19:16:51 +00:00
nixel2007
f70f1e2896 ru.coffee - teachers block 2015-02-01 21:58:23 +03:00
nixel2007
25190a5dfd Update ru.coffee 
Leaderboard block + unlock_help_vidoes
 2015-02-01 17:16:12 +03:00
Imperadeiro98
3068f18443 Added a translator 2015-02-01 11:01:18 +00:00
Nick Winter
55bc48c61d Fixed problem with error messages in production. 2015-01-31 18:40:38 -08:00
Nick Winter
415cbceaf9 Disabling particles for now until performance can be fixed. 2015-01-31 16:59:03 -08:00
purenickery
b47bbe5704 Update en.coffee 2015-01-31 17:01:57 -07:00
purenickery
81b69e0c3c Update level_loading.jade 2015-01-31 17:01:43 -07:00
JKniager
99c5d0f604 Added Tips 
Added english translations for the tips added to the loading tips.
 2015-01-31 16:26:48 -07:00
JKniager
f1145852dd Added Tips 
Added tips to the tip list.
 2015-01-31 16:25:35 -07:00
JKniager
503575d86b Added More Names 2015-01-31 15:51:27 -07:00
Nick Winter
69ea874d83 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-31 14:40:00 -08:00
Nick Winter
1e410e0b14 Worked around bug with item portraits disappearing after item purchase. Fixed #1980. 2015-01-31 14:38:54 -08:00
Imperadeiro98
2a1d74ab59 Update downloads.coco 2015-01-31 22:36:23 +00:00
Imperadeiro98
a68698f0c1 Update install-mongodb.ps1 2015-01-31 22:32:03 +00:00
purenickery
b7624c0c58 Update names.coffee 
-added new names for #53
 2015-01-31 15:26:41 -07:00
Imperadeiro98
212c6e21a2 Update coco-mongodb 2015-01-31 22:19:57 +00:00
Imperadeiro98
4794c581b6 Removed blank line 2015-01-31 22:18:02 +00:00