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

3686 commits

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
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
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
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
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
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
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
Gutierri Barboza
7ac09d09f3 translation pt-BR 2014-09-12 13:31:50 -03:00
Nick Winter
d3245948e2 Sorting addable Thangs in a sensible order. 2014-09-11 13:34:15 -07: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
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
f53f6bf0a3 Misc changes, wishing I could get sounds to work at lower volumes. 2014-09-10 19:55:00 -07:00
Imperadeiro98
10132c6fd1 Update pt-PT.coffee 2014-09-10 11:02:01 +01:00
Nick Winter
0b1f4ebada Fixed two extra spaces in DE localizations. 2014-09-09 18:58:04 -07:00
djsmith85
19d3a6cc9f Updated German translations (de-DE & de-AT) 
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
 2014-09-10 02:57:47 +02:00
Titounkle
d9ee5c248d Update es-ES.coffee 
Number 219 im not quite sure...I'll think about it.
 2014-09-09 18:43:28 +02:00
Michael Schmatz
b35a0161e8 Inserted Battle For The Net banner 2014-09-09 12:34:30 -04:00
Nick Winter
2396f9c26d Updates to go along with latest iPad app spell palette loading. 2014-09-08 21:40:52 -07:00
lukigno95
fa7f827fcb Update it.coffee 2014-09-09 01:10:24 +02:00
Nick Winter
dd2cdf3ef9 Fixed bugs with forking ThangTypes. 2014-09-08 16:03:29 -07:00
Nick Winter
c64c391d74 Workaround for missing document.location inside child window in Windows Chrome. 2014-09-08 14:31:52 -07:00
Nick Winter
8dad2bf12d Fixed some typo. 2014-09-08 14:26:17 -07:00
Scott Erickson
6c12384fe9 Reenabling on surface mouse moved. 2014-09-08 14:13:19 -07:00
Nick Winter
eb4293fee5 Temp: ThangTypes don't require kind. 2014-09-08 13:02:39 -07:00
Nick Winter
6ed89a2d79 Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView. 2014-09-08 12:29:49 -07:00
Nick Winter
ffdf48dadb Fixed typo in spell palette event. 2014-09-08 09:01:34 -07:00
Nick Winter
1bd1ca0ced Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app. 2014-09-07 20:54:25 -07:00
Nick Winter
40c37a8be1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-07 20:48:36 -07:00
Nick Winter
6ac8dc1d2d Merge pull request #1531 from gutierri/master 
more translations of phrases
 2014-09-07 20:47:57 -07:00
Nick Winter
4908cb4d0a Merge pull request #1529 from MajkPascal/patch-2 
Polish translation
 2014-09-07 20:47:38 -07:00
Nick Winter
25334d59a0 Merge pull request #1527 from Titounkle/patch-2 
Update es-ES.coffee
 2014-09-07 20:46:51 -07:00
Nick Winter
68812eef0a Fixed a couple types in new ar.coffee. 2014-09-07 20:41:47 -07:00
Gutierri Barboza
9f6870130f more translations of phrases 2014-09-07 23:18:35 -03:00
MajkPascal
f20b963a2b Polish translation 2014-09-07 21:31:46 +02:00
Titounkle
ff3b718bf2 Update es-ES.coffee 2014-09-07 19:59:58 +02:00
CodeIter
35382ff57c update ar 
another trans.
 2014-09-07 13:20:15 +01:00
CodeIter
fb7509612f ترجمة- translate 
it 's too hard to complete it now.
however  google translate is very useful (most translation from google are good but it always need a human verification.that 's because it 's hard to complete it)
 2014-09-07 11:54:53 +01:00
Nick Winter
19720c38be Propagated i18. 2014-09-06 19:57:03 -07:00
Nick Winter
75538a158e Merge pull request #1523 from Imperadeiro98/patch-3 
Level editor fixes
 2014-09-06 19:56:22 -07:00
Nick Winter
18114af2a3 Merge pull request #1521 from Imperadeiro98/patch-2 
Update pt-PT.coffee
 2014-09-06 19:56:01 -07:00
Nick Winter
067b32dfbf Merge pull request #1520 from Imperadeiro98/patch-1 
Fixed a typo
 2014-09-06 19:55:26 -07:00
Nick Winter
df131ca90a Merge pull request #1519 from keenanjohnson/master 
Added Potion Master names for #53
 2014-09-06 19:55:02 -07:00
Nick Winter
78a0568594 Merge pull request #1518 from Titounkle/patch-1 
Update es-ES.coffee
 2014-09-06 19:53:37 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
Imperadeiro98
c6f6282ae1 Update edit.jade 
Fixed some errors
 2014-09-06 17:32:01 +01:00
Imperadeiro98
253b0dc35c Update en.coffee 
Added "Documentation"
 2014-09-06 17:31:24 +01:00
Imperadeiro98
8ada8c3a88 Update pt-PT.coffee 2014-09-06 10:41:01 +01:00
Imperadeiro98
66451b6ef0 Fixed a typo 2014-09-06 10:18:16 +01:00
keenanjohnson
d79fc4c62f Added Potion Master names for #53 2014-09-05 20:18:05 -05:00
Titounkle
0246bc8070 Update es-ES.coffee 
He hecho algunos cambios, pero no se muy bien como trabajais esto ya que es la primera vez que me involucro en github, basta con quitar el # de delante de las cosas que vayamos traduciendo o hay que marcarlas de alguna otra manera??

Un saludo
 2014-09-05 22:51:39 +02:00
Nick Winter
8de75024fc Implemented placeholders for a bunch of sound triggers. 2014-09-05 13:04:05 -07:00
kotvaska
0383b2ce2b Update ru.coffee 2014-09-05 12:49:23 -07:00
Nick Winter
ddddc44651 Fixed en-GB.coffee. 2014-09-05 12:49:23 -07:00
Scott Erickson
64ea670ebd Reorganized the Surface into groupings. Changed no logic, just shuffled things around. 2014-09-05 09:21:00 -07:00
Nick Winter
ca8df87f8a Propagated i18n. 2014-09-05 09:13:09 -07:00
Nick Winter
88144024c4 Updated about page i18n. 2014-09-05 09:12:05 -07:00
Nick Winter
14b50f8b57 Merge pull request #1517 from Imperadeiro98/patch-1 
Updated i18n
 2014-09-05 09:02:52 -07:00
Nick Winter
5b3dc75d86 Merge pull request #1515 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-05 08:50:05 -07:00
Imperadeiro98
319b9a3400 Update about.jade 
Updated some i18n (it is also needed to add line 42, 45-47, 56)
 2014-09-05 09:25:32 +01:00
Imperadeiro98
2c2811fc25 Update en.coffee 
Removed redundant code and updated some i18n
 2014-09-05 09:24:08 +01:00
Nick Winter
9604ed8508 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 20:10:36 -07:00
Nick Winter
d3eb7a7438 Fixed a few issues with real-time multiplayer flags. 2014-09-04 20:10:04 -07:00
George Saines
d1f6b6ef51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 16:59:52 -07:00
George Saines
0beb34e3db redoing the about page 2014-09-04 16:59:46 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Imperadeiro98
aeafc6b648 Update pt-PT.coffee 2014-09-04 21:26:38 +01:00
Scott Erickson
fca9a92167 Flattened the queries the NewAchievementModal creates. 2014-09-04 11:17:07 -07:00
Scott Erickson
ef8342efdd Refactored the achievement schema, un-nesting definitions and bringing the query operator into force. 2014-09-04 11:17:06 -07:00
Nick Winter
8c45e22741 Protection and logging for #1463. Fixed an issue with spectate camera script bounds. 2014-09-04 11:04:23 -07:00
Scott Erickson
bfae70ef13 Added a close button to the game menu modal. 2014-09-04 10:03:34 -07:00
Nick Winter
b1de5e0045 Fixed bug with hero levels not loading inventory. (Might not be in line with the performance that 975c6a was going for.) 2014-09-03 19:19:04 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Scott Erickson
1094487072 Fixed #1511 2014-09-03 17:47:29 -07:00
Scott Erickson
65c0d74a79 Added a new searchStrings property to level components to improve their search. 2014-09-03 17:33:10 -07:00
Scott Erickson
7fb89a9e7e Making the thangs column in the level editor hidden by default again. 2014-09-03 17:27:19 -07:00
Scott Erickson
f519df6189 Wrapping up work on the folderized thangs treema in the level editor. 2014-09-03 16:51:09 -07:00
Nick Winter
8f38d57aaa Merge branch 'feature/realtime-multiplayer' 2014-09-03 16:14:58 -07:00
Nick Winter
6b6c8dd683 Merged master into feature/realtime-multiplayer; looks good. 2014-09-03 16:14:33 -07:00
Scott Erickson
9439f0d47d Some tweaks and fixes to the folderized thangs in the level editor. 2014-09-03 15:38:57 -07:00