codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5988 commits 27 branches 0 tags 134 MiB
Commit graph

5988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
29cbf16dd7 Merge branch 'master' into production 2014-11-20 19:32:37 -08:00
Nick Winter
fcfe81c63e Added endangered-burl and village-guard. 2014-11-20 19:32:09 -08:00
Nick Winter
6d7bc9ce11 Fixed #1729. 2014-11-20 17:09:29 -08:00
Michael Schmatz
f84e92595b Changed UDID to identifierForVendor 2014-11-20 20:03:24 -05:00
Scott Erickson
a18537b065 Added the ability to assign a user an iOS UDID, and login with it. 2014-11-20 15:54:15 -08:00
Scott Erickson
fae09aad00 Turned on double optin for MailChimp. 2014-11-20 14:31:50 -08:00
Matt Lott
ef8e7563b4 Increase autocomplete font size in dungeon levels 
Also moving getCampaignForSlug to new CampaignOptions file.
 2014-11-20 12:41:56 -08:00
Nick Winter
79ac94d84a Fixed busted item crash. 2014-11-20 11:59:49 -08:00
Nick Winter
df51e28a1d Fixed camera zoom killing coordinate hover unnecessarily. 2014-11-20 11:37:10 -08:00
Nick Winter
46c4601ac6 Levels (back) link now embiggened. 2014-11-20 11:11:38 -08:00
Matt Lott
f80baf3eb2 Update autocomplete instruction to 'press tab' 
Enter no longer autocompletes, instead dismisses popup and executes a
Return
 2014-11-20 10:56:38 -08:00
Nick Winter
83bbb6bef2 Merge pull request #1766 from iAladdin/master 
improved Chinese localization zh-HANS.coffee
 2014-11-20 09:02:32 -08:00
Nick Winter
7b7ceeba53 Right, it's long-sword, not longsword. 2014-11-20 08:49:18 -08:00
iAladdin
0fcffc9736 improved Chinese Localization 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-21 00:16:45 +08:00
iAladdin
84c6ed0193 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-20 11:14:05 +08:00
iAladdin
55f725de93 fixed error 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-20 11:13:47 +08:00
Nick Winter
bfeb1457a1 Merge branch 'master' into production 2014-11-19 18:36:40 -08:00
Nick Winter
b0f65a4da8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-19 18:36:30 -08:00
Nick Winter
8280347752 Fixes to spell palette doc hovering and ensuring at least two column layout. 2014-11-19 18:36:09 -08:00
Matt Lott
81d6c186dc Add time to missing null check error messages 2014-11-19 17:13:00 -08:00
Nick Winter
afff1056cb Don't be draggin' all these images around yo. 2014-11-19 16:36:06 -08:00
iAladdin
dff443bc07 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-20 08:22:23 +08:00
iAladdin
883a58ed2d improved Chinese Localization 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-20 08:22:10 +08:00
Scott Erickson
09087428b9 Got lanks to update healthbars when the floating layer spritesheet is recreated. 2014-11-19 16:09:48 -08:00
Nick Winter
716f8864f1 Increased dialogue strong tag color contrast. 2014-11-19 16:09:25 -08:00
Nick Winter
5c0f007c4f Toning down executing highlights when errored out as well as when ended. 2014-11-19 16:05:00 -08:00
Nick Winter
89f0f52714 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-19 16:04:29 -08:00
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