Commit graph

5895 commits

Author SHA1 Message Date
Scott Erickson
8edde2f470 Fixed purchased items and such in the user so that they're strings instead of ObjectIds. 2014-11-05 16:41:03 -08:00
George Saines
b751f5ab22 making the selection in the item store lighter 2014-11-05 16:35:59 -08:00
Nick Winter
4052809906 Merge branch 'master' into production 2014-11-05 15:45:39 -08:00
Nick Winter
f8679dfeca Hide say() until later levels. Fix bug with identifying correct equipped item ThangTypes in the spell palette. 2014-11-05 15:43:08 -08:00
Nick Winter
ccc41eef8a Merge branch 'master' into production 2014-11-05 15:06:51 -08:00
Nick Winter
46409ef10d Made goals styling more robust to different sizing scenarios. 2014-11-05 15:06:26 -08:00
Nick Winter
189c3d202c Goals now show status: 'Running...' while the world is simulating. 2014-11-05 14:42:55 -08:00
Nick Winter
fd36dc9d79 Propagated i18n. 2014-11-05 14:35:02 -08:00
Nick Winter
a73b7df179 Added i18n for some more inventory screen strings. 2014-11-05 14:33:56 -08:00
Nick Winter
184e4c124a Impossible to select another slot and hide the available item the arrow is requiring you to equip. 2014-11-05 14:17:11 -08:00
Nick Winter
2e3755d2b9 Disabled gem/xp pulse animation on iPad, since it's too slow to do it justice. 2014-11-05 14:07:04 -08:00
Nick Winter
081e1ced20 Killed scroll bars on programming language selection fancy select. 2014-11-05 14:02:49 -08:00
Nick Winter
0e1afff318 No fold widgets in ACE. 2014-11-05 13:53:23 -08:00
Nick Winter
6c15833b70 Removed confusing ThangAvatarView title so as not to disturb beginner players in hero levels. 2014-11-05 13:49:49 -08:00
Nick Winter
478cad02d6 Ability to pass hints to argument errors. 2014-11-05 13:44:28 -08:00
Nick Winter
2afc7c830a Implemented getHeroStats. 2014-11-05 13:28:54 -08:00
Scott Erickson
0d578c84dc Merge remote-tracking branch 'origin/master' 2014-11-05 12:23:47 -08:00
Scott Erickson
dc48cab6d1 Added a getHeroStats function stub. 2014-11-05 12:23:34 -08:00
Nick Winter
41b76b5b4d Merge pull request #1728 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-11-05 11:39:50 -08:00
Imperadeiro98
8121ce9704 Update pt-PT.coffee 2014-11-05 19:12:04 +00:00
Nick Winter
a93daa9e73 Merge branch 'master' into production 2014-11-05 10:40:52 -08:00
Nick Winter
6efcbc5ead Hid Crawlways of Kithgard. A/B testing Haunted Kithmaze vs. The First Kithmaze. Renamed New Sight to Dread Door and awarded its glasses later. 2014-11-05 10:40:37 -08:00
Nick Winter
a2554570b0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-05 07:50:13 -08:00
mcaeiror
c2f2bbcd41 gl.coffee
Minor edition
2014-11-05 16:22:25 +01:00
mcaeiror
e9b966de83 Update gl.coffee
Some more translations into Galician language
2014-11-05 09:17:58 +01:00
Matt Lott
40506d23a6 Admin growth view 2014-11-04 22:17:49 -08:00
Nick Winter
f461aeca95 Implemented new playback scrubber textures. 2014-11-04 19:03:35 -08:00
Nick Winter
49b8c745a0 New GoalsView background. Be my guest with any text color improvements. 2014-11-04 17:20:58 -08:00
Nick Winter
3a811a05fd Paying attention to level-specific Allied significantProperty overrides in Hero Placeholder replacement. 2014-11-04 16:09:29 -08:00
Nick Winter
cfd3e23c14 Merge branch 'master' into production 2014-11-04 08:44:25 -08:00
Nick Winter
b776350e6a Made item shop fit on iPad and small screens. 2014-11-04 08:39:36 -08:00
mcaeiror
0937dbe75c Update gl.coffee
First edition of the galician translation. To be checked!
2014-11-04 17:31:24 +01:00
mcaeiror
bb7e516521 Create gl.coffee
Translation into Galician
2014-11-04 17:28:47 +01:00
Nick Winter
ff1f9d488c Hiding items with no stats or properties in the item shop for non-admins. Simple Boots show as owned. Enabled item shop for non-admins. 2014-11-04 07:52:23 -08:00
Nick Winter
e7e2acf4db Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-04 07:19:40 -08:00
Nick Winter
9dba7ee187 Temporarily making Wizard/Ranger gear unpurchasable while we have no Wizards or Rangers. 2014-11-04 07:19:30 -08:00
Nick Winter
590462ec8f Merge pull request #1725 from Igzok/patch-4
Update fr.coffee
2014-11-04 06:51:51 -08:00
Igzok
98cf74e375 Update fr.coffee
Corrections & translations
2014-11-04 12:32:18 +01:00
Nick Winter
bfdc671b1d Made Open Sans Condensed use small-caps in a bunch of the places it's used as a header font to slightly better match the old font weights of Bangers. 2014-11-03 22:19:43 -08:00
Scott Erickson
2dee00883c Removed the testing code for the PlayItemsModal. 2014-11-03 20:53:49 -08:00
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Scott Erickson
54a9497a4f Disabling space-less json for development. 2014-11-03 10:51:20 -08:00
Nick Winter
6db298f03c Merge pull request #1719 from newick/patch-1
corrected incomplete translation
2014-11-03 10:03:04 -08:00
Nick Winter
9ac06fc781 Merge pull request #1718 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-11-03 10:02:33 -08:00
Nick Winter
b433aaaa46 Merge branch 'Igzok-patch-2' 2014-11-03 10:02:15 -08:00
Nick Winter
dd8654f325 Fixed fr merge. 2014-11-03 10:02:01 -08:00
Nick Winter
a6f6389b56 Merge branch 'mcclane653-patch-1' 2014-11-03 10:00:09 -08:00
Nick Winter
aa0dda7886 Fixed nb merge. 2014-11-03 09:59:55 -08:00
Nick Winter
447432301d Turning some links into buttons for iPad. 2014-11-03 09:58:57 -08:00
newick
6ac4edcb12 corrected incomplet translation 2014-11-03 13:39:55 +01:00