Commit graph

6608 commits

Author SHA1 Message Date
Matt Lott
bf54e3d04e Add average playtime to level rates script 2014-12-24 15:34:30 -08:00
Michael Schmatz
3d1ee9767f Fix sorting crashing bug 2014-12-24 16:45:34 -05:00
Nick Winter
95f76ae9d8 Merge branch 'rishiloyola-patch-4' 2014-12-24 12:37:51 -08:00
Nick Winter
b116321deb Tested and cleaned up comment detection for space disablement sensitivity. 2014-12-24 12:37:25 -08:00
Nick Winter
c7eadb5670 Merge branch 'patch-4' of git://github.com/rishiloyola/codecombat into rishiloyola-patch-4 2014-12-24 12:24:27 -08:00
nixel2007
b3bced93ac Update ru.coffee 2014-12-24 22:57:54 +03:00
nixel2007
917a61b310 Revert "Fixed i18n-coverage bug"
This reverts commit 97cdb76b82.
2014-12-24 22:15:52 +03:00
Matt Lott
b33e3a93ba Level completion rates script 2014-12-24 11:09:58 -08:00
Nick Winter
d6b5c14123 Give me thine email addresses correctly, dear contact handler. 2014-12-24 11:02:52 -08:00
Nick Winter
1c1f2008a5 Now able to suggest required items for purchase before level start. 2014-12-24 11:01:50 -08:00
nixel2007
d74a86d06a Merge remote-tracking branch 'upstream/master' 2014-12-24 15:19:43 +03:00
Michael Schmatz
2e9e9ee85c Put limit on things to be sorted
We might have to alter the queries a bit if we aren't happy with the results
2014-12-23 20:19:20 -05:00
Nick Winter
f361674fb4 Enabling new levels for playtesting. 2014-12-23 17:14:59 -08:00
Nick Winter
f0826c865e Preparing new campaign levels for migration to new campaign editor. 2014-12-23 17:14:35 -08:00
Nick Winter
759e193f29 Pulling email from user in contact form if they gave an invalid email reply-to. 2014-12-23 08:20:35 -08:00
Nick Winter
f17b3bd03b Fixed indentation and punctuation for superpower tip. 2014-12-23 07:57:07 -08:00
Nick Winter
48603e5bc8 Merge pull request #1985 from osanseviero/patch-3
New tip
2014-12-23 07:56:19 -08:00
Nick Winter
4f2770f595 Merge pull request #1984 from osanseviero/patch-2
New tip
2014-12-23 07:56:12 -08:00
Omar S.
9a30c35a3b New tip
Added superpower tip
2014-12-23 09:54:57 -05:00
Omar S.
f48c2b0def New tip
Added superpower tip
2014-12-23 09:54:31 -05:00
Scott Erickson
96c8e035cf Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema. 2014-12-23 09:42:24 -05:00
Scott Erickson
b567e737cd Tweaked campaign editor styling. 2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443 Tweaked campaign editor styling. 2014-12-23 09:19:08 -05:00
Scott Erickson
1bb76d5902 Fixed shadow placements. 2014-12-23 09:12:41 -05:00
Imperadeiro98
31ed540964 Merge pull request #1983 from tpai/patch-1
Update zh-HANT.coffee
2014-12-23 09:06:33 +00:00
tonypai
30eb96f151 Update zh-HANT.coffee 2014-12-23 16:01:33 +08:00
Nick Winter
5e3ae981d7 Merge pull request #1981 from Lynxbob/master
Added 3 new name lists and 10 new names
2014-12-22 17:40:51 -08:00
Branden Webb
eb3e0621f2 Added Sand Yak name list, Ogre Scout M name list, and Ogre Scout F name list. Also added 10 names, 5 for Sand Yak, 3 for Ogre Scout M, and 2 for Ogre Scout F. 2014-12-22 20:07:22 -05:00
Nick Winter
43e9b6fe88 Merge pull request #1979 from osanseviero/patch-1
Added names
2014-12-22 16:42:10 -08:00
Omar S.
3ed3dd00fa Added two names 2014-12-22 18:19:57 -05:00
Scott Erickson
d18260c20c Merge branch 'master' into feature/campaign-editor 2014-12-22 16:39:07 -05:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
George Saines
116feb5bea turning off realtime playback on the riddling kithmaze 2014-12-22 11:11:43 -08:00
Imperadeiro98
72e426c0e0 Fixed another link 2014-12-22 18:16:06 +00:00
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