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
3747 commits 27 branches 0 tags 134 MiB
Commit graph

2802 commits

Author SHA1 Message Date
Nick Winter
7198a8fc42 Merge pull request #1166 from ChrisLightman/patch-6 
Upsate /// Translate
 2014-06-16 08:21:56 -07:00
Nick Winter
0418d80c6d Merged. 2014-06-16 08:12:52 -07:00
Inez KEMENES
c611cafa25 Update hu.coffee 2014-06-16 16:39:02 +02:00
Dominik Kundel
9a3ba70ea2 Merge remote-tracking branch 'upstream/master' 2014-06-16 14:30:22 +01:00
Dominik Kundel
25a0447d77 autocomplete 2014-06-16 14:29:01 +01:00
Clement
931f3ea330 Upsate /// Translate 
Enjoy
 2014-06-16 11:38:25 +02:00
barbuddha
ff5f46e5fb Update ru.coffee 2014-06-16 08:43:27 +04:00
Nick Winter
66e2805a9a Added StackLead integration. Employerified profile backgrounds. 2014-06-14 20:59:28 -07:00
Nick Winter
babfa04a9e Fixed a tiny typo. 2014-06-14 18:02:22 -07:00
djsmith85
a22a098fdc Update de-DE.coffee 2014-06-14 14:02:42 +02:00
Nick Winter
ff0d842871 Better employer contact message. 2014-06-13 16:04:11 -07:00
Michael Schmatz
84601d2927 Added more info email field to employer signup 2014-06-13 15:38:47 -07:00
Nick Winter
21e7487132 Showing more skills in employer table for better searching. Hid employer selling copy after sold. 2014-06-13 14:52:50 -07:00
Scott Erickson
a1dd9a714e Fixed #1153. 2014-06-13 13:35:57 -07:00
Scott Erickson
8f4e1b4bf0 Making the ModelModal look better. 2014-06-13 10:11:01 -07:00
Scott Erickson
6c87d5792d One last fix to the search url. 2014-06-13 09:52:34 -07:00
Nick Winter
79cbc4bb25 Propagated i18n. 2014-06-13 08:50:52 -07:00
Nick Winter
4c57ff7501 Fixed LevelComponent search collection in level editor. 2014-06-13 08:48:29 -07:00
Nick Winter
1502cdc64b Merge branch 'jayant1992-master' 2014-06-13 08:17:12 -07:00
Dominik Kundel
e756c83d9e preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5 preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:12:55 +01:00
Nick Winter
27f2b9acb1 Merge pull request #1151 from kumabotz/remove-unicode 
Remove unicode from url regex pattern
 2014-06-13 08:11:59 -07:00
Nick Winter
2bda60796a Copy / i18n tweaks for tournament ending and employers blurb. 2014-06-13 08:08:13 -07:00
Tery Lim
c3b72e025a Remove unicode from url regex pattern 2014-06-13 10:30:29 +08:00
Nick Winter
1b2c4e078c Fixed candidates viewing their own code and resetting it. 2014-06-12 17:52:08 -07:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -07:00
George Saines
03aa0783b1 a few copy edits 2014-06-12 16:13:48 -07:00
George Saines
3415b62663 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-12 16:01:39 -07:00
George Saines
fb7b3f8580 adding a top info arena on top of the employers page 2014-06-12 16:01:34 -07:00
Michael Schmatz
32a041a5a7 Made max size of canvas much bigger for spectate view 2014-06-12 15:48:11 -07:00
Scott Erickson
152b860a23 Hotfix for the profile view. 2014-06-12 14:44:55 -07:00
Scott Erickson
994e4773ca Reverting the objectId schema. 2014-06-12 13:19:06 -07:00
Scott Erickson
8ab69cf833 Merge pull request #1138 from rubenvereecken/search-endpoint 
Search endpoint is now without the /search prefix
 2014-06-12 11:33:28 -07:00
Scott Erickson
c855327cef Merge pull request #1150 from rubenvereecken/achievements 
Achievements - Update with some tests and admin endpoint
 2014-06-12 11:28:25 -07:00
Ruben Vereecken
dcdcca751f Fiddled with creating xp functions 2014-06-12 19:44:56 +02:00
Ruben Vereecken
aecf937722 Cleaned up achievement testing environment 
Made sure server sided tests work completely
 2014-06-12 19:41:07 +02:00
Ruben Vereecken
2a5c2020ca Added recalculation button to the achievement editor 2014-06-12 19:41:07 +02:00
Ruben Vereecken
509be067c3 Added support for the operator in LocalMongo 2014-06-12 19:41:00 +02:00
Ruben Vereecken
bd2b289943 Recalculate script mainly finished 2014-06-12 19:40:59 +02:00
Ruben Vereecken
a61d0e5569 Added support for diminished exp for repeatables. Needs tweaking though. 2014-06-12 19:40:59 +02:00
Ruben Vereecken
7096a07ce8 Improved logging (winston) and admin-only'd the achievement editor 2014-06-12 19:40:59 +02:00
Ruben Vereecken
5aa211cabd Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-12 19:40:59 +02:00
Ruben Vereecken
2c04025a5a Created a test environment for repeatables 2014-06-12 19:40:59 +02:00
Ruben Vereecken
b0666ace0d Refactorings performed necessary to have searchable for more uses 2014-06-12 19:40:59 +02:00
Ruben Vereecken
0751581113 Search endpoint is now without the /search prefix 
Intermediate commit for search refactoring
 2014-06-12 19:19:30 +02:00
Lucas Castro
ebf0cba45d Update pt-BR.coffee 2014-06-12 10:11:49 -03:00
oaugereau
f7ee40a3a2 Update fr.coffee 2014-06-12 14:39:41 +02:00
oaugereau
0d5e213daa Update fr.coffee 2014-06-12 14:17:36 +02:00
oaugereau
028feaafc6 Update fr.coffee 2014-06-12 09:42:57 +02:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Scott Erickson
8a728cbb64 More switching of user objects from save to patch. 2014-06-11 14:17:31 -07:00
Scott Erickson
4ecbc73c1c Fixed client side testing on karma/travis with the new FacebookHandler tests. 2014-06-11 13:43:07 -07:00
Jayant Jain
ed95206868 Enables moving around the map while an addThang is selected 2014-06-12 01:50:24 +05:30
Scott Erickson
6d15b5e631 Working on User patching. 2014-06-11 13:16:17 -07:00
Scott Erickson
e6dc896bab Reworking some code to use the new CocoModel.patch method. 2014-06-11 11:34:52 -07:00
Lucas Castro
60a0a6ee80 Update pt-BR.coffee 2014-06-11 14:04:19 -03:00
Lucas Castro
fe9e584767 Update pt-BR.coffee 2014-06-11 14:00:52 -03:00
Nick Winter
cb378c13e2 Fixed employer list template typo. 2014-06-11 09:15:41 -07:00
Nick Winter
a9356fdc93 Merge pull request #1142 from Xercoy/patch-1 
Added more names for #53
 2014-06-11 07:24:55 -07:00
Jayant Jain
d5d20377a2 Removes panning upon right click in editor 2014-06-11 15:05:59 +05:30
barbuddha
d361ab5809 Update ru.coffee 2014-06-11 09:56:15 +04:00
Scott Erickson
389d530eaa Built a new 'patch' method for CocoModel, which saves only changed values to the server. 2014-06-10 20:59:37 -07:00
Nick Winter
69fc378930 Final tournament update blurb. 2014-06-10 16:51:36 -07:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Scott Erickson
f0ff8c242e Migrating language to codeLanguage on systems and components because they conflict with the search system. 2014-06-10 13:20:14 -07:00
Corey Prak
8448061f7b Added more names for #53 2014-06-10 12:52:06 -04:00
Nick Winter
86223167af Re-added significant trailing whitespace. 2014-06-10 07:46:43 -07:00
Lucas Castro
132a7b62f1 Update pt-BR.coffee 2014-06-10 11:04:02 -03:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Nick Winter
dd2c7fab60 Updated Danger Minefield icon. 2014-06-09 21:11:59 -07:00
Darredevil
82f33a35de Fixed id 2014-06-09 22:37:34 +03:00
Darredevil
da1d0e5361 Added new level 
Added a new prime-sieve level
 2014-06-09 22:29:02 +03:00
Michael Schmatz
693da57f13 Merge branch 'feature/linkedin-profile-import' 
Conflicts:
	app/templates/account/profile.jade
	app/views/account/profile_view.coffee
 2014-06-08 18:37:33 -07:00
Michael Schmatz
ad80fcf229 Removed linkedIn callback, disabled autosave 2014-06-08 18:21:56 -07:00
Michael Schmatz
f29a41f108 Add linkedIn link, field of study support to LinkedIn import 2014-06-08 18:15:18 -07:00
Nick Winter
bb5d23e6ba Wrapped LinkedIn button in a .btn. 2014-06-08 18:51:45 -06:00
Michael Schmatz
7ec3910e36 Make LinkedIn import more robust 2014-06-08 17:38:02 -07:00
Nick Winter
6597b687eb Only start profiles in edit mode if they are yours. 2014-06-08 11:52:16 -06:00
Scott Erickson
1b166028c6 Turned off Backbone.Mediator validation for tests. 2014-06-07 19:08:38 -07:00
Nick Winter
cefeb1df14 Fixed backwards Approved button and candidate time sort. 2014-06-07 19:58:33 -06:00
Scott Erickson
01c20f4065 Fixed karma tests. 2014-06-07 18:15:57 -07:00
Scott Erickson
5104f0a1e7 Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842 2014-06-07 16:41:19 -07:00
Scott Erickson
2cbc33d66d Fixed jasmine-ajax setup/reset. 2014-06-07 16:41:19 -07:00
Nick Winter
63a3aa9074 Fixes for browsing profiles by username. 2014-06-07 17:33:14 -06:00
Michael Schmatz
4072c1b969 Basic functionality done, needs validation error handling 
As well as formatting
 2014-06-07 11:45:49 -07:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Scott Erickson
f0cdf6b2e2 Fixed #1111. 2014-06-06 16:47:48 -07:00
Nick Winter
d00c4c2af3 Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee. 2014-06-06 15:39:03 -06:00
Michael Schmatz
0c0084dd4b Make single game simulate another task if error 2014-06-06 13:26:15 -07:00
Michael Schmatz
31bb9c8807 Fixed error handling for results with no taskID 2014-06-06 12:47:10 -07:00
Michael Schmatz
1486f31c37 Stop headless simulator from exiting if error 2014-06-06 12:26:28 -07:00
Michael Schmatz
24452026d1 Minor fix for simulator logic 2014-06-06 12:18:02 -07:00
Nick Winter
51f7aa1743 Merge pull request #1130 from Nichiatu/patch-1 
Updates to norwegian translation
 2014-06-06 10:17:19 -06:00
Scott Erickson
49c9c6bfc9 Built the client test view (rebased from feature/testclient). 2014-06-05 16:56:29 -07:00
Nichlas Torgersen
657182c8c0 Updates to norwegian translation 
I noticed there were some misspellings and grammar errors which I corrected. Especially the sign in-message, it went along the lines in norwegian as: "Draw yourself in", that doesn't make sense now does it.

Also removed some unneeded capitalizations, norwegian grammar is all about that and how you build a word. Most words can be combined into one, like in english: "Door handle" would be "Doorhandle" if english was using norwegian grammar rules.
 2014-06-06 01:44:05 +02:00
Nick Winter
47b99adddf Uncommented some fr.coffee section headers to go with the new translations. 2014-06-05 10:28:40 -06:00
Clement
9895432dd2 Syntax Update and Traduction Update 2014-06-05 18:03:33 +02:00
Clement
a7d0b540cd Big Update /// Syntax Correction and Traduction 2014-06-05 13:35:03 +02:00
Nick Winter
0b2d5c251d A bit more Worker hardening. 2014-06-04 15:47:09 -06:00
Nick Winter
f493f407c2 Fixed some bugs on job profile initialization. 2014-06-04 15:38:57 -06:00
Scott Erickson
8f6187125d Fixed saving new settings for a level. 2014-06-03 12:27:53 -07:00
Nick Winter
143597dc0f Merge pull request #1124 from ChrisLightman/patch-2 
Update Line 723-734 : Full Traduction
 2014-06-03 08:26:54 -07:00
Nick Winter
bebb200090 Merge pull request #1122 from ChrisLightman/patch-1 
Update fr.coffee
 2014-06-03 08:26:44 -07:00
Ruben Vereecken
ed44ab5f7d Improved logging (winston) and admin-only'd the achievement editor 2014-06-02 21:07:23 +02:00
ChrisLightman
12da959550 Update Line 723-734 : Full Traduction 2014-06-02 20:52:49 +02:00
Ruben Vereecken
8d2c62ba84 Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-02 20:34:05 +02:00
Ruben Vereecken
bb57756cd9 Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
Ruben Vereecken
8607162cd7 Finished designing achievement notify, for now. 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d8bb802468 Designing the Notify to show level progress 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d766a24e11 Achievements now popup when polled for by the client 2014-06-02 20:33:01 +02:00
Ruben Vereecken
aa3fedeb02 Achievements can have icons. Users now have their scores denormalized 2014-06-02 20:32:00 +02:00
Ruben Vereecken
287019242f Achievement queries are now strings server sided but remain objects for the client 2014-06-02 20:32:00 +02:00
Ruben Vereecken
c26f96f33e Added achievement model and some missing pieces 2014-06-02 20:32:00 +02:00
Ruben Vereecken
1b2a251c58 Achievement editor in place and looking mighty fine 2014-06-02 20:31:09 +02:00
Ruben Vereecken
c2d2f2a2b8 Refactorings performed necessary to have searchable for more uses 2014-06-02 20:31:09 +02:00
Ruben Vereecken
a3ca382dcd Used the feedback from Scott to improve endpoints 2014-06-02 20:29:12 +02:00
Ruben Vereecken
df60402d00 Added test 2014-06-02 20:29:12 +02:00
Ruben Vereecken
37b47d35de Got work done on detecting achievements 2014-06-02 20:29:12 +02:00
Ruben Vereecken
699aa506f2 Added Local Mongo support for nested documents. Totally forgot those 2014-06-02 20:29:11 +02:00
Ruben Vereecken
e177912a5a Added '$or' and '$and' to Local Mongo 2014-06-02 20:29:11 +02:00
Ruben Vereecken
b3bddbd785 Finished regular query selectors of Local Mongo 2014-06-02 20:29:11 +02:00
Ruben Vereecken
20af7b090a Worked on getting the tests to work 2014-06-02 20:29:11 +02:00
Ruben Vereecken
f2f4fef1e0 Wrote tests for the local mongo querier 2014-06-02 20:29:11 +02:00
Ruben Vereecken
99927d1345 Started on the local mongo querier 2014-06-02 20:29:11 +02:00
Ruben Vereecken
2f5090df8f Added schema objectIds and bettered the repeatable achievements 2014-06-02 20:29:11 +02:00
Ruben Vereecken
f5389fef99 Got the basic achievement schemas up. Still need proper references 2014-06-02 20:29:11 +02:00
Nick Winter
51891887e5 Fixed merge conflict 2014-06-02 10:43:31 -07:00
Nick Winter
257fe4cec3 Fixed merge conflict 2014-06-02 10:42:34 -07:00
Gutierri Barboza
8a8b80bcf5 More translations pt-br 2014-06-02 14:34:30 -03:00
ChrisLightman
cfcaece743 Update fr.coffee 
Modification mineures de syntaxe ( Majuscules )
 2014-06-02 11:36:05 +02:00
Nick Winter
f3d5b724de Merge branch 'inline-profile' 2014-06-01 16:45:49 -07:00
Nick Winter
10754e6825 Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton. 2014-06-01 16:45:19 -07:00
Nick Winter
d19b6760da More flourishes for inline profile editor. 2014-06-01 11:45:01 -07:00
Nick Winter
400fddc294 Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry. 2014-05-31 22:09:41 -07:00
Inez KEMENES
a97d243100 Update hu.coffee 2014-05-31 16:16:28 +02:00
Nick Winter
852053022a Started the horrifying migration to an inline jobs profile editor. 2014-05-30 22:12:44 -07:00
Scott Erickson
29011fab2a Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some. 2014-05-30 17:26:49 -07:00
Scott Erickson
22c4ddc064 Fixed the settings view putting undefineds in the level documents and causing validation errors. 2014-05-30 17:24:13 -07:00
Scott Erickson
f82ca5c1b6 Fixed #1099 2014-05-30 16:43:55 -07:00
Scott Erickson
47f28d26d1 Fixed up my refactoring of markToRevert so now _revertAttributes is only populated the first time set is called. 2014-05-30 16:20:20 -07:00
Scott Erickson
bba0e4939d Fixed #1039 2014-05-30 15:06:33 -07:00
Scott Erickson
3602f67c24 Tweaked how editPath is passed to the server so it doesn't foul up validation. 2014-05-30 14:41:41 -07:00
Scott Erickson
7a9928b0c5 Fixed #1102 2014-05-30 13:57:21 -07:00
Scott Erickson
254c6ff7ba Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too. 2014-05-30 13:40:38 -07:00
Ruben Vereecken
84e6b8cd6d Script event triggers are now fetched from the mediator, resolving issue #1061 2014-05-30 12:38:43 +02:00
Nick Winter
1f32c1c8a1 Merge pull request #1113 from rubenvereecken/issue1110 
One line fix for issue #1110. Thang search bar works again.
 2014-05-29 15:31:28 -07:00
Ruben Vereecken
ba57899f9f One line fix for issue #1110. Thang search bar works again. 2014-05-30 00:16:11 +02:00
Nick Winter
df13bbfaa6 Made right-click duplicate Thang menu actually clone modified Thang. 2014-05-29 12:33:21 -07:00
Nick Winter
f3adc216ed Protecting our replacement of Math.random via Aether. 2014-05-29 12:26:08 -07:00
Scott Erickson
afc14e593d Fixed models thinking they've got changes when they don't. 2014-05-29 10:48:48 -07:00
Nick Winter
90c97008ae Merge pull request #1098 from rubenvereecken/view-refactoring 
Refactored getRenderData from SearchView to children
 2014-05-28 18:59:02 -07:00
dpen2000
bd444fa547 Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes 2014-05-29 02:16:07 +01:00
Ruben Vereecken
5909f15678 Refactored getRenderData from SearchView to children 2014-05-28 17:32:18 +02:00
Scott Erickson
93f7d8c0a4 Made sure sprites are idle and properly positioned when they load. 2014-05-27 16:41:56 -07:00
Scott Erickson
3b87c9c360 Fixed some remaining jqxhr objects hanging around. 2014-05-27 16:33:57 -07:00
Nick Winter
a481af08d3 Fixed a couple typos with failed resource loading handling. 2014-05-26 20:51:05 -07:00
Nick Winter
c01bd69625 Better recoverability for non-UserCodeProblem errors during world generation. 2014-05-26 18:45:00 -07:00
Nick Winter
ec0027043b Added experimental Io language from Aether. 2014-05-26 08:59:48 -07:00
Nick Winter
ed36dba3f5 Merge pull request #1041 from Shpionus/patch-1 
Update ru.coffee
 2014-05-25 12:17:12 -07:00
Nick Winter
3dd362c01e Added support for blaming infinite loops. 2014-05-25 12:15:32 -07:00
Nick Winter
6b554e03ef Merge pull request #1084 from domenukk/feature/step-single-frame 
Added shortcut for frame single-stepping
 2014-05-25 09:37:13 -07:00
Nick Winter
16e1ef760a Merge branch 'master' of git://github.com/jayant1992/codecombat 2014-05-25 08:51:13 -07:00
Nick Winter
1a6fd75103 Trying to fix some Simulator loading errors. 2014-05-25 08:29:33 -07:00
Nick Winter
33408020f1 Merge pull request #1054 from dpen2000/patch-2 
Update simulate_tab.coffee
 2014-05-25 08:27:54 -07:00
z3t1
d8b448ab60 Update zh.coffee 
Update some phrases.
 2014-05-25 16:05:35 +08:00
Dominik Maier
f62cd7f38b + added shortcut for frame single-stepping 
+ fixed single stepping for frames
 2014-05-24 17:31:59 +02:00
Jayant Jain
55569ccf2f Resolves an issue with nanoscroller and initially hidden content 2014-05-24 12:02:26 +05:30
Jayant Jain
241adafad8 Adds nanoscroll for other tabs in editor 2014-05-24 12:02:26 +05:30
Jayant Jain
f17c5cfb51 Adds nanoscroll to thang tab in level editor 2014-05-24 12:02:26 +05:30
Jayant Jain
a84049cf16 Fixes issues with dragging thangs onto the map 2014-05-24 12:02:26 +05:30
Jayant Jain
cbe5f3a011 Fixes issue with esc key not deselecting the current thang 2014-05-24 12:02:26 +05:30
Jayant Jain
94f70ca9f4 Fixes #1079 2014-05-24 12:02:26 +05:30
Nick Winter
35fc5a5197 Fixed infinite loop detection, I hope. 2014-05-23 21:24:50 -07:00
Nick Winter
690fbc6919 Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking. 2014-05-23 12:04:42 -07:00
Nick Winter
ff171588d9 Trying out text shadow coloring based on team for text event labels. 2014-05-23 09:56:39 -07:00
Nick Winter
bda8f10508 Fixed a couple typos in the hu merge. 2014-05-23 09:27:02 -07:00
Inez KEMENES
1d595e9a0d Update hu.coffee 
The line no. 123 disappeared. I may have accidentally deleted it while working on 122. Sorry. Please correct.
 2014-05-23 16:21:46 +02:00
Nick Winter
26d2816071 Fixed some more memory leaks. 2014-05-22 19:05:11 -07:00
Scott Erickson
bd575ad667 Fixed the placement of wall sprites in the level editor to wait until the sprite sheet is finished being built. 2014-05-22 14:16:39 -07:00
Scott Erickson
5a407492db Got rid of a bunch of magic numbers in mark scaling. Now assumed all target marks have a width of 10m by default. 2014-05-22 13:48:48 -07:00
Scott Erickson
681adc1dcd Got rid of a log. 2014-05-22 13:37:08 -07:00
Nick Winter
4c7d7fce03 Fixed some memory leaks. 2014-05-22 12:05:36 -07:00
Scott Erickson
4b88296265 Set up the supermodel to clear out jqxhrs once they're done, since they take a lot of memory. 2014-05-22 11:47:38 -07:00
Scott Erickson
bfa90f671d Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal. 2014-05-22 11:26:08 -07:00
Scott Erickson
d613c230ef Fixed some text in the victory modal that wasn't showing up because of indentation. 2014-05-22 11:26:08 -07:00
Scott Erickson
104deb2ab8 Disabled CocoModel noty errors for form submissions that handle these errors. 2014-05-22 11:26:08 -07:00
Michael Schmatz
8604a0ed3c Update rules about location restrictions 
Just to clarify, people from regions that we can't send prizes to can play, just not receive prizes.
 2014-05-22 10:34:46 -07:00
George Saines
a2fbe5865a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-22 09:55:34 -07:00
George Saines
4ffbdf004c modifying oreilly logo size 2014-05-22 09:55:30 -07:00
Nick Winter
48f5347075 Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting. 2014-05-21 21:56:11 -07:00
Nick Winter
4fc1341a64 Added a way to remove SuperModel resources to fix ladder tab refreshing. 2014-05-21 15:33:28 -07:00
Scott Erickson
037dbe97c6 Some remaining work to get the delayed show guide script set up. 2014-05-21 14:50:27 -07:00
Scott Erickson
4929f81fcc Fixed the level editor preview window not loading on repeated opens. 2014-05-21 14:28:52 -07:00
Scott Erickson
18f694b010 Fixed up the level loader to include session objects as world necessities. 2014-05-21 12:53:28 -07:00
Scott Erickson
c43081636f Fixed the facebook event schema. 2014-05-21 12:35:37 -07:00
Nick Winter
06866e48de Merge pull request #1059 from rafagomes/patch-1 
Updated some words and phrases
 2014-05-21 11:27:54 -07:00
Rafael Gomes
09db5cb9ee Updated some words and phrases 
Just a few words and phares until have more experience in the project.
 2014-05-21 14:38:08 -03:00
Nick Winter
511dcef313 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-21 10:30:03 -07:00
Michael Schmatz
585b907f4e More temp fixes for 422s 2014-05-21 10:29:16 -07:00
Nick Winter
8fb1237810 Added noty error messages when unable to save CocoModels. 2014-05-21 10:27:47 -07:00
Jayant Jain
8f1f378bcb Fixes issue with thang being added twice upon click 2014-05-21 10:27:47 -07:00
Jayant Jain
c05780de4c Resolves #170, thang can be directly placed by dragging onto the map 2014-05-21 10:27:46 -07:00
Michael Schmatz
02f8458dfe Temp fix for occasional 422 2014-05-21 10:16:01 -07:00
dpen2000
ce661a5493 Update simulate_tab.coffee 
Add back in current user to nearby simulators
 2014-05-21 15:06:52 +01:00
Burlutskiy Ivan
70403409f3 Update ru.coffee 
reverted team translation by @M-r-A request.
 2014-05-21 12:18:44 +04:00
Scott Erickson
a8b54f3cdc Made backbone mediator validate only on development. 2014-05-20 15:58:57 -07:00
Scott Erickson
a7f24ab04f Some work on subscription definitions for the validated Backbone Mediator. Added 'script-manager:tick' channel. 2014-05-20 15:36:15 -07:00
Nick Winter
88ef5ffe93 Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L. 2014-05-20 15:24:57 -07:00
Nick Winter
de9f1fab0d Merged. 2014-05-20 15:09:48 -07:00
Burlutskiy Ivan
a8a50df025 Update ru.coffee 
Fixed previous typos; uncommented translations.
 2014-05-21 01:32:15 +04:00
Scott Erickson
70525ec57a Fixed the music starting when you restart the level, even if music is off. 2014-05-20 13:43:52 -07:00
Burlutskiy Ivan
65a364d3f7 Update ru.coffee 2014-05-21 00:21:10 +04:00
Nick Winter
88a5685c37 Fix for WizardSprite scale thing. 2014-05-20 12:32:26 -07:00
Scott Erickson
86736d8f4a Fixed a bug. 2014-05-20 12:22:24 -07:00
Scott Erickson
2b56dffcb0 Fixed a bug where sometimes scripts setting playback would be overridden by the surface resetting playback after casting is done. 2014-05-20 12:21:43 -07:00
Scott Erickson
3f884e71e5 Fixed the LevelLoader in headless settings. 2014-05-20 11:25:32 -07:00
Scott Erickson
93c6f72f07 Asynchronously building things again. 2014-05-20 10:49:19 -07:00
Nick Winter
a04130f26a Fixed a bug with ladder tab not reloading. 2014-05-20 10:40:15 -07:00
Michael Schmatz
b31e6312ac Updated rules to be subject to change 2014-05-20 10:10:40 -07:00
Nick Winter
022722a19f Fixed cosmetic GoalManager destruction error. 2014-05-20 09:19:31 -07:00
Nick Winter
248cec1e6e Transpile code properly. 2014-05-20 08:23:25 -07:00
Nick Winter
d058b16283 Fixed some memory leaks. 2014-05-20 08:00:49 -07:00
Scott Erickson
04da5b4714 Fixed thang avatar view thang loading some more. 2014-05-19 23:02:02 -07:00
Scott Erickson
a8abe8c887 Fixed mark sprite scaling some more. 2014-05-19 23:01:48 -07:00
Scott Erickson
042fd7ac0d Made the guide, when it shows up the first time, only show the first doc. 2014-05-19 22:25:40 -07:00
Scott Erickson
f24ee98295 More work on mark sizing. 2014-05-19 22:17:23 -07:00
George Saines
5d8e199c2d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 22:14:09 -07:00
George Saines
5d603f625e removing China 2014-05-19 22:14:05 -07:00
Nick Winter
513a73c62e Added grayscale filter until hover for tournament sponsor logos. 2014-05-19 22:07:36 -07:00
Nick Winter
b6406b9b0e Put some tournament details in there. Muted some extra casting sounds during level load. 2014-05-19 21:56:20 -07:00
Scott Erickson
f463966a22 Fixed a bug with thangs not being properly scaled when first created sometimes. 2014-05-19 21:55:41 -07:00
Scott Erickson
6c3ff16bed Fixed setting registration points for thangs that match world dimensions. 2014-05-19 21:55:31 -07:00
Scott Erickson
ae8d28182c Fixed a bug where sometimes thang avatar views wouldn't render the portrait, because 'loading' wouldn't be set to false properly. 2014-05-19 21:55:30 -07:00
Scott Erickson
b816055f9e Fixed goal states to handle teams. 2014-05-19 21:55:30 -07:00
George Saines
8b5014a053 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 21:39:45 -07:00
George Saines
5b6b26415b making the Firebase logo look good 2014-05-19 21:39:41 -07:00
Nick Winter
39178daff6 Trying to show loading ready and initialize the Surface earlier. 2014-05-19 20:49:17 -07:00
Nick Winter
b2cc3d0692 Fixed bug with preloading the world replacing casting the same world if timing was wrong. 2014-05-19 20:12:16 -07:00
Scott Erickson
9ad4602e0f Fixed a bug with the new goal view. 2014-05-19 20:11:33 -07:00
Nick Winter
341097c5ca A couple improvements for the LadderSubmissionView. 2014-05-19 19:51:24 -07:00
Michael Schmatz
d8df61f94b Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder.jade
 2014-05-19 19:43:47 -07:00
Michael Schmatz
ca2e48b491 Edited judging criteria 2014-05-19 19:37:25 -07:00
Nick Winter
116965fcdc Rules wording tweaks; highlighting new matches and end of ranking with sounds. 2014-05-19 19:13:36 -07:00
Michael Schmatz
aba0120e88 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	server/queues/scoring.coffee
 2014-05-19 19:04:47 -07:00
Michael Schmatz
97cbf55695 Simulator fetch random Greed games when queue empty 2014-05-19 18:58:45 -07:00
George Saines
8277472fda Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 17:59:48 -07:00
George Saines
4f763d0203 added the rules section 2014-05-19 17:59:43 -07:00
Nick Winter
af31bcf008 Fleshed out tournament prizes tab. 2014-05-19 17:40:06 -07:00
Scott Erickson
b410d91203 Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier. 2014-05-19 17:10:41 -07:00
Scott Erickson
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -07:00