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

5407 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
1f8f5ce8f3 Merge pull request #1554 from djsmith85/i18n 
Added i18n-tags in admin.jade and community.jade and updated the locale ...
 2014-09-15 10:22:29 -07:00
Nick Winter
92baaa82fa Merge pull request #1559 from djsmith85/german_translations 
Updated the German translations (de-DE.coffee & de-AT.coffee)
 2014-09-15 10:22:23 -07:00
Nick Winter
60ac48081c Merge pull request #1553 from djsmith85/translation_installer 
Updated German translations for Win-Installer and added German license, ...
 2014-09-15 10:21:21 -07:00
Daniel James Smith
a0fb51ae94 Updated the German translations 2014-09-15 18:57:09 +02:00
Daniel James Smith
3dd888469e Added i18n-tags in admin.jade and community.jade and updated the locale files (en, de-DE and de-AT) accordingly 2014-09-15 18:36:45 +02:00
Daniel James Smith
a481a3409e Updated German translations for Win-Installer and added German license, readme and tips 2014-09-15 18:28:40 +02:00
Nick Winter
1d75a9ead3 Uncommented some pt-BR section headers. 2014-09-14 17:13:03 -07:00
Nick Winter
612eccd209 Merge pull request #1551 from gutierri/master 
Translation and corrections to existing translations
 2014-09-14 17:12:01 -07:00
Nick Winter
6e5aa709f4 Merge pull request #1552 from AmyLaPazza/patch-1 
Added translations
 2014-09-14 17:10:39 -07:00
AmyLaPazza
b9be6215ea Added translations 
Translated Lines 193,196 and 267.
 2014-09-14 19:09:22 +02:00
Gutierri Barboza
b00b48450d translation section account 2014-09-14 00:48:36 -03:00
Gutierri Barboza
4d7c0f24eb standard translation for the same word 2014-09-14 00:44:48 -03:00
Gutierri Barboza
127fce2100 translation pt-BR section user 2014-09-14 00:42:18 -03:00
Michael Schmatz
baf651bdc0 Merge pull request #1550 from djsmith85/url-for-db-backup2 
Updated the url for the DB backup in the python installer
 2014-09-13 23:27:29 -04:00
djsmith85
0edd49e78e Updated the url for the DB backup in the python installer 
Updated the url for the DB backup in the python installer. I had updated
it for the Win-setup under #1535
 2014-09-14 04:55:01 +02:00
Gutierri Barboza
f4d1ed8a60 partial translation archievements 2014-09-13 23:08:43 -03:00
Gutierri Barboza
e012ea5bbc wrong word 2014-09-13 22:55:50 -03:00
Gutierri Barboza
1e1f384cd3 translate pt-BR 2014-09-13 22:53:25 -03:00
Nick Winter
3a4d56dfba Merge pull request #1526 from cnryb/master 
windows\coco-dev-setup\batch\localization 中的 bug
 2014-09-13 08:01:41 -07:00
George Saines
4053da3693 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-12 17:46:49 -07:00
George Saines
32ac3c1f95 updating contributor pages 2014-09-12 17:46:44 -07:00
Scott Erickson
c96f5d7bcf Merge branch 'master' into feature/webgl 2014-09-12 16:33:39 -07:00
Scott Erickson
08bdcb2cb6 Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it. 2014-09-12 16:33:01 -07:00
Nick Winter
1f6f2ebc94 Merge branch 'Titounkle-patch-4' 2014-09-12 10:22:43 -07:00
Nick Winter
7a76e9ac77 Fixed a couple formatting issues in es-ES. 2014-09-12 10:22:32 -07:00
Titounkle
9d731ae80e Update es-ES.coffee 2014-09-12 19:06:49 +02:00
Nick Winter
8e55184448 Merge pull request #1547 from gutierri/master 
translation pt-BR
 2014-09-12 09:35:29 -07:00
Gutierri Barboza
7ac09d09f3 translation pt-BR 2014-09-12 13:31:50 -03:00
cnryb
9b6aed85ca 试试看还乱码不 2014-09-12 22:40:15 +08:00
Nick Winter
d3245948e2 Sorting addable Thangs in a sensible order. 2014-09-11 13:34:15 -07:00
Michael Schmatz
59c1cab0f9 Merge pull request #1545 from codecombat/master 
Master into production
 2014-09-11 16:14:31 -04:00
Michael Schmatz
c08c279f8b Removed net neutrality banner 2014-09-11 16:13:06 -04:00
Nick Winter
e9968b648f Fixed bugs with click coordinates messing up mouse-down targeting. 2014-09-11 13:05:31 -07:00
Scott Erickson
5551c622fa Added a new test to webgl: making giant canvases. 2014-09-11 11:36:26 -07:00
Nick Winter
d5542ffbbc Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open. 2014-09-11 11:24:06 -07:00
George Saines
11a734b001 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-11 11:08:29 -07:00
George Saines
040b901e41 removed merge junk 2014-09-11 11:08:25 -07:00
Nick Winter
9eb0dbc625 Fixed bug with creating new levels. 2014-09-11 10:50:23 -07:00
George Saines
b81288cf52 changing volume for some SFX 2014-09-11 10:16:56 -07:00
George Saines
f5a4442e8a trying to change SFX volume 2014-09-11 09:59:50 -07:00
Nick Winter
8c37fabe79 Merge pull request #1537 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-11 08:45:36 -07:00
Nick Winter
35e1931fc3 Merge pull request #1534 from Titounkle/patch-3 
Update es-ES.coffee
 2014-09-11 08:43:59 -07:00
Nick Winter
ba554f3ff0 Fixed some indentation from #1532. 2014-09-11 08:43:36 -07:00
Nick Winter
0990a45802 Merge pull request #1532 from lukigno95/patch-1 
Update it.coffee
 2014-09-11 08:41:19 -07:00
Nick Winter
68808d0e07 Some fixes for how audio is triggered. 2014-09-11 08:38:30 -07:00
Imperadeiro98
74afea5efa Update pt-PT.coffee 2014-09-11 14:38:11 +01:00
Nick Winter
c3cf071299 Merge branch 'master' into production 2014-09-10 21:56:30 -07:00
Nick Winter
851ad43b45 Made some more User properties private. 2014-09-10 21:56:21 -07:00
Nick Winter
f53f6bf0a3 Misc changes, wishing I could get sounds to work at lower volumes. 2014-09-10 19:55:00 -07:00
Michael Schmatz
a7227bddcd Merge pull request #1538 from codecombat/master 
Master into production
 2014-09-10 09:45:10 -04:00