Commit graph

7748 commits

Author SHA1 Message Date
Nick Winter
e50b6f508c Propagated i18n. 2015-01-15 09:08:13 -08:00
Nick Winter
38297a1fd7 Fixed problem with levels that don't have next levels in campaign editor. 2015-01-15 09:07:47 -08:00
Imperadeiro98
b0d00ce213 Added generate terrain stuff 2015-01-15 17:07:11 +00:00
Imperadeiro98
16ad0de722 Removed spaces 2015-01-15 17:06:36 +00:00
Imperadeiro98
6db6c6b8fb Merge pull request #2102 from enricpc/patch-5
Update ca.coffee
2015-01-15 16:46:28 +00:00
enricpc
9dc45bdf45 Update ca.coffee 2015-01-15 09:44:27 +01:00
Matt Lott
c5977c00fe Add shortened fields to analytics.log.event
We’ll remove the old long fields after we’ve got enough data to switch
over our analytics queries without complication.
2015-01-14 17:51:34 -08:00
Nick Winter
865ae66b5c Merge pull request #2087 from emhs/master
Distro-specific devSetup for Arch Linux and Ubuntu
2015-01-14 16:23:32 -08:00
Matt Lott
10dc0c4794 Enable Google+ on login modal for IE 2015-01-14 14:16:08 -08:00
Scott Erickson
3c02f14f95 Reworking PlayHeroesModal to use Lanks and LayerAdapter to control hero animations. 2015-01-14 14:10:33 -08:00
Matt Lott
e79cadc761 Remove analytics.log.event created field
_id field already has created data:
http://docs.mongodb.org/manual/reference/object-id/
Also some misc analytics cleanup.
2015-01-14 13:03:02 -08:00
Matt Lott
140a93b453 Log world map and homepage events internally
Need these for conversion rates.
2015-01-14 11:09:56 -08:00
Matt Lott
3fd5f49220 Analytics data revamp
Add analytics per-day aggregation collection.
Add analytics strings collection.
Add per-day aggregation mongo insertion script.
Update campaign editor to use aggregation collection.
Update queries to use _id instead of created field.
2015-01-14 11:09:01 -08:00
Imperadeiro98
6b46e45526 Merge pull request #2097 from enricpc/patch-4
Update ca.coffee
2015-01-14 17:14:59 +00:00
Imperadeiro98
c9f0a9ec07 Merge pull request #2096 from RubenDjOn/master
Added new es-ES translations
2015-01-14 17:13:23 +00:00
enricpc
6bb3a77dad Update ca.coffee 2015-01-14 15:46:28 +01:00
RubenDjOn
ddec7b7f5a Added new es-ES translations 2015-01-14 00:53:05 +01:00
Scott Erickson
afe590c5cc Hid the misc tab until you have unlocked defense of plainswood, and by extension, the forest. 2015-01-13 15:34:06 -08:00
Nick Winter
81569a5501 Merge pull request #2095 from Imperadeiro98/master
Update patches.jade
2015-01-13 13:49:08 -08:00
Imperadeiro98
6993f52740 Corrected indentation 2015-01-13 21:45:52 +00:00
Imperadeiro98
68bc4e1c39 Tried to make i18n work 2015-01-13 21:38:34 +00:00
Imperadeiro98
7f645ce019 Update pt-PT.coffee 2015-01-13 21:18:22 +00:00
Nick Winter
181842e97b Merge branch 'master' into production 2015-01-13 13:10:47 -08:00
Nick Winter
268f5a5b0d Propagated i18n. 2015-01-13 13:10:39 -08:00
Imperadeiro98
6491105f68 Update save-campaign-modal.jade 2015-01-13 20:06:53 +00:00
Imperadeiro98
12ada4f30c Update campaign-editor-view.jade 2015-01-13 20:04:49 +00:00
Nick Winter
beb61ba8d4 Merge pull request #2094 from rishiloyola/patch-6
Update spell_palette_entry.sass
2015-01-13 11:06:50 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Rishi
8a4b6eebf4 Update spell_palette_entry.sass 2015-01-13 15:30:37 +05:30
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
Nick Winter
38948137b9 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-12 14:43:53 -08:00
Nick Winter
ae60e3ab46 Merge branch 'popey456963-master' 2015-01-12 14:43:45 -08:00
Nick Winter
382e10dbb4 Fixed missing ] in names.coffee. 2015-01-12 14:43:33 -08:00
Scott Erickson
5cb8f14065 Fixed the HeroVictoryModal handling of earned achievements which were earned a while ago. Before they were appearing as if achievements were always newly achieved. 2015-01-12 14:43:29 -08:00
Scott Erickson
f9a01db985 Added a delete endpoint for files. Fixes #33. 2015-01-12 13:37:01 -08:00
Popey456963
9ecb2822c0 Removed Duplicates 2015-01-12 20:18:35 +00:00
Popey456963
8d1ae770cb Added bunch of soldier names to names.coffee
Title pretty much says it all.
2015-01-12 20:04:22 +00:00
Elliott Seyler
70542acb04 Commenting out mongo autostart on Arch. 2015-01-12 12:03:54 -08:00
Scott Erickson
da93c45ef3 Tweaked emailLower and nameLower auto-setting to not set if their respective depending properties do not exist. With minimizing mongoose off, this was causing db duplicate key problems. 2015-01-12 11:51:48 -08:00
Imperadeiro98
8480fe7836 Update names.coffee 2015-01-12 19:35:37 +00:00
Nick Winter
7230f96daa Fixed syntax errors on names.coffee from #2089. 2015-01-12 10:49:55 -08:00
Nick Winter
1f377cf7ee Merge pull request #2089 from popey456963/master
Ordered names by alphabetical order
2015-01-12 10:49:06 -08:00
Popey Gilbert
bd14892cf2 Ordered names by alphabetical order
So that it is easier to see whether the names are in order or not.
2015-01-12 11:58:11 +00:00
Elliott Seyler
a9974b2929 Adding build-essential for Ubuntu 2015-01-11 22:37:56 -08:00
Elliott Seyler
c638090cc9 Missing import 2015-01-11 22:35:24 -08:00
Elliott Seyler
84c2d3b9a7 Ubuntu starts mongo automatically 2015-01-11 22:32:51 -08:00
Elliott Seyler
9153e1463d Adjusting the subprocess call. 2015-01-11 20:42:34 -08:00
Elliott Seyler
ace7d3d64e Switching to a fresher source of node for Ubuntu 2015-01-11 20:23:44 -08:00
Elliott Seyler
6c731d1e03 Python2 fix 2015-01-11 19:08:59 -08:00
Elliott Seyler
33b505bd87 Fixing Ubuntu code slightly. 2015-01-11 19:01:01 -08:00