Commit graph

5964 commits

Author SHA1 Message Date
Nick Winter
42b81fd55e Fix for point/region choosers destroying AudioPlayer's camera. Fix for DOM highlight arrow covering up level info on iPad. 2014-10-24 13:03:15 -07:00
Nick Winter
8cc5c4d873 Merge pull request #1701 from richhiey1996/patch-1
Update names.coffee
2014-10-24 11:52:00 -07:00
richhiey1996
ac6b213fee Update names.coffee 2014-10-25 00:11:28 +05:30
Matt Lott
651ff3c8d0 Update attack snippet if no findNearestEnemy
This is a one-off fix until we have a more general solution to snippet
updating based on available skills.
2014-10-24 11:38:48 -07:00
Matt Lott
ff2e8eaa21 Update code snippet schema to code format 2014-10-24 10:18:00 -07:00
richhiey1996
d71ddaf74a Update names.coffee 2014-10-24 13:43:49 +05:30
Nick Winter
f396114a47 Merge branch 'master' into production 2014-10-23 20:12:28 -07:00
Nick Winter
79ed8b2470 Hooked up some menu music transitions to play menu music during HeroVictoryModal and GameMenuModal. 2014-10-23 20:03:19 -07:00
Nick Winter
4c33b98e27 Fixed building Thangs with new Components that no other Thang uses. Fixed THangs with id 0 in the level editor. 2014-10-23 18:11:12 -07:00
Nick Winter
13fe1bbece Improved branching choices and set up an A/B/C/D test around branching. 2014-10-23 16:37:09 -07:00
Matt Lott
83516f562b Enable local autocomplete 2014-10-23 16:23:46 -07:00
Matt Lott
a5695e896b Increase size of autocomplete popup 2014-10-23 11:16:58 -07:00
Nick Winter
e96eab7bf3 Merge pull request #1700 from kerradus/master
translations and improvements
2014-10-23 08:10:37 -07:00
Dmitry
5719586645 Update ru.coffee 2014-10-23 14:56:45 +04:00
Dmitry
17dde2487a translations and improvements 2014-10-23 14:11:57 +04:00
Nick Winter
7f8216f482 Experimental branching support, visible to admins. 2014-10-22 15:42:51 -07:00
Nick Winter
7da0b1a43e Merge branch 'master' into production 2014-10-22 13:58:04 -07:00
Nick Winter
039dd4f264 Fixed issue with HeroVictoryModal assuming achievements all have rewards. 2014-10-22 13:57:57 -07:00
Nick Winter
b85d541304 Merge pull request #1697 from Imperadeiro98/master
Update pt-PT.coffee
2014-10-22 13:36:07 -07:00
Nick Winter
ab0578b6a6 Merge pull request #1698 from Hamtara/patch-1
Update fr.coffee
2014-10-22 13:32:38 -07:00
Christelle
32a230548f Update fr.coffee 2014-10-22 16:17:48 -04:00
Christelle
5d4a6b603b Update fr.coffee 2014-10-22 16:12:41 -04:00
Matt Lott
625a34b2e6 Add autocomplete right-justified help text 2014-10-22 12:24:31 -07:00
Imperadeiro98
918e940edd Update pt-PT.coffee 2014-10-22 19:21:57 +01:00
Nick Winter
f2fdd761df Propagated i18n. 2014-10-22 10:47:03 -07:00
Nick Winter
afc6558edc Spell Saved -> Code Saved. Re-enabled level locking, with a fallback for when victory modals are hanging. 2014-10-22 10:46:34 -07:00
Scott Erickson
9392100d3b Removed some logs. 2014-10-22 08:17:30 -07:00
Scott Erickson
4371873d41 Set up thang types to use their raster property as an icon. 2014-10-22 07:53:50 -07:00
Scott Erickson
49c85bce5f Fixed an issue with thang type marks not handling sprite sheet build completion correctly. 2014-10-22 07:53:50 -07:00
Scott Erickson
e38f26a8d0 Fixed a little bit of spritesheet rebuilding cleanup. 2014-10-22 07:53:50 -07:00
Scott Erickson
1f7d098b2e Added rotation buttons in the context menu and shortcuts to the level editor. 2014-10-22 07:53:49 -07:00
Scott Erickson
20595b50da Fixes 1647. Somehow had been under the impression the segmented sprite containers weren't handling clicks correctly and that segments needed to handle them. 2014-10-22 07:53:49 -07:00
Nick Winter
bbca17404f Merge branch 'master' into production 2014-10-21 21:38:00 -07:00
Nick Winter
103418fe2b Removed super-aggressive log which has now served its purpose. 2014-10-21 21:37:49 -07:00
Nick Winter
d9f3bc7cc9 Merge branch 'master' into production 2014-10-21 20:30:01 -07:00
Nick Winter
6539adf53d Sure wish I could test this bug without a full production deploy. 2014-10-21 20:29:45 -07:00
Nick Winter
a14477023f Merge branch 'master' into production 2014-10-21 20:12:26 -07:00
Nick Winter
49f3a0a298 More logging for the merged models problem. 2014-10-21 20:12:20 -07:00
Nick Winter
25e4e926c2 Merge branch 'master' into production 2014-10-21 19:39:16 -07:00
Nick Winter
399cd048fc Logging some stuff to get to the bottom of things. 2014-10-21 19:39:13 -07:00
Matt Lott
bb8d1d8362 Adding more analytics even tracking
Actions on homepage
Path from homepage to first level
2014-10-21 16:55:16 -07:00
Nick Winter
09e80120bf Fixed issue with progress scrubber hover not showing the right time when hovering over handle. 2014-10-21 15:59:43 -07:00
Nick Winter
0a615fc24e Merge branch 'master' into production 2014-10-21 13:58:18 -07:00
Nick Winter
7c2982d3f1 Adding some logging for crazy save validation bugs. Swapping in flag item slot. 2014-10-21 13:57:49 -07:00
Scott Erickson
ba79d59190 Fixed a couple errors in the tests. 2014-10-21 11:54:03 -07:00
Scott Erickson
091910f2ad Fixed debug, and some other mark issues when sprite sheets update, most likely. 2014-10-21 11:36:38 -07:00
Scott Erickson
7f4ac3e5d6 Fixed point and region choosers in the level editor. 2014-10-21 10:59:05 -07:00
Scott Erickson
cd8f5800a6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-21 10:21:46 -07:00
Nick Winter
b56d25dd9e Merge pull request #1695 from yjw9012/master
Fixed #1567
2014-10-21 07:30:50 -07:00
yjw9012
ca09381d42 Fixed #1567
Moved the code diff control to the top of the list, and added a short
instructional message.
2014-10-20 23:12:00 -07:00