Commit graph

12478 commits

Author SHA1 Message Date
Scott Erickson
f0147e8f7c More tweaks to the thang editor. 2014-01-06 19:33:36 -08:00
Scott Erickson
7d638b596f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 19:10:57 -08:00
Scott Erickson
ddbf45b50c Made the thang editor a little more organized. 2014-01-06 19:09:43 -08:00
Nick Winter
845601ed96 No need for wallNameFor any more. 2014-01-06 19:07:13 -08:00
Scott Erickson
59ec63c041 Fixed #60. 2014-01-06 18:12:57 -08:00
Scott Erickson
aeaeb84fe5 Fixed general articles showing up in the guides. 2014-01-06 18:03:17 -08:00
Scott Erickson
5a4de61999 Bug fix. 2014-01-06 17:56:34 -08:00
Scott Erickson
975a7453bd Refactored initial User creation. 2014-01-06 17:45:35 -08:00
Scott Erickson
a9c70f9a7d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 17:15:24 -08:00
Scott Erickson
94cb6ea4e1 Fixed up the search optimization and installed thang portraits into the level editor. 2014-01-06 17:11:57 -08:00
Nick Winter
1297126abd Added back lang val instead of attr setting. 2014-01-06 16:58:50 -08:00
Scott Erickson
68313b42ba Searches now use projections, way faster. 2014-01-06 15:44:20 -08:00
Scott Erickson
fe984d7c73 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 15:36:50 -08:00
Scott Erickson
27e7b6c240 Tweaks for thang portraits. 2014-01-06 15:36:35 -08:00
Nick Winter
8b4ec9b263 Merged and cleaned up #79. 2014-01-06 15:18:40 -08:00
Nick Winter
f53f20a6ad Fixed #86. 2014-01-06 14:53:21 -08:00
Tom Steinbrecher
60c4b360d5 Added ContribueClassView, which all contribute pages are now based off of.
Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages.

Fixed other small bugs.
2014-01-06 17:30:35 -05:00
Nick Winter
fa687c4c30 Increase infinite loop timeout wait slightly to bandage #81. 2014-01-06 12:47:50 -08:00
Scott Erickson
f656a4f4cf Set up portrait uploading for thangs. 2014-01-06 12:37:35 -08:00
Scott Erickson
a99073fc5e Fixed account recovery on dev server. 2014-01-06 12:14:12 -08:00
George Saines
7758ecc91b Added additional names for units. 2014-01-06 11:06:03 -08:00
George Saines
387eab5592 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 11:02:03 -08:00
George Saines
123affeec6 Fixing a typo in the CLA 2014-01-06 11:02:00 -08:00
Nick Winter
316b382d81 Fix for announcement duplicates. 2014-01-06 10:33:52 -08:00
Tom Steinbrecher
75894d1160 Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before 2014-01-06 00:56:32 -05:00
Tom Steinbrecher
34dd42a7ca Refactored contribute pages, each class has it's own page. Better fix to issue 13 and solution to 14 2014-01-06 00:41:31 -05:00
Michael Schmatz
b8d65bab44 Fixed function call 2014-01-05 22:42:44 -05:00
Scott Erickson
598106e39a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-05 17:01:33 -08:00
Scott Erickson
d1c33430d8 Tweaked the Archmage contribute copy. 2014-01-05 17:01:23 -08:00
Michael Schmatz
5238b85a96 Edited script to enable pulling of forked repositories 2014-01-05 19:51:54 -05:00
Scott Erickson
9019368d1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-05 16:03:06 -08:00
Scott Erickson
1ad9f5e283 Fixed the CLA date property setting. 2014-01-05 16:02:50 -08:00
Nick Winter
3a448d589a Merge pull request #77 from chloester/master
Fixed #13
2014-01-05 15:59:30 -08:00
Chloe Fan
5a9b55342e Aligning intro to rest of the page 2014-01-05 15:55:36 -08:00
Chloe Fan
b7ecab102e Issue 13. Pushed header and image down to compensate for fixed top bar 2014-01-05 15:51:46 -08:00
Nick Winter
1185731fd0 Fixed two bugs with the CLA. 2014-01-05 15:07:30 -08:00
Nick Winter
b4b8d95424 Merge pull request #75 from smoratinos/master
a readlink alternative in bash test script
2014-01-05 14:46:29 -08:00
Nick Winter
f1186f6092 Contributor emails now indicate saved. 2014-01-05 14:45:55 -08:00
Nick Winter
ec20cac6f7 Allowed access to character class emails by prompting for signup on check. 2014-01-05 14:20:48 -08:00
Nick Winter
f0989b67c9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-05 12:32:54 -08:00
Nick Winter
fa1d24ba8f Updated README. 2014-01-05 12:32:44 -08:00
Sébastien Moratinos
e8e8b4bb66 a readlink alternative in bash test script 2014-01-05 20:09:58 +01:00
Nick Winter
d5ee2307f8 Merge pull request #74 from smoratinos/master
fix directory path in shell script
2014-01-05 11:03:19 -08:00
Michael Schmatz
a2138e5d3d Fixed bin deletion bug 2014-01-05 14:01:22 -05:00
Sébastien Moratinos
be40fc337e fix directory path in shell script 2014-01-05 18:32:42 +01:00
Nick Winter
164dd49933 Fixed a GitHub link. 2014-01-04 22:20:17 -08:00
Nick Winter
b9531c7c02 Merge pull request #73 from TomSteinbrecher/master
Completed #48: Adds bobbing to thangs with 'bobs' property.
2014-01-04 22:09:09 -08:00
Tom Steinbrecher
d50c362286 Refactored ticker, fixed from all instances were using same ticker. 2014-01-05 01:05:03 -05:00
Tom Steinbrecher
b5bb1b13a1 Completed issue 48: Adds bobbing to thangs with 'bobs' property.
Thangs with 'bobs' must also set 'bobSpeed' and 'bobHeight'
2014-01-04 22:51:53 -05:00
Nick Winter
1d223f790b Trying to force soft tabs and Unix newlines. 2014-01-04 16:41:25 -08:00