Commit graph

1757 commits

Author SHA1 Message Date
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
Cassio Cardoso
2917255193 Update diplomat.jade
Add my username in brazilian portuguese diplomats list.
2014-03-17 11:51:55 -03:00
Scott Erickson
87b225b061 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-17 07:34:02 -07:00
Scott Erickson
564d267463 Removed a TODO. 2014-03-17 07:33:53 -07:00
Nick Winter
ec9ec83e4d Merge pull request #586 from adi2412/master
Fixed issue with video on multiplayer page modal
2014-03-17 07:26:54 -07:00
Aditya Raisinghani
b5bef94eb3 Fixed issue with video on multiplayer page modal 2014-03-17 19:52:03 +05:30
Nick Winter
1171572bd8 Merge pull request #585 from Silwing/patch-1
Update da.coffee
2014-03-17 06:01:19 -07:00
Randi Katrine Hillerøe
5cecbeea40 Update diplomat.jade
Added my name to the contributors list.
2014-03-17 13:59:48 +01:00
Randi Katrine Hillerøe
a936964434 Update da.coffee
Added a few of the missing translations.
2014-03-17 13:55:58 +01:00
Nick Winter
6c2a78c060 Show videos in HD if possible. Use ready state on level loader. 2014-03-17 05:52:19 -07:00
Nick Winter
3d56cc4393 Merge pull request #584 from batista/patch-1
Update pt-PT.coffee for multiplayer
2014-03-17 05:26:57 -07:00
Nick Winter
63535e0d39 Merge pull request #583 from bbeasmile/patch-1
Update hu.coffee
2014-03-17 05:16:10 -07:00
Sérgio Batista
641fa482d8 Update pt-PT.coffee for multiplayer 2014-03-17 13:13:45 +01:00
bbeasmile
03f309a441 Update hu.coffee 2014-03-17 13:01:17 +01:00
Nick Winter
36a90de7f9 Last bits of #546. 2014-03-17 04:44:00 -07:00
Nick Winter
1397b63e50 Merged. 2014-03-17 04:37:54 -07:00
Nick Winter
fe56e82348 Merge pull request #581 from pouyio/patch-1
Update es.coffee
2014-03-17 04:31:24 -07:00
Nick Winter
833c310a91 Merge pull request #579 from ItsLastDay/popover
Fix for issue #496
2014-03-17 04:30:57 -07:00
pouyio
9092a7961d Update es.coffee 2014-03-17 12:30:34 +01:00
Nick Winter
3803626962 Merge pull request #580 from bahuma20/patch-1
Update de.coffee
2014-03-17 04:28:26 -07:00
Maximilian Bachhuber
5903dc1ae2 Update de.coffee 2014-03-17 12:27:46 +01:00
Nick Winter
287bf0398e Embedded new video in multiplayer launch modal. 2014-03-17 03:18:13 -07:00
Mikhail Koltsov
df3739517d fixed issue #496 2014-03-17 12:28:49 +04:00
Scott Erickson
db4ae0cd2d Made some tips show up more rarely. 2014-03-17 00:12:11 -07:00
Scott Erickson
7555dce172 Tweaked the loading page progress bar. 2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f More tweaks to the video. 2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0 Added a border to the home view video. 2014-03-16 22:46:57 -07:00
Nick Winter
65c53a9e43 Check anonymous for clicking link. 2014-03-16 22:17:56 -07:00
Scott Erickson
5ddd2b9109 Added a few more tips. 2014-03-16 22:11:21 -07:00
Scott Erickson
8eed311aea Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 22:01:41 -07:00
Scott Erickson
dc4252a94d Moved the tips into the level loader screen and gave them i18n. 2014-03-16 22:01:21 -07:00
Nick Winter
566c9e6c9d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:48:37 -07:00
Nick Winter
b51f51f636 Fix for no Camera for creating Marks in the Thang Editor. 2014-03-16 21:48:28 -07:00
Scott Erickson
5a8d1b0a2b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:43:21 -07:00
Scott Erickson
de34896a9a Playback is now disabled during casting. Also cleaned out some remaining hover logic. 2014-03-16 21:43:14 -07:00
Nick Winter
af57e88a1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:33:50 -07:00
Nick Winter
f02f4e77d0 Improved next game routing and speed. Hid that catastrophically dangerous reset all games button. 2014-03-16 21:33:46 -07:00