Scott Erickson
0dd2d9efbd
Handled merge conflict.
2014-12-22 12:33:52 -05:00
Scott Erickson
0d45e4a889
Set up the CampaignEditorView to trigger the CampaignView to re-render when things change.
2014-12-22 12:06:17 -05:00
Scott Erickson
1db8284236
When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView.
2014-12-22 11:09:58 -05:00
Scott Erickson
a31b385a4d
Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView.
2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0
Hooked up the CampaignView to show adjacent campaigns based on the data.
2014-12-22 10:29:29 -05:00
Rishi
364f40274d
Update SpellView.coffee
...
hey i made changes. due to some error in downloading your data base i cannot test it. but check it . i think it will work .
2014-12-22 18:06:32 +05:30
Imperadeiro98
2bca94161e
Fixed a link
2014-12-22 11:22:06 +00:00
Nick Winter
e153a7ecce
Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking.
2014-12-21 21:38:12 -08:00
Matt Lott
e7c626656e
No-cache User fetch in hero victory
...
After earning achievements. On IE, this call results in a cache hit,
so the User object was never updated with the sweet sweet loot you just
earned. Like a sword you need for True Names.
2014-12-21 21:14:38 -08:00
Nick Winter
5ae56750c0
Merge pull request #1976 from Imperadeiro98/patch-1
...
Removed unused stuff
2014-12-21 16:32:28 -08:00
Imperadeiro98
8da578e106
Update en.coffee
2014-12-21 21:46:45 +00:00
Imperadeiro98
393860ffa4
Update en.coffee
2014-12-21 21:30:15 +00:00
Imperadeiro98
0c00f9f0c1
Delete contribute_nav.jade
2014-12-21 21:09:52 +00:00
Imperadeiro98
5d9e303fb1
Added Martin005
2014-12-21 20:53:43 +00:00
Imperadeiro98
2b0757810c
Merge pull request #1973 from uaMithril/patch-3
...
Update uk.coffee
2014-12-21 20:11:47 +00:00
Imperadeiro98
0cbf76bc36
Merge pull request #1972 from uaMithril/patch-2
...
Update uk.coffee
2014-12-21 20:09:58 +00:00
Imperadeiro98
81eb028025
Merge pull request #1971 from tpai/patch-1
...
Update zh-HANT.coffee
2014-12-21 20:09:14 +00:00
Imperadeiro98
0c01a4ed8c
Merge pull request #1964 from Martin005/patch-5
...
Update cs.coffee
2014-12-21 20:02:27 +00:00
Mithril
837b62ee9d
Update uk.coffee
2014-12-21 13:51:18 +02:00
Mithril
7ad505252b
Update uk.coffee
2014-12-21 13:03:48 +02:00
tonypai
e815dff1de
Update zh-HANT.coffee
...
Hi, I've already sign the CLA, and this is my PR. :)
2014-12-21 16:13:40 +08:00
Nick Winter
e8d185a860
Embedding level completion checklist inside the level editor.
2014-12-20 20:01:07 -08:00
Nick Winter
f26b43f8a5
Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings.
2014-12-20 16:02:41 -08:00
Nick Winter
8528f5039b
Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level.
2014-12-20 14:40:28 -08:00
Nick Winter
e4c6d07a4a
Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699 . Fixed #57 . Colored collision overlays according to collision categories.
2014-12-20 13:39:51 -08:00
Martin005
eed3043a6d
Update cs.coffee
2014-12-20 19:00:56 +01:00
Imperadeiro98
a52bf08792
Fixed links
2014-12-20 09:32:59 +00:00
Imperadeiro98
6ebf25ad15
Linked community page to new i18n
2014-12-20 09:28:56 +00:00
Imperadeiro98
bd5184c23b
Update pt-PT.coffee
2014-12-20 09:12:31 +00:00
Nick Winter
08cb87c84d
Automatically take screenshots when submitting contact form from level view.
2014-12-19 18:37:42 -08:00
Nick Winter
6ac0bea5ca
Beefing up contact form data population.
2014-12-19 17:27:58 -08:00
Matt Lott
9522da28e8
Help video a/b results - helps clicked afterwards
2014-12-19 15:59:25 -08:00
Nick Winter
0041ffe423
Propagated i18n.
2014-12-19 15:36:16 -08:00
Nick Winter
2df1318e1b
Hooked up i18n for redesigned contribute view.
2014-12-19 15:35:18 -08:00
Matt Lott
b70b82c019
Help video a/b results - level completion
...
Also using initial event counts to account for weird uneven sampling
rates.
2014-12-19 15:17:22 -08:00
Scott Erickson
0cd85d7aba
Got the CampaignView mostly off the hardcoded data.
2014-12-19 16:46:01 -05:00
Imperadeiro98
4ca342c389
Fixed spacing
2014-12-19 20:46:34 +00:00
Imperadeiro98
560a3aaf44
Merge pull request #1940 from uaMithril/patch-1
...
Update uk.coffee
2014-12-19 20:45:19 +00:00
Imperadeiro98
9eee076709
Merge pull request #1962 from divaDseidnA/patch-6
...
Update hu.coffee
2014-12-19 20:44:30 +00:00
David Nagy
0c88f9f39c
Update hu.coffee
2014-12-19 20:18:08 +00:00
Scott Erickson
a742772b8f
Also added campaign view jade and sass file clones.
2014-12-19 13:06:20 -05:00
Scott Erickson
23da22a559
Added a new CampaignView, cloned from WorldMapView. Will migrate to using db data rather than hardcoded data.
2014-12-19 13:04:04 -05:00
Scott Erickson
59318b2f78
Merge branch 'master' into feature/campaign-editor
2014-12-19 12:54:11 -05:00
Nick Winter
0635d1dccf
Fixed typo in contract emails.
2014-12-18 22:22:44 -08:00
Nick Winter
59b433d863
Upgrading contact form context a bit.
2014-12-18 20:39:15 -08:00
Nick Winter
d801ed61ce
Separating contact emails into premium subscriber support and basic general support.
2014-12-18 20:35:14 -08:00
Matt Lott
ffa3366b8a
Help videos A/B results - sub followed?
...
Shows which level/style combo was followed by a sub purchase.
2014-12-18 17:18:48 -08:00
George Saines
31fb5fe80e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-18 16:31:33 -08:00
George Saines
9e88caf1e1
redesigned the contribute page
2014-12-18 16:31:30 -08:00
Matt Lott
368e5e24ee
Help videos A/B results - watched more videos?
...
Shows which style per-level yielded more additional videos watched.
2014-12-18 16:21:04 -08:00
