Commit graph

1600 commits

Author SHA1 Message Date
Nick Winter
49dac82897 Merge pull request #484 from akaza-akari/cn-locale
Chinese(Simpified) translation for Contribute and About page
2014-03-06 09:18:39 -08:00
Nick Winter
58069fc071 Merge branch 'enh-panning' of git://github.com/akaza-akari/codecombat into akaza-akari-enh-panning 2014-03-06 09:02:41 -08:00
Akaza Akari
ad3019a6cb Translated more strings 2014-03-06 16:51:21 +08:00
Akaza Akari
929d10588e Translate passages on Contribute and About page 2014-03-06 16:02:42 +08:00
Akaza Akari
030da44c23 Added volume manipulation, adjusted panning parameters 2014-03-05 20:12:42 -08:00
Scott Erickson
a6c4fe8d02 Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master 2014-03-05 20:04:14 -08:00
Akaza Akari
51d7bd656d Made updatePosition use getWorldPosition 2014-03-05 19:54:58 -08:00
Akaza Akari
99f43028a0 Add thang sound panning for #454 2014-03-05 19:39:14 -08:00
Scott Erickson
aa3167f303 Temporary hack fix while mongodb text search is broken. 2014-03-05 15:06:20 -08:00
Nick Winter
fe8580b757 Merge pull request #482 from Darredevil/patch-4
Update ro.coffee
2014-03-05 14:37:27 -08:00
Darredevil
398fa3c426 Update ro.coffee
so much to translate....
2014-03-06 00:12:58 +02:00
Nick Winter
2d69abf674 Merge pull request #481 from dkundel/master
Proposed UX improvement for #6
2014-03-05 13:45:14 -08:00
Dominik Kundel
a033a80722 Merge remote-tracking branch 'upstream/master' 2014-03-05 22:18:53 +01:00
Dominik Kundel
b0d571c7ad highlight only the executing statement 2014-03-05 22:17:34 +01:00
Scott Erickson
7a2d5b4bff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-05 12:53:57 -08:00
Scott Erickson
fc42043cb8 Fixed #480 2014-03-05 12:53:48 -08:00
Scott Erickson
af265ebee8 Tweaked an error message to be more generally useful. 2014-03-05 12:53:11 -08:00
Nick Winter
b84c2d301a Merge pull request #479 from jayant1992/proposed-editor-bugfix
Minor bugfix for freezing editor due to out of bounds frame index
2014-03-05 12:50:09 -08:00
Jayant Jain
db0fc82eb0 Minor bugfix for freezing editor due to out of bounds frame index 2014-03-06 01:54:09 +05:30
iraladson
8d046c31b9 Update names.coffee
"Added more names for #53
2014-03-05 14:06:29 -06:00
iraladson
7885b21b4b Update names.coffee 2014-03-05 14:03:57 -06:00
Nick Winter
5ec06159a6 Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging. 2014-03-05 12:00:29 -08:00
Nick Winter
17543e7021 Merge pull request #476 from Darredevil/patch-3
Update ro
2014-03-05 11:44:03 -08:00
Darredevil
ea98a9917d Update ro 2014-03-05 20:40:14 +02:00
Scott Erickson
0a8d5b5b97 Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master 2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3 Moved "Skip (esc)" next to Continue button 2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782 further changes in design of highlighting lines in code 2014-03-05 17:06:46 +01:00
Shrihari
0ec431f90a Moved 'skip tutorial' text to locales. 2014-03-05 13:46:21 +05:30
Dominik Kundel
a0e39480e3 new UI design for executing and executed lines in ACE editor 2014-03-05 02:00:38 +01:00
Scott Erickson
03b60838b6 Merge remote-tracking branch 'origin/master' 2014-03-04 12:21:07 -08:00
Scott Erickson
9726840d8a Trying to handle a case where a user did not have their user account created. 2014-03-04 12:21:02 -08:00
Scott Erickson
3680d628e7 Fixed showing generic errors. 2014-03-04 12:06:31 -08:00
Nick Winter
567bbcb0b9 Merge pull request #474 from Darredevil/patch-2
Update for ro.coffee
2014-03-04 11:32:29 -08:00
Darredevil
e02780e441 Update for ro.coffee
-first 80 lines done
2014-03-04 21:26:52 +02:00
Nick Winter
1532396ceb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 11:15:35 -08:00
Nick Winter
4556536df4 Hooked up new HUD icons. 2014-03-04 11:15:31 -08:00
Nick Winter
378d928f1a Merge pull request #473 from Leventhan/more-thang-names
Added even more names for #53
2014-03-04 11:11:23 -08:00
Yos Riady
195b1941ea Added even more names for #53 2014-03-05 02:53:54 +08:00
George Saines
3ea4439fc1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 10:24:23 -08:00
Nick Winter
2f653c966e Simulator now swaps in empty methods when code doesn't compile. 2014-03-04 08:30:50 -08:00
Ruben Vereecken
d43ff5d217 Added an anonymous check on the Fork button 2014-03-04 11:24:38 +01:00
Nick Winter
ebf6adb596 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 18:51:05 -08:00
Nick Winter
9aa1d5a26c Okay, we'll just let Cloudflare compress things. 2014-03-03 18:50:59 -08:00
George Saines
33e2571934 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 18:04:01 -08:00
George Saines
113c71e141 adding new hud icons 2014-03-03 18:03:54 -08:00
Scott Erickson
1f091b93b8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 17:15:54 -08:00
Scott Erickson
246bbefc91 Made the file uploading just overwrite files with the same name. 2014-03-03 17:14:13 -08:00
Scott Erickson
881ec1a4b3 Added a fix for files with spaces. 2014-03-03 17:03:02 -08:00
Nick Winter
65d9186ef1 Fixed actions showing up under dialogue bubbles on repeated toggling. 2014-03-03 16:55:36 -08:00
Scott Erickson
1b257252f9 Merge branch 'production' 2014-03-03 16:52:01 -08:00