Commit graph

1430 commits

Author SHA1 Message Date
Alexei Nikitin
a3afa802d9 Update ru.coffee 2014-03-07 12:33:18 -08:00
Alexei Nikitin
16f2379af9 Update ru.coffee 2014-03-07 12:27:12 -08:00
Alexei Nikitin
535881b637 Update ambassador.jade 2014-03-07 12:20:17 -08:00
Alexei Nikitin
b002ae376b Update counselor.jade 2014-03-07 12:19:14 -08:00
Alexei Nikitin
317ae5cc32 Update scribe.jade 2014-03-07 12:17:32 -08:00
Scott Erickson
d8d917ecf9 Set up better teardown for the ladder view. 2014-03-07 12:15:16 -08:00
Alexei Nikitin
517ef8611b Update ru.coffee 2014-03-07 12:13:15 -08:00
Alexei Nikitin
4e24e2a244 Update ru.coffee 2014-03-07 12:10:25 -08:00
Scott Erickson
cf2a0a999e Set up the ladder play modal to point to the tutorial level dynamically. 2014-03-07 11:57:31 -08:00
Scott Erickson
610fc0694b Turning off view caching by default now. Should help lower the memory footprint. 2014-03-07 11:57:15 -08:00
Shrihari
5274f22467 Fixed Spell Debug View width bug 2014-03-08 01:10:12 +05:30
Scott Erickson
d14f862359 Ladder view can now be linked to to play against a specific team. 2014-03-07 11:23:06 -08:00
Scott Erickson
12f1042530 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-06 19:17:21 -08:00
Nick Winter
6e47416d24 Fixed some level IDs. 2014-03-06 19:09:15 -08:00
Scott Erickson
8012addaa1 Merge remote-tracking branch 'origin/master' 2014-03-06 19:01:30 -08:00
Michael Schmatz
45cd7e31ca Made simulator level-independent 2014-03-06 18:48:41 -08:00
Scott Erickson
34278a8648 Merge remote-tracking branch 'origin/master' 2014-03-06 17:27:01 -08:00
Scott Erickson
a4edb76c98 Fixed a couple of the bugs with marks. 2014-03-06 17:25:40 -08:00
Nick Winter
40e896868b Fixed CocoSprite getOffset to not apply scale to registration points. 2014-03-06 17:21:24 -08:00
Scott Erickson
5b11e132b2 Fixed the effect marks so they properly go away. 2014-03-06 17:13:16 -08:00
Nick Winter
b6335a30ae More fixes for empty string array serialization. 2014-03-06 16:32:13 -08:00
Scott Erickson
2fb1c184f9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-06 16:22:19 -08:00
Scott Erickson
1b61b928b0 Couple tweaks to the cocosprite for effect marks. 2014-03-06 16:21:06 -08:00
Nick Winter
ea406bd3c7 Fixed some event listeners on destroyed loaders. 2014-03-06 15:52:51 -08:00
Scott Erickson
2ac5a94055 Merge remote-tracking branch 'origin/master' 2014-03-06 15:52:14 -08:00
Scott Erickson
041f4512e8 Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple. 2014-03-06 15:52:09 -08:00
Nick Winter
40a32d7b43 Fixed array / string ThangState key serialization conflicts. Fixed #333. 2014-03-06 14:53:37 -08:00
Nick Winter
a03403de94 Started some more name categories. 2014-03-06 09:35:58 -08:00
Nick Winter
fddd210d34 Fixed Archer M names conflict. 2014-03-06 09:27:06 -08:00
Nick Winter
b5c72e4b4a Merge pull request #477 from iraladson/patch-1
Update names.coffee
2014-03-06 09:25:37 -08:00
Nick Winter
d3dd0eb32d Fixed i18n tag typo: adventurer_sumamry -> adventurer_summary. 2014-03-06 09:25:16 -08:00
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
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