Commit graph

5740 commits

Author SHA1 Message Date
Scott Erickson
e10af778ca Added some logs to figure out why that one time the GPlus logging in process just left things hanging. 2014-11-19 15:55:44 -08:00
Nick Winter
a1038af32b Make it much less likely to get to frame 0, since that frame is often pretty weird. 2014-11-19 15:46:50 -08:00
iAladdin
038e8cf776 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-20 07:43:04 +08:00
iAladdin
42997c4bb2 improved Chinese Localization
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 07:42:35 +08:00
Matt Lott
41db27c709 Apply markdown to error messages and hints 2014-11-19 15:27:06 -08:00
Nick Winter
f310719cee Restarting level now doesn't clear anything except code unless you hold down shift. 2014-11-19 15:24:50 -08:00
Nick Winter
6755c90f02 Properly continue to Haunted Kithmaze from The Raised Sword if that's the A/B test group. 2014-11-19 15:18:59 -08:00
Nick Winter
c82d1d0f36 Additional scriptable property on thang-died events. 2014-11-19 15:13:45 -08:00
Nick Winter
07a09e34d8 Fixed small-caps font-variant on docs popover titles. 2014-11-19 15:01:30 -08:00
Scott Erickson
13de055c0b Set up a basic achievements list modal for the world map. 2014-11-19 14:56:40 -08:00
Nick Winter
fe018309d0 Don't show blurbs for aggro messages. Big announces action blurbs for heroes. 2014-11-19 14:29:11 -08:00
Nick Winter
5a71d93d8a Hid play button for a couple more levels. 2014-11-19 14:29:11 -08:00
Nick Winter
0640f382ba Fixed coordinate hover cursors fighting flag cursors. Added suspect code check functionality for scripts to slap hands. 2014-11-19 14:29:11 -08:00
Scott Erickson
63c516c5f5 Quick fix to get people to the forest levels even if, for some reason, the first forest level isn't in the User list of earned levels. 2014-11-19 10:05:13 -08:00
Nick Winter
2af8271829 Some size/styling tweaks for goals and gold. 2014-11-19 09:01:01 -08:00
iAladdin
0b9d6ea5c3 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-19 12:51:59 +08:00
iAladdin
d24db06e0e improved Chinese Localization
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-19 12:51:39 +08:00
Nick Winter
96ff44017e A few fixes for unequippable cross-class item state. 2014-11-18 19:37:08 -08:00
iAladdin
43f56c7ff7 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-19 11:19:41 +08:00
iAladdin
5f1f02f8e8 improved Chinese localization 2014-11-19 11:19:31 +08:00
Nick Winter
3ad67130c7 A few bugfixes for new EaselJS problems and misaligned small-item-shop unequippable button. 2014-11-18 18:43:53 -08:00
Nick Winter
05b53fa10e Merge branch 'iAladdin-master' 2014-11-18 18:16:35 -08:00
Nick Winter
b3119e300d Resolved merge conflicts. 2014-11-18 18:16:17 -08:00
Nick Winter
666334b28c Made paths more visible, because I couldn't see them. 2014-11-18 18:13:59 -08:00
iAladdin
4bd578c18e improved Chinese localization 2014-11-19 09:45:15 +08:00
Scott Erickson
e93de815c2 Some tweaks to the TrailMaster, consolidating some changes and altering the dot style. 2014-11-18 16:18:51 -08:00
Scott Erickson
c40a7c1bb8 TrailMaster plays/pauses animations along with the rest of the Surface. 2014-11-18 16:03:47 -08:00
Scott Erickson
c23fb1d2b5 Removed TODO. 2014-11-18 15:57:06 -08:00
Scott Erickson
8ec016e4b2 Re-enabled RAF_SYNCHED, given the fix for https://github.com/CreateJS/EaselJS/issues/516 2014-11-18 15:56:33 -08:00
Scott Erickson
1444d84aea Upgraded the CreateJS suite, handling its slight changes. 2014-11-18 15:42:11 -08:00
Scott Erickson
9f79b3ba3e Removed treema update script. Better to point to a GitHub URL instead. 2014-11-18 15:41:41 -08:00
Matt Lott
957ca50c87 Disable spaces through The Raised Sword 2014-11-18 14:11:28 -08:00
Scott Erickson
5ee1289621 Goal states (for the purpose of triggering achievements) are now only saved as having succeeded when the overall level is succeeded. 2014-11-18 14:05:55 -08:00
Scott Erickson
1889c771f2 Added the close button to the GameMenuModal. 2014-11-18 13:57:44 -08:00
Scott Erickson
3008abed19 Made the Equip button in the inventory modal green. 2014-11-18 13:52:39 -08:00
Scott Erickson
6440ce528b Fixed the CSS of the item details view in the scrunched item store. 2014-11-18 13:48:59 -08:00
Scott Erickson
acd94c4247 Fixed the nanoscroller in the item details view to be off the sheet and always visible. 2014-11-18 13:44:34 -08:00
Scott Erickson
46f9667311 Made the double click hint alert in the inventory modal more visible. 2014-11-18 13:28:04 -08:00
Scott Erickson
a04bc63b87 Equip hint and available header now are visible only when there are items to equip. 2014-11-18 13:20:59 -08:00
George Saines
6310dcbcac Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-18 13:02:36 -08:00
George Saines
c9d7754623 adding a close button to the main menu modal 2014-11-18 13:02:32 -08:00
Scott Erickson
208f05cf67 Added an equip button to every piece of available equipment. 2014-11-18 13:02:06 -08:00
Nick Winter
f5b5ee2206 Fixes for updating paths during world streaming. 2014-11-18 12:40:28 -08:00
Scott Erickson
aab51178e2 Added WebGL paths. 2014-11-18 11:46:47 -08:00
Nick Winter
6ebc9e8c28 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-18 11:31:10 -08:00
Scott Erickson
2e6f08f7d8 Added stripe checkout script. 2014-11-18 11:30:37 -08:00
Nick Winter
f1a4249f18 More reductions in memory usage for iPad. 2014-11-18 11:21:29 -08:00
Matt Lott
b000389b3a Add problem range highlighting back
Now full line still pulses, and specific problem range has a darker red
background.
2014-11-18 10:03:02 -08:00
Matt Lott
7b3b904ad1 Hide problem alert on code reload 2014-11-18 09:36:01 -08:00
Matt Lott
05cc9c2f46 Move sync pvp status UI to control bar
Replaces level name UI for hero-ladder levels.
2014-11-18 09:01:07 -08:00