Commit graph

12485 commits

Author SHA1 Message Date
Jayant Jain
80f53d2c6b Adds search bar for adding thangs in level editor 2014-03-19 00:41:03 +05:30
Nick Winter
358d7fa181 Dont' need to load sessions, too. 2014-03-18 11:52:23 -07:00
Nick Winter
c4615f8c7a Merge branch 'master' into production 2014-03-18 11:26:49 -07:00
Nick Winter
4355813d69 Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them. 2014-03-18 11:26:15 -07:00
Cody Bond
575f277e80 Merge pull request #1 from codecombat/master
Update
2014-03-18 13:58:43 -04:00
Shrihari
ee76e41c78 Range radii - renamed few variales for clarity 2014-03-18 18:33:39 +05:30
Shrihari
8f5e8efce0 Range radii - Some cleanup 2014-03-18 18:22:26 +05:30
Shrihari
ea24ae2fd8 Range radii - Some cleanup 2014-03-18 18:13:38 +05:30
Shrihari
22af95e7b9 Added 4 fallback colors for extra ranges 2014-03-18 18:06:44 +05:30
Shrihari
b283757315 Refactored buildRadius() to work with any range radius 2014-03-18 17:39:16 +05:30
Ruben Vereecken
04465eb72c Wrapped up locale files 2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c Merged in old locale 2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333 Ladder i18n refactoring 2014-03-18 10:18:38 +01:00
kvasnyk
5216432bf9 Fix for #272 bug. 2014-03-18 05:47:53 +01:00
Dominik Kundel
084ef5563b Merge remote-tracking branch 'upstream/master' 2014-03-18 01:10:43 +01:00
Dominik Kundel
b5aee8d691 support new version of aether' 2014-03-18 00:15:39 +01:00
Damien
65f148974c Add to french diplomats list 2014-03-17 23:39:36 +01:00
Damien
71d248afef Add some french translations 2014-03-17 23:38:41 +01:00
Nick Winter
a58faa1acd Merged. 2014-03-17 14:07:37 -07:00
Nick Winter
2dd762a0d7 Merge pull request #600 from M-r-A/patch-2
Update ru.coffee
2014-03-17 14:01:48 -07:00
Nick Winter
2098bef39e Fixed quoting problem. 2014-03-17 13:58:40 -07:00
Nick Winter
21ca74d76f Merge branch 'patch-koreanlocale' of git://github.com/walkingtospace/codecombat into walkingtospace-patch-koreanlocale 2014-03-17 13:58:11 -07:00
Nick Winter
f87962bc04 Merge pull request #598 from armaldio/patch-3
Update fr.coffee
2014-03-17 13:57:04 -07:00
Mikhail Koltsov
97f9e548e2 added perspectivizion for arrows (issue #46) 2014-03-18 00:40:37 +04:00
Björn Kimminich
4ea7d0e9b2 Update de.coffee 2014-03-17 21:36:53 +01:00
Björn Kimminich
b0a361abb2 Update de.coffee 2014-03-17 20:32:57 +01:00
Alexei Nikitin
4860e2e7a1 Update ru.coffee 2014-03-17 12:00:28 -07:00
fist0512
9d75fa5588 Added korean locale and modified unnatural translation 2014-03-18 03:49:15 +09:00
armaldio
2eb84252f3 Update fr.coffee 2014-03-17 19:47:44 +01:00
Mikhail Koltsov
a28eedc229 nothing 2014-03-17 22:45:59 +04:00
Dominik Kundel
c55b608886 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/templates/play/level/modal/editor_config.jade
2014-03-17 19:39:38 +01:00
Nick Winter
bf323d59f2 Merge pull request #594 from ahmed80dz/patch-1
Update ar.coffee
2014-03-17 11:09:17 -07:00
Nick Winter
ce0edc17d3 Merge pull request #595 from cassiocardoso/patch-3
Update pt-BR.coffee
2014-03-17 11:08:44 -07:00
Cassio Cardoso
970d5e46a2 Update pt-BR.coffee
Add multiplayer translation
2014-03-17 14:47:22 -03:00
ounis ahmed
aab91057f2 Update ar.coffee 2014-03-17 10:12:24 -07:00
Nick Winter
65a131d072 Merge pull request #593 from BonnieBBS/patch-2
Update zh-HANS.coffee
2014-03-17 09:26:26 -07:00
BonnieBBS
9a9480ea83 Update zh-HANS.coffee
Some words about "Ambassador" have been translated. :D
2014-03-18 00:18:09 +08:00
Nick Winter
5fef126672 Merge pull request #592 from ImmortalJoker/patch-2
Update ru.coffee
2014-03-17 08:51:18 -07:00
Nick Winter
794b1472f6 Merge pull request #587 from cassiocardoso/patch-1
Update diplomat.jade
2014-03-17 08:50:45 -07:00
Nick Winter
df2c1b443e Merge pull request #589 from yangxuan8282/patch-2
Update diplomat.jade
2014-03-17 08:49:30 -07:00
Nick Winter
98025f1ae2 Merge pull request #588 from yangxuan8282/patch-1
Update zh-HANS.coffee
2014-03-17 08:49:21 -07:00
Nick Winter
763f08a05e Merge pull request #590 from ImmortalJoker/patch-1
Update uk.coffee
2014-03-17 08:49:09 -07:00
Krasnov Ehor
c9d916fb7a Update ru.coffee 2014-03-17 17:49:07 +02:00
Nick Winter
f30d649550 Merge pull request #591 from BonnieBBS/patch-1
Update zh.coffee
2014-03-17 08:42:28 -07:00
Krasnov Ehor
172ad1d17a Update uk.coffee 2014-03-17 17:40:51 +02:00
BonnieBBS
abf90cf8f5 Update zh.coffee
Translated some of the words. :D
2014-03-17 23:38:13 +08:00
yangxuan8282
4b2bcc283f Update diplomat.jade
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
2014-03-17 23:32:20 +08:00
yangxuan8282
43ecfec28f Update zh-HANS.coffee
a little change,make grammar more idiomatic
2014-03-17 23:27:38 +08:00
Nick Winter
00dfcfe3f7 Merge branch 'master' into production 2014-03-17 08:03:41 -07:00
Cassio Cardoso
2917255193 Update diplomat.jade
Add my username in brazilian portuguese diplomats list.
2014-03-17 11:51:55 -03:00