codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
204 commits 27 branches 0 tags 134 MiB
Commit graph

125 commits

Author SHA1 Message Date
Dman19993
6f094f0f38 Update names.coffee 2014-01-09 14:47:24 -06:00
Paul Buser
7af5804e29 Fix "Contact" link in footer not properly changing cursor to pointer 2014-01-09 15:31:56 -05:00
Tavio
850313ca70 Update names.coffee 2014-01-09 18:00:39 -02:00
Nick Winter
98245d0fb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 11:28:14 -08:00
Nick Winter
3a954ff91c A bit more CoffeeScript-y. 2014-01-09 11:28:08 -08:00
Scott Erickson
4e34b38c83 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level/hud_view.coffee
 2014-01-09 11:05:51 -08:00
Scott Erickson
8077c62ceb Set up talking portraits in the hud. 2014-01-09 11:04:22 -08:00
Nick Winter
e2414f7c5a Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded. 2014-01-09 10:49:34 -08:00
Bård Eik-Hvidsten
1d525bad37 Update no.coffee 
Translated the text into Norwegian (Bokmål)
 2014-01-09 19:35:11 +01:00
Ronald Cheng
278b4d8754 If you have pressed esc, do not get prompted about it 2014-01-08 23:09:58 -08:00
Scott Erickson
391207d00f Fixes for unit portraits. 2014-01-08 22:30:00 -08:00
Nick Winter
03a5614a18 Fixed #96. 2014-01-08 19:18:23 -08:00
Scott Erickson
50beeb93bc Merge branch 'production' 2014-01-08 14:59:49 -08:00
Scott Erickson
4b8c8f22c1 Fixed logging out to update the header properly. 2014-01-08 14:57:59 -08:00
Scott Erickson
aab11ea5f7 Fixed logging in with facebook and google plus to not overwrite existing user settings. 2014-01-08 14:57:42 -08:00
Nick Winter
2fdb8c2dc2 Merge pull request #116 from rhc2104/press-esc 
Create notification that esc can skip dialogs
 2014-01-08 14:35:58 -08:00
Ronald Cheng
81eed31714 Create notification that esc can skip dialogs 
If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.
 2014-01-08 14:23:36 -08:00
Ronald Cheng
a717ee80fb Add more peasant names, and soldiers cannot be both Will and William 2014-01-08 11:34:52 -08:00
Michael Schmatz
ee3841b32c Merge pull request #110 from rhc2104/google-plus 
Make G+ button same size as other buttons
 2014-01-08 05:56:31 -08:00
Michael Schmatz
119812e126 Merge pull request #109 from rhc2104/404 
Center text in 404 page
 2014-01-08 05:13:06 -08:00
Ronald Cheng
3658d5ca3a Make G+ button same size as other buttons 
The default G+ button size is slightly larger than the Facebook and Twitter buttons.  Use the "medium" size to make the size even.
 2014-01-08 02:15:52 -08:00
Ronald Cheng
a61756a816 Center text in 404 page 2014-01-08 01:28:38 -08:00
engstrom
21536794be added peasant names 2014-01-07 20:59:43 -07:00
Tavio
07df7be1f4 Update names.coffee 
A few more names.
 2014-01-08 00:26:16 -02:00
Tavio
32eaf4a891 Update names.coffee 2014-01-07 23:02:55 -02:00
armaldio
9f4188da09 Update fr.coffee 
Hi, I'm French and I like CodeCombat.
I enjoy translate things from English to French.
If you agree, I can translate many of levels dialogues :D
 2014-01-07 23:56:41 +01:00
Gabriel Cebrian
74bcc4ec1b Increase element padding to avoid cutting words off 2014-01-07 14:05:39 -05:00
Gabriel Cebrian
ad12680ce9 Make language options menu right aligned instead of left aligned 
Remove horizontal scrollbar that is shown when vertical scrollbar is shown
Changed top property to improve look
 2014-01-07 13:27:46 -05:00
Nick Winter
70cd16cee4 Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -08:00
Scott Erickson
250b7322a9 Fixed #56 2014-01-06 21:25:18 -08:00
Scott Erickson
a988c91a63 Fixed blog links. 2014-01-06 20:17:27 -08:00
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
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
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
Scott Erickson
d1c33430d8 Tweaked the Archmage contribute copy. 2014-01-05 17:01:23 -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
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
fa1d24ba8f Updated README. 2014-01-05 12:32:44 -08:00
Nick Winter
164dd49933 Fixed a GitHub link. 2014-01-04 22:20:17 -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
Nick Winter
01cfcbedc7 Updated some $attr, $val, and $prop calls. 2014-01-04 15:49:13 -08:00
Scott Erickson
0499cddbe6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-04 08:56:29 -08:00
Scott Erickson
c4bfcd5c2d Refactored portraits to be built in sprite sheets separately. 2014-01-04 08:55:12 -08:00
Mischa Lewis-Norelle
c35cd3437f Added a bunch of names 
Added a bunch of names, will come up with more tomorrow and add them in
the evening.
 2014-01-03 23:28:09 -06:00
Scott Erickson
56fa98e76b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-03 14:31:27 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
ffebe45267 Updated uglify-brunch options to not break on for(;;). 2014-01-03 13:49:36 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00