codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 03:16:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4187 commits 27 branches 0 tags 134 MiB
Commit graph

3128 commits

Author SHA1 Message Date
Jayant Jain
c33491b04d Presets in terrain_generate_modal shown from a list instead of hardcoded 
Conflicts:
	app/templates/editor/level/modal/terrain_randomize.jade
 2014-07-25 17:51:48 +05:30
Jayant Jain
af23c09799 Refactors some code for presets in terrain generator 2014-07-25 17:50:21 +05:30
Jayant Jain
86cf344f28 Adds preset images to preview the generated terrain 2014-07-25 17:50:02 +05:30
Darredevil
f78c48c893 Docs tab v2 2014-07-25 01:26:34 +03:00
Imperadeiro98
19f257f1d0 Update pt-PT.coffee 2014-07-24 22:43:39 +01:00
Michael Schmatz
d773c301fb Add message if no player code in profile 2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b Add login link to profile login prompt 2014-07-24 10:16:43 -07:00
Melondonut
26ab77b1ae Update ko.coffee 2014-07-24 15:43:23 +09:00
Melondonut
f082aa6e9b Update ko.coffee 2014-07-24 15:30:54 +09:00
Michael Schmatz
e0d7392c1f Merge pull request #1386 from codecombat/pr/1376 
Pr/1376
 2014-07-23 15:27:13 -07:00
Michael Schmatz
be28f3e6a0 Uncommented some commented translated lines 2014-07-23 15:23:53 -07:00
Michael Schmatz
7910c5d9cc Implement #1370 2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d Merge branch 'pr/1383' 
Conflicts:
	app/views/play/level/tome/SpellListTabEntryView.coffee
 2014-07-23 14:44:15 -07:00
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -07:00
Dominik Kundel
5279b01483 fixed showing pinned popover 2014-07-23 17:39:16 +02:00
Scott Erickson
beef508e76 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 07:09:12 -07:00
Scott Erickson
65375aa5fc Renamed problem and spell to their new, capitalized names. 2014-07-23 07:09:05 -07:00
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Dominik Kundel
4f6ca5335f fixed spell palette sliding behind HUD 2014-07-23 15:50:47 +02:00
Dominik Kundel
72c1bb28b3 fixed artefact 2014-07-23 15:26:22 +02:00
Dominik Kundel
9cb704a843 last fix for dimming the editor 2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Melondonut
cb3f547b9e Update ko.coffee 2014-07-23 14:32:11 +09:00
Melondonut
dbb3d92b81 Update ko.coffee 2014-07-23 13:56:18 +09:00
Dominik Kundel
5db634d6a8 fullscreen on keyboard shortcut 2014-07-22 21:47:36 +02:00
George Saines
8982c7ea5b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-22 09:11:30 -07:00
George Saines
574252df32 subbing in Pavel's better tiny programming language icons 2014-07-22 09:11:25 -07:00
greyhusky
a313c3ab27 More translations 
Translated the "about" page and parts of "legal" page as well as some other stuff
 2014-07-22 15:01:47 +02:00
Melondonut
8476aa33f9 Update ko.coffee 2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff Update ko.coffee 2014-07-22 10:13:24 +09:00
Michael Schmatz
283108da1e Added login message for anonymous users on job profile 2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Michael Schmatz
e8ffb8980f Removed filterActive from filter alerts 2014-07-21 14:47:44 -07:00
Michael Schmatz
735a7082ee Correction to filter schema 2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2 Added saved employer filter alerts to schema 2014-07-21 09:44:40 -07:00
Nick Winter
ac7e663418 Merge pull request #1359 from Melondonut/patch-2 
translation Update ko.coffee
 2014-07-20 22:44:05 -07:00
Melondonut
fed5f3bce0 uncommented line 485 2014-07-21 14:11:17 +09:00
Darredevil
61ebc4d15b Docs tab 2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe Merge pull request #1360 from Darredevil/master 
Docs page enhancement
 2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9 Docs page enhancement 2014-07-21 02:23:01 +03:00
Nick Winter
99e1a8b30a Merge pull request #1357 from TheSecretSquad/issue#1213crosshair 
Changed point marker to crosshair, made it bigger, and changed color to white
 2014-07-20 16:04:29 -07:00
Nick Winter
a7905db316 Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible. 2014-07-20 15:51:48 -07:00
Melondonut
f5ac5423f8 Update ko.coffee 
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
 2014-07-21 06:03:53 +09:00
Darredevil
f8cc64dc4c fix for no user logged 2014-07-20 22:14:33 +03:00
Melondonut
9724c4f218 Update ko.coffee 
Hi there. 
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."  
thank you, 
Melondonut.

안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
 2014-07-20 23:19:41 +09:00
Nick Winter
1537754a16 A few bugfixes, plus gigantic child window convenience for me editing levels. 2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed Changed point marker to crosshair, and changed color to white 2014-07-19 20:12:56 -04:00
Nick Winter
d45c2d31de New language icons. 2014-07-18 20:14:41 -07:00
Scott Erickson
e7a70bbd0b Merge conflict handling. 2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804 Removed the deprecated ErrorView. 2014-07-18 16:56:08 -07:00
Scott Erickson
00c11fd70e Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data. 2014-07-18 16:46:28 -07:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Scott Erickson
74425103d1 Fixed some DemoView issues, mainly clicking links from one demo to another. 2014-07-18 16:12:27 -07:00
Scott Erickson
90a4a1b635 Added setProjection so CocoModels can more easily get subsets of data. 2014-07-18 16:12:27 -07:00
George Saines
18631ec5b1 upgrading our level icons 2014-07-18 15:42:53 -07:00
Michael Schmatz
321bce121c Edited task schema 2014-07-18 14:50:31 -07:00
Imperadeiro98
3ac1d6c77c Update pt-PT.coffee 2014-07-18 15:48:36 +01:00
Imperadeiro98
051fd9ecbc Update pt-PT.coffee 2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11 Propagated i18n tags for code language blurbs. 2014-07-17 20:13:30 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -07:00
Scott Erickson
708f67ebd5 Merge branch 'master' into renameViews 2014-07-17 17:24:09 -07:00
Scott Erickson
cdf65d4f42 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 17:23:56 -07:00
Scott Erickson
59b723b890 Refactoring View to ModalView. 2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583 Refactoring View to CocoView. 2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c Refactoring View to RootView. Refactoring some RootViews to be routed manually. 2014-07-17 17:16:32 -07:00
Nick Winter
079d336881 Stopped .nano from overriding Bootstrap's column width for component docs page. 2014-07-17 16:36:59 -07:00
Scott Erickson
2b4b91733c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e Work on the job profile view, initial work on the code modal. 2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d Merge pull request #1344 from Darredevil/master 
fix for no user logged
 2014-07-17 16:30:51 -07:00
Scott Erickson
51e63ddbc3 Fixed some DemoView issues, mainly clicking links from one demo to another. 2014-07-17 16:29:26 -07:00
Scott Erickson
4818a81854 Added setProjection so CocoModels can more easily get subsets of data. 2014-07-17 16:22:06 -07:00
Nick Winter
e412a7b73f Merge pull request #1341 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-17 16:00:54 -07:00
Nick Winter
769c26229e Merge pull request #1340 from sunzenshen/master 
Fixed typo: Chose -> Choose
 2014-07-17 15:59:08 -07:00
Nick Winter
8813a7f545 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup. 2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Scott Erickson
590626d5f8 Centered social link icons. 2014-07-17 09:30:27 -07:00
Scott Erickson
6f09e95d68 Removed background from job profile view. 2014-07-17 09:22:52 -07:00
Darredevil
b6469ff45b fix for no user logged 2014-07-17 19:12:26 +03:00
Darredevil
80b420ebbf fix for no user logged 2014-07-17 19:11:23 +03:00
Michael Schmatz
ccb2ad67ac Merge pull request #1342 from codecombat/feature/mail-system 
Feature/mail system
 2014-07-17 07:18:39 -07:00
Imperadeiro98
17a4a689e4 Update pt-PT.coffee 2014-07-17 14:18:29 +01:00
Imperadeiro98
991ef61d62 Update pt-PT.coffee 2014-07-17 13:44:14 +01:00
Imperadeiro98
1b6fc95d77 Update pt-PT.coffee 2014-07-17 13:25:25 +01:00
Alan Shen
c56be02222 Fixed typo: Chose -> Choose 
It may be late to describe incoming targets with past tense.
 2014-07-17 01:16:08 -06:00
Darredevil
83177c5f00 language sensitive docs added 2014-07-17 03:19:09 +03:00
Darredevil
8da06f6c6b language sensitive docs added 2014-07-17 03:18:06 +03:00
Michael Schmatz
ae23679a26 Hard code mail tasks and add unsubscribe 2014-07-16 16:37:06 -07:00
Nick Winter
781e1da93e Fixed typo: massword -> password. 2014-07-16 16:14:48 -07:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
Nick Winter
855461a67e Don't let test view interfere with normal body styles. 2014-07-16 16:01:37 -07:00
Michael Schmatz
b74bdfbf51 Added metadata to mail sent schema 2014-07-16 12:12:11 -07:00
Michael Schmatz
bb3c583300 Add approved date to job profile 2014-07-16 10:51:45 -07:00
nemoyatpeace
f17112ecf8 Minor adjustment to the aoe script 2014-07-17 00:53:52 +08:00
Nick Winter
5ce0cff538 Propagated i18n. Added password repeat to base en.coffee. 2014-07-16 08:03:25 -07:00
Nick Winter
1fd28c0181 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-16 07:54:23 -07:00
Nick Winter
bf0e1ead92 Merge pull request #1335 from rubenvereecken/settings_patch 
Did UX changes, added an error and fixed a job profile editing bug
 2014-07-16 07:52:04 -07:00
Nick Winter
085951fa4a Removed more counselor stuff. 2014-07-16 07:47:41 -07:00
Nick Winter
5b693d02cf Merge pull request #1330 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-16 07:47:08 -07:00
Ruben Vereecken
bfc4ef58b0 Did UX changes, added an error and fixed a job profile editing bug 2014-07-16 14:47:55 +02:00
Imperadeiro98
4dbb49aa72 Update en.coffee 2014-07-16 13:24:16 +01:00
Nick Winter
6e9091fdf0 More fixes to documentation popovers. 2014-07-15 19:25:53 -07:00
Nick Winter
906ab3ac2b Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette. 2014-07-15 18:54:55 -07:00
Nick Winter
03cc2d1af0 Fixed Grass01-Grass05 scaling issues. 2014-07-15 18:08:00 -07:00
George Saines
8c9c41f477 copy tweak on the employer homepage 2014-07-15 17:27:26 -07:00
Jayant Jain
fa595fcb32 Better positioned level border trees 2014-07-16 05:03:18 +05:30
Jayant Jain
741956b251 Borders and floors are placed inside positive axes 2014-07-16 05:03:18 +05:30
Imperadeiro98
7d476470c7 Corrected a mistake 2014-07-15 20:17:50 +01:00
Imperadeiro98
32d4408f67 Update pt-PT.coffee 
Delete lines 747-753 and 775-776.
 2014-07-15 20:02:23 +01:00
Scott Erickson
3325332626 Fixes #1328. 2014-07-15 11:23:55 -07:00
Scott Erickson
fb83028d87 Added watchers to list of properties to skip in deltas/patches. 2014-07-15 11:23:35 -07:00
Nick Winter
e06f9132d1 Fixed #469. 2014-07-15 10:24:18 -07:00
Nick Winter
da73975f20 Fixed #1095. 2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171 Fixed #1010. 2014-07-15 09:35:14 -07:00
Nick Winter
39bea855d1 Propagated new i18n tags with the script. 2014-07-15 08:22:02 -07:00
Nick Winter
b3e8eb8504 Working on something for #1327. 2014-07-14 19:32:35 -07:00
Nick Winter
7b39bd06f3 Fixed #1321. 2014-07-14 17:54:32 -07:00
Scott Erickson
d8d40ab0f6 Fixes #1116 2014-07-14 17:46:12 -07:00
Scott Erickson
b113e126a3 Fixes #1316 and #1318 2014-07-14 17:18:48 -07:00
Scott Erickson
888ee6c0bb Fixed deltas in the version history modal. 2014-07-14 16:37:10 -07:00
Scott Erickson
9d22a35194 Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat 2014-07-14 15:13:52 -07:00
Nick Winter
f2f3817e10 Fixed Thang Editor scaling. 2014-07-14 14:10:46 -07:00
Nick Winter
cfeb6c34a4 Merge pull request #1324 from Darredevil/master 
docs page minor update
 2014-07-14 13:23:52 -07:00
Nick Winter
23dc8d2947 Removed a bad log. 2014-07-14 11:21:03 -07:00
Darredevil
c579742955 docs page update 2014-07-14 21:18:17 +03:00
Ruben Vereecken
e748417007 GET /auth/name/<name> now serves possible free names 
anonymous users are now warned if their new name is already chosen

User Settings is now without auto-save

Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.

Refactored conflicted name checking so it can be used in more places

Signup form now has an optional name field

Covered extra case where the debounced check happened too late. Support for submitting on enter.

Worked in scott's comments and got tests working again
 2014-07-14 20:07:58 +02:00
Nick Winter
d7586025d9 Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode. 2014-07-14 11:05:59 -07:00
Ruben Vereecken
ae4a5eb460 Deduplicated bootstrap include 2014-07-14 18:52:23 +02:00
Nick Winter
7446c9ee08 Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons. 2014-07-14 09:38:55 -07:00
Nick Winter
f1c8983de2 Don't ask for team again if we already have a child window. 2014-07-14 08:40:36 -07:00
Nick Winter
364ff4fc00 Merge branch 'jayant1992-master' 2014-07-14 07:33:59 -07:00
Nick Winter
42cf0b5cce Added missing starting quote. 2014-07-14 07:30:18 -07:00
Nick Winter
d27dbdddbb Merge branch 'patch-13' of git://github.com/kinez/codecombat into kinez-patch-13 2014-07-14 07:29:47 -07:00
Tery Lim
0f4a7df982 Use spl instead of trailing space for spacing 2014-07-14 13:56:27 +08:00
Inez KEMENES
ca3a2b620b Update hu.coffee 
I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.
 2014-07-14 07:22:19 +02:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Jayant Jain
c13c7db4ed Less geometric random borders for the terrain generator 2014-07-14 08:11:33 +05:30
Nick Winter
bd47b3bc83 Fixed #1210 based on #1313. 2014-07-13 18:53:01 -07:00
Nick Winter
1d9afbabd2 Fixes for duplicate Thang IDs and reverting randomized Thangs. 2014-07-13 18:38:24 -07:00
Nick Winter
f9822b65e4 Merge branch 'master' of git://github.com/jayant1992/codecombat 2014-07-13 18:21:27 -07:00
Nick Winter
b1b9f87ebe Fixed root test view URL to not need the trailing slash. 2014-07-13 17:34:51 -07:00
Jayant Jain
493ebd07e6 Changes randomise to randomize 2014-07-14 06:01:09 +05:30
Nick Winter
f92b29a4a3 Added rotate to Vector APIs. 2014-07-13 17:25:24 -07:00
Michael Schmatz
2a5a366c12 Made language selection in opponent modal 2014-07-13 17:22:06 -07:00
Nick Winter
daff7a2640 Merge pull request #1314 from TheSecretSquad/issue#1213 
Added point marker shape, and split updateSize method into helpers.
 2014-07-13 17:08:11 -07:00
Nick Winter
a076822a08 Merge pull request #1306 from kerradus/master 
update ru.coffee
 2014-07-13 17:07:45 -07:00
Nick Winter
01fdc5b520 Merge pull request #1311 from rubenvereecken/pretty_wizard_modal 
Bootstrappified Wizard Settings modal
 2014-07-13 17:07:07 -07:00
Nick Winter
6eea28dc19 Error handling for syntax errors in component code. 2014-07-13 16:40:03 -07:00