Michael Schmatz
a3d1e0aaef
Merge branch 'master' into production
2014-12-24 16:46:29 -05: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
Matt Lott
b33e3a93ba
Level completion rates script
2014-12-24 11:09:58 -08:00
Nick Winter
a7b39c981b
Merge branch 'master' into production
2014-12-24 11:03:01 -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
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
4f80d2a977
Merge branch 'master' into production
2014-12-23 08:20:45 -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
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
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
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
e04b5a58cf
Merge branch 'master' into production
2014-12-21 21:46:28 -08: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
69118206ab
Merge branch 'master' into production
2014-12-20 20:02:03 -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
20ae570959
Merge branch 'master' into production
2014-12-20 13:43:36 -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
