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

8328 commits

Author SHA1 Message Date
Michael Schmatz
538344094b Fixed filter behavior 2014-07-03 13:59:10 -07:00
Michael Schmatz
ae63461ef3 Filter functional 2014-07-03 11:39:44 -07:00
Michael Schmatz
b58f2c49eb Fix description 2014-07-03 10:22:50 -07:00
Michael Schmatz
49e4dd71ae Merge branch 'master' into employer-redesign 
Conflicts:
	app/schemas/models/user.coffee
 2014-07-03 10:15:31 -07:00
Michael Schmatz
ed30d3292a Filter button 2014-07-03 10:14:32 -07:00
Michael Schmatz
e54b190918 Added shortDescription 2014-07-03 10:02:42 -07:00
Imperadeiro98
dbdd8c672c Update pt-PT.coffee 2014-07-03 14:11:30 +01:00
Imperadeiro98
3b04343034 Update pt-PT.coffee 2014-07-03 14:06:40 +01:00
Imperadeiro98
08a9b4f05b Update pt-PT.coffee 2014-07-03 13:55:50 +01:00
Michael Schmatz
397140d9b0 Basic filtering 
Only visas work
 2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b Basic filtering functionality 
Still has a few bugs
 2014-07-02 15:48:26 -07:00
Dominik Kundel
484749400e Merge remote-tracking branch 'upstream/master' 2014-07-02 20:54:46 +02:00
Dominik Kundel
004a14ae3c fixed autocomplete issue related to switching the programming language 2014-07-02 20:52:16 +02:00
Michael Schmatz
1adefbb3b6 Update user schema (to avoid cherry picking) 2014-07-02 11:50:44 -07:00
Michael Schmatz
c6cc28b976 Various fixes to enable employers page to function correctly 2014-07-02 11:45:00 -07:00
Michael Schmatz
7eeb964d3e Restyled employers page 2014-07-02 11:44:45 -07:00
Michael Schmatz
8e6807ab60 Redesigned layout of employers page 2014-07-02 11:44:33 -07:00
Michael Schmatz
fe08fdb2b0 Made new recruitment base styles 2014-07-02 11:43:39 -07:00
Michael Schmatz
5da1db8f6e Made new recruitment base layout 2014-07-02 11:43:26 -07:00
Michael Schmatz
ebc79668ef Added image assets for recruitment page 2014-07-02 11:42:02 -07:00
Michael Schmatz
f756a16aa4 Added curated section to user schema 2014-07-02 11:41:14 -07:00
greyhusky
467b9adf74 new translations 
i translated some parts, will translate more later
 2014-07-02 11:33:19 +02:00
Dominik Kundel
3f57644b0b Merge remote-tracking branch 'upstream/master' 2014-07-01 19:58:01 +02:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Michael Schmatz
2dd4ba6203 Increased max skills from 30 to 40 2014-06-30 16:43:31 -07:00
Matt Lott
ffdd73a503 Fix Placement Agreement typo 2014-06-30 16:01:00 -07:00
Dominik Kundel
568e334f13 Merge remote-tracking branch 'upstream/master' 2014-06-28 12:53:20 +02:00
Dominik Kundel
6ea2f1c76d added title for tab trigger 2014-06-28 12:53:09 +02:00
Nick Winter
66da53f8f9 Launching the language selector on the front page. 2014-06-27 10:21:38 -07:00
Nick Winter
58bf85d234 Simulator handles when there are no Greed matches to randomly simulate. 2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e Exposing Vector z property. Getting ready to use new builtin property documentation. 2014-06-27 00:36:18 -07:00
Philippe Rigovanov
dd6209cd99 Update ru.coffee 
With @M-r-A fixes
 2014-06-27 04:33:05 +04:00
Philippe Rigovanov
e138d2eed6 Update ru.coffee 
With fixes from [M-r-A](https://github.com/M-r-A)
 2014-06-27 04:11:46 +04:00
Michael Schmatz
28bb28cf85 Fixed employer view for manually created candidates 2014-06-26 17:07:17 -07:00
George Saines
a94053fd1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-26 10:38:18 -07:00
George Saines
e294133bcf adding the files I forgot 2014-06-26 10:38:13 -07:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0 Improved per-language spell palette and tab documentation. 2014-06-25 22:56:39 -07:00
Nick Winter
4cebf1f434 Merge pull request #1232 from Darredevil/patch-11 
Added new tip tag
 2014-06-25 21:23:41 -07:00
Darredevil
c6f19f7d3a Added new tip tag 2014-06-26 06:23:36 +03:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Darredevil
a127cb7a5b Added a joke tip 2014-06-26 02:11:15 +03:00
Philippe Rigovanov
f2898e3bc0 Update diplomat.jade 
added myself to diplomats
 2014-06-26 00:56:41 +04:00
Inez KEMENES
96f74183a5 Update hu.coffee 2014-06-25 17:28:13 +02:00
Nick Winter
04976a7b14 Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225. 2014-06-24 21:08:01 -07:00
Nick Winter
512e287b6a Merge pull request #1184 from greyhusky/patch-1 
Update de-CH.coffee
 2014-06-24 17:41:32 -07:00
George Saines
b5ec38f811 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-24 16:43:32 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Nick Winter
dd9b8a0018 Migrating from tileGroupNumber to tileGroupLetter. 2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98 Messing with marks. 2014-06-24 15:45:33 -07:00
Michael Schmatz
e3a87156a2 Send BCC email to employer when contacting candidates 2014-06-24 14:35:30 -07:00
Scott Erickson
9b873cfab4 Patch modal handles invalid patches. 2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Scott Erickson
327d273cbe Fixed gplus login. 2014-06-24 14:44:37 -04:00
Michael Schmatz
988ad6ffda Attempting to fix G+ 2014-06-24 11:29:43 -07:00
Scott Erickson
0363166736 Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well. 2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3 Fixed bug showing spell palette for languages missing any code snippets. 2014-06-24 10:17:38 -07:00
Nick Winter
8719b80663 Showing expired profiles to admins. 2014-06-24 10:15:38 -07:00
Nick Winter
abcc75a6f2 A bit of error logging for #1220. 2014-06-24 09:43:20 -07:00
Nick Winter
3862bd2376 Clearing backups of old models when saving new versions of versioned models. 2014-06-24 09:43:20 -07:00
Scott Erickson
dde43d5df3 Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups. 2014-06-23 16:57:54 -04:00
Nick Winter
815ef88e78 Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty. 2014-06-23 10:36:42 -07:00
Michael Schmatz
27774cdf0f Fix #1207 2014-06-23 09:46:39 -07:00
Darredevil
4ca1d2bfeb Added new level "K-means++ Cluster Wars" 
Added new level "K-means++ Cluster Wars"
 2014-06-23 03:43:54 +03:00
Nick Winter
a267933f0b Merge pull request #1200 from Airunedz/patch-1 
Improve Spanish (Spain) translations
 2014-06-22 15:39:43 -07:00
Philippe Rigovanov
f7ec30a586 Update ru.coffee 2014-06-23 01:55:45 +04:00
Nick Winter
105d22c802 Merge pull request #1202 from kumabotz/minor-cleanup 
Minor cleanup
 2014-06-22 07:56:15 -07:00
Nick Winter
8698589625 Applying Scott's fix for #1198. 2014-06-22 07:55:29 -07:00
Tery Lim
f03f8da50a Remove extra spaces 2014-06-22 16:42:06 +08:00
Tery Lim
32868b565d Fix typo 2014-06-22 16:39:51 +08:00
Tery Lim
88c84911b7 Remove trailing comma 2014-06-22 16:39:07 +08:00
Nick Winter
81f8334f37 Some fixes for CocoSprite alphas. 2014-06-21 22:31:10 -07:00
Airunedz
dfff43d66a Improve Spanish (Spain) translations 
Changes: Add some translations to Spanish (I'm from Spanin)
 2014-06-22 01:07:05 +02:00
Nick Winter
1f29a923cf Fixed playing multiplayer levels without an opponent, against the AI. 2014-06-21 12:24:14 -07:00
Nick Winter
6813279871 Fixed an infinite loop timeout issue. 2014-06-21 10:56:55 -07:00
Nick Winter
a8f4baebbc Restricted some more analytics. 2014-06-21 09:47:48 -07:00
Nick Winter
564c463431 Stop tracking Simulator events to Mixpanel. 2014-06-21 09:17:56 -07:00
Nick Winter
52b2e756ef Merge pull request #1195 from thanosme/patch-1 
Update el.coffee
 2014-06-21 08:44:43 -07:00
Thanasis Manousos
5e2dececb5 Update el.coffee 2014-06-21 18:31:26 +03:00
Nick Winter
dde71485bf A bit of cleanup. 2014-06-20 20:52:50 -07:00
Nick Winter
17366af245 Merge pull request #1188 from a1ip/master 
Update ru.coffee
 2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c Merge pull request #1181 from djsmith85/patch-1 
Update de.coffee
 2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2 Merge pull request #1180 from djsmith85/patch-2 
Update de-DE.coffee
 2014-06-20 20:45:02 -07:00
Nick Winter
ac0f6e74aa Merged. 2014-06-20 20:41:34 -07:00
Nick Winter
60ca6e46d3 Ooops, that's a function. 2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes. 2014-06-20 17:19:18 -07:00
Fergus Leen
88aa8d234c Facebook friends patch 2014-06-20 02:18:40 +01:00
Nick Winter
bb8b9b2e93 bid -> makeBid. 2014-06-19 17:27:41 -07:00
Michael Schmatz
34f5377754 Increased infinite loop timeout 2014-06-19 17:16:08 -07:00
Michael Schmatz
40fd1674ad Temporary fix for bid function in hover debugger 2014-06-19 17:09:45 -07:00
Nick Winter
7b59c42f5d Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps. 2014-06-19 15:41:35 -07:00
thanosme
625750614a Update el.coffee 
Added some tranlations with minor corrections
 2014-06-20 01:14:30 +03:00
Nick Winter
1e9b403ce5 More zazz for home page code language selection. 2014-06-19 14:55:16 -07:00
Nick Winter
cf57411b5c Added another logging message for more easily seeing when transpiled code might be misfiring. 2014-06-19 13:42:38 -07:00
Nick Winter
666c020389 Switching code language based on selection now. 2014-06-19 13:42:25 -07:00
Scott Erickson
20589db6be Fixed a bug with logging missing documentation. 2014-06-19 16:15:38 -04:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Michael Schmatz
51923459e0 Changed autocomplete to on by default 2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244 Merge pull request #1186 from dkundel/master 
Initial Autocomplete Version
 2014-06-19 10:10:26 -07:00
Michael Schmatz
a1b7025730 Emergency linkedin hot fix 2014-06-19 08:36:22 -07:00
Nick Winter
2e850dba78 Working on home language selection. 2014-06-19 08:06:34 -07:00
Philippe Rigovanov
ebaeac7e80 Some translations 2014-06-19 05:42:15 +04:00
Dominik Kundel
7e8845332e updated Ace minified 2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05 updated Ace 2014-06-18 23:18:58 +02:00
Michael Schmatz
548eaefae1 Add debug variable inspection progress bar 2014-06-18 13:43:04 -07:00
Dominik Kundel
33d68fab6e Merge remote-tracking branch 'upstream/master' 2014-06-18 21:50:55 +02:00
Nick Winter
ac6c7292c8 Fixed Gridmancer session linking on profile view. 2014-06-18 12:05:40 -07:00
Scott Erickson
50fea7e937 Added a method for returning all requests in mock-ajax. 2014-06-18 12:04:39 -04:00
Scott Erickson
d651885524 Maybe fixing the toggleModal system once and for all. 2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244 Update de-CH.coffee 
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
 2014-06-18 11:09:10 +02:00
Nick Winter
59654da24b Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce. 2014-06-17 22:17:44 -07:00
Nick Winter
4bd02ba6dc ModelModal now grants real ultimate power. 2014-06-17 15:17:25 -07:00
djsmith85
2fff271200 Update de-DE.coffee 
Updated a few translations in the German locale file.
 2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880 Update de.coffee 
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
 2014-06-17 23:52:54 +02:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Scott Erickson
3e24b2f86e Fixed tests running in karma. 2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81 Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why. 2014-06-16 11:40:09 -07:00
Scott Erickson
ee791da34c Moved services into their own folder, and made no services run for both testing and demo pages. 2014-06-16 11:40:09 -07:00
Ruben Vereecken
1c671a3c25 Refactored vendor loading 2014-06-16 11:40:09 -07:00
Ruben Vereecken
2e40a53674 Extracting third party scripts out of main 2014-06-16 11:40:08 -07:00
Scott Erickson
4932317982 Finally got the demo view working (mostly). Need to turn off third party ajax requests. 2014-06-16 11:40:08 -07:00
Scott Erickson
1786eab09d Initial work on a demo view. But brunch won't build demo-app.js for some reason. 2014-06-16 11:40:08 -07:00
Nick Winter
9a64ca5973 A few misc fixes. 2014-06-16 10:49:20 -07:00
Nick Winter
3d2bee3256 Merge pull request #1168 from kinez/patch-9 
Update hu.coffee
 2014-06-16 08:22:21 -07:00
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
Scott Erickson
9ace31d391 Fixed the target mark. 2014-05-19 16:36:45 -07:00
Scott Erickson
8ae14e21ae Fixed #1029. Refactored scaling for sprites a bit. 2014-05-19 16:36:44 -07:00
dpen2000
10d0ef0606 Fix admin checkbox label for attribute so clicking on it toggles checkbox correctly 2014-05-19 23:28:53 +01:00
George Saines
7c0d73e779 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 15:19:59 -07:00
George Saines
07177e1a89 putting together the prizes page 2014-05-19 15:19:56 -07:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Michael Schmatz
b8dc4ed939 Stopgap solution for totalScore being string 2014-05-19 14:58:08 -07:00
Nick Winter
68a4483e91 Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view. 2014-05-19 11:58:53 -07:00
Scott Erickson
179702b0eb Set up the goals view to be more hidden by default, and shows up on mouse hover. 2014-05-19 11:31:18 -07:00
Nick Winter
5dd8bec393 Fixed issues with initial sprite scaling. 2014-05-19 10:39:24 -07:00
Michael Schmatz
6f2fd8e293 Verification simulator changes 2014-05-19 10:11:23 -07:00
Nick Winter
5dffca7a9c Propagated i18n tags. 2014-05-19 10:11:18 -07:00
Nick Winter
b89615cea4 Added helpful keyboard shortcuts modal. 2014-05-19 10:08:34 -07:00
Michael Schmatz
38d732d8bc Disable hover debugger when spell changed 2014-05-18 11:51:31 -07:00
Michael Schmatz
5c72ccdce1 Add support for Aether globals in hover debugger 2014-05-18 11:41:42 -07:00
Nick Winter
9df34875ee Added tournament rules/prizes placeholders. 2014-05-17 20:43:05 -07:00
Nick Winter
3c9428ffd3 Refactored game ranking buttons into a LadderSubmissionView. 2014-05-17 11:55:51 -07:00
Scott Erickson
5907ca8619 Fixed scaling in the thang type editor. 2014-05-17 11:49:11 -07:00
Scott Erickson
df222461bf Fixed a bug that was bringing the thang editor down. 2014-05-17 11:38:33 -07:00
Scott Erickson
f99a95768e Set up CocoSprites to have text appear overhead based on events coming from the ShowsText component. 2014-05-17 11:28:57 -07:00
Scott Erickson
4be67113be Thang events now only appear once per whole frame, rather than for each interpolated frame. 2014-05-17 11:28:57 -07:00
Nick Winter
736fc8c12f Remove overeager transpile problem showing for JS again. 2014-05-17 09:58:35 -07:00
Gutierri Barboza
589de9b4b2 correction in "candidate_location" 2014-05-17 13:11:05 -03:00
Gutierri Barboza
ac3c5276b5 update PT-BR 2014-05-17 13:07:51 -03:00
Pablo Lobato
8794921018 Update es-ES.coffee 2014-05-17 11:09:55 +02:00
Nick Winter
418c2f1a2c Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization. 2014-05-16 17:38:33 -07:00
Nick Winter
a36a7792ec Fixed problem with IndieSprites not loading, breaking scripts. 2014-05-16 17:18:56 -07:00
Nick Winter
f64e50f85b Recording flow only for frame of interest. 2014-05-16 16:52:55 -07:00
Michael Schmatz
891471b80a Add time to hover debugger 2014-05-16 16:04:10 -07:00
Scott Erickson
ae64032739 Refactored the Camera to only listen to events that use the same canvas. Fixed the level editor map selection modals. 2014-05-16 15:34:14 -07:00
Michael Schmatz
e631bae248 Level session playtime logging 2014-05-16 15:27:46 -07:00
Michael Schmatz
5b93414862 Add playtime, opponent name, totalScore to match 2014-05-16 14:52:49 -07:00
Michael Schmatz
2e36a3352e Modified level session schema to log playtime, renormalize score and name in matches 2014-05-16 14:13:59 -07:00
Michael Schmatz
21ccaa2d8a Adjust histogram height downwards 
Make room for ranking text
 2014-05-16 13:33:41 -07:00
Michael Schmatz
ab1b0cac42 Added "Rank your session" message 2014-05-16 13:30:55 -07:00
Michael Schmatz
bd1261802d Fix rank for unranked sessions on ladder histogram 2014-05-16 13:27:42 -07:00
Michael Schmatz
934c853789 Live simulation count and fixed double simulator leaderboard session 2014-05-16 13:16:35 -07:00
Michael Schmatz
60342cc40e Hover debugger optimization for "this" 2014-05-16 10:19:36 -07:00
Nick Winter
5d30cc7eab Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-16 10:04:03 -07:00
Nick Winter
c1052d8d7e Fixed bug with trying to play selection sound for nonexistent sprites. 2014-05-16 10:03:45 -07:00
Michael Schmatz
206d63231e Fixed teamSpells instantiation 2014-05-16 09:47:15 -07:00
Nick Winter
7811bda6c3 Use ace/mdoe/python for Python instead of ace/mode/lua. 2014-05-16 08:55:59 -07:00
Nick Winter
cff00f90b5 Stopped bug with useTranspiledCode; it will need more work later to get right. 2014-05-15 21:53:23 -07:00
Nick Winter
fabf607b6a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-15 20:49:15 -07:00
Nick Winter
ca6ea474bf Fixed some bugs with sprite sound loading and playback. 2014-05-15 20:49:10 -07:00
Scott Erickson
eebbae9b13 Added a global SPRITE_RESOLUTION_FACTOR property. 2014-05-15 17:09:35 -07:00
Michael Schmatz
65aae86dcc Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/lib/simulator/Simulator.coffee
 2014-05-15 16:44:16 -07:00
Michael Schmatz
a21d17a168 Have simulator use transpiledCode 2014-05-15 16:43:16 -07:00
Nick Winter
c7ca081df9 Merged ProblemAlertView fixes. 2014-05-15 15:36:06 -07:00
Nick Winter
c2a7530b62 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-15 15:35:08 -07:00
Michael Schmatz
0bb1422d6c Switch spectate and level view to use transpiled code 2014-05-15 15:18:17 -07:00
Nick Winter
763e0500b2 Tracking simulator clicks. 2014-05-15 15:10:50 -07:00
Nick Winter
b973b749c0 Merged. 2014-05-15 14:57:24 -07:00
Nick Winter
8909d218bc Moved random seed initialization to Existence System, where it can be configured. 2014-05-15 14:54:31 -07:00
Scott Erickson
2a1d9a3c6c Turned shadow caching back on, with a little buffer. Makes a bigger diff for maps like Greed on Firefox where they're all over the place. 2014-05-15 13:19:10 -07:00
Vicky Chijwani
0a14681e7b Correctly parse multi-line error messages in the editor. 2014-05-16 01:41:26 +05:30
Scott Erickson
3a1afbb7ca Turned shadow caching back on. Makes a bigger diff for maps like Greed on Firefox where they're all over the place. 2014-05-15 13:06:42 -07:00
Scott Erickson
c03004166c Set up the save version modal/patch modal to submit on submit form (like pressing enter in an input). 2014-05-15 12:37:39 -07:00
Nick Winter
c1f9d51b37 Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world. 2014-05-15 11:27:51 -07:00
Scott Erickson
f653aa3375 Fixed #1008 2014-05-15 10:51:38 -07:00
Michael Schmatz
338b613074 Added transpiledCode to victory modal 2014-05-15 09:30:59 -07:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
Scott Erickson
2a17ec5cb9 Refactored out displayObject from CocoSprites. 2014-05-14 17:05:13 -07:00
Michael Schmatz
4e268d8dc6 Add codeLanguage to level session 2014-05-14 16:41:02 -07:00
Nick Winter
dd1acb94ed Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-14 16:06:09 -07:00
Nick Winter
c420209a6b Improved GoldView tooltip. 2014-05-14 16:06:00 -07:00
Michael Schmatz
f32a0ca963 Added transpile to in-game rank button 2014-05-14 15:45:38 -07:00
Nick Winter
d61922ae42 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-14 15:31:19 -07:00
Nick Winter
cc7808251f Zoom/scroll, ModelModal, and coordinate grabber fixes. 2014-05-14 15:29:55 -07:00
George Saines
75ab5d6435 making our recruitment % consistent 2014-05-14 14:55:04 -07:00
Scott Erickson
a1474652f6 Merge branch 'feature/thangload' 2014-05-14 14:21:40 -07:00
Scott Erickson
00fdaa1d0f Fixed raster image sprites to update their scales when they load, and to properly place themselves if matching world dimensions. 2014-05-14 12:28:47 -07:00
Nick Winter
698207f533 Merge pull request #996 from gosnat/patch-8 
Update world.coffee
 2014-05-14 11:55:01 -07:00
Nick Winter
7f3e769cbd Merge pull request #997 from gosnat/patch-6 
Update GoalManager.coffee
 2014-05-14 11:54:50 -07:00
Nick Winter
57f3846abb Merge pull request #998 from gosnat/patch-7 
Update thang.coffee
 2014-05-14 11:54:46 -07:00
Scott Erickson
7a381df348 Merge branch 'feature/thangload' 2014-05-14 11:48:19 -07:00
Michael Schmatz
b11112c0aa Merge pull request #1001 from codecombat/transpiledCode 
Include transpiled code in submission process
 2014-05-14 11:43:53 -07:00
Michael Schmatz
a1360d6cb8 Include transpiled code in submission process 2014-05-14 11:42:15 -07:00
Scott Erickson
09fbfdb360 Fixed a bug with the simulator due to the changes made to the supermodel. 2014-05-14 11:13:36 -07:00
Michael Schmatz
19a637aaa4 Open candidates in new tab 2014-05-14 10:37:16 -07:00
Scott Erickson
0be813e424 Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished. 2014-05-14 10:35:16 -07:00
Michael Schmatz
9f9d651b3b Updates to transpile script and updated aetherOptions 2014-05-14 10:14:18 -07:00
Scott Erickson
cab1adf8fc Merge branch 'master' into feature/thangload 2014-05-14 09:31:59 -07:00
Scott Erickson
54af58baee SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading. 2014-05-14 09:24:52 -07:00
Scott Erickson
4b404ae124 Finished tuning the supermodel loading and progress. 2014-05-13 14:39:45 -07:00
Nick Winter
ab37646cb6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-13 11:04:20 -07:00
Nick Winter
53870a89a5 Python allowed, and better support for transpile errors. 2014-05-13 11:04:04 -07:00
Scott Erickson
b4ad34eb8f LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily. 2014-05-13 10:51:55 -07:00
Michael Schmatz
961fea7d5c Update level session schema 2014-05-13 10:49:02 -07:00
gosnat
12f351197d Update world.coffee 
add getGoalState
 2014-05-13 12:43:39 -05:00
gosnat
72b2c84705 Update thang.coffee 
add getGoalState
 2014-05-13 12:42:48 -05:00
gosnat
25287e0298 Update GoalManager.coffee 
add getGoalState
 2014-05-13 12:41:39 -05:00
Scott Erickson
66af855497 Merge branch 'master' into feature/thangload 2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe Most of the way there getting it to work with loading thang types dynamically throughout the play view. 2014-05-13 10:26:33 -07:00
Nick Winter
69dc96c7c8 Fixed Rank My Game on my matches. 2014-05-12 19:56:12 -07:00
Dominik Maier
bb562aba32 + Overly lengtly comment changed. 2014-05-13 04:40:15 +02:00
Nick Winter
09bdc9bad9 Fixed initial team setting. 2014-05-12 19:39:16 -07:00
Dominik Maier
521bc31fa5 + Created function for generating a reproducable seed out of user code - as using JSON.stringify is not garanteed to be the same on every browser for objects. 2014-05-13 04:32:29 +02:00
Dominik Maier
efa39ffcd9 + Created function for generating a reproducable seed out of user code but it fails inside the web-worker 2014-05-13 04:18:56 +02:00
Dominik Maier
2807e83672 + "Real" predictable random. Seed depends on usercode map. 2014-05-13 03:34:11 +02:00
Nick Winter
4a151d3b72 Improving #671. 2014-05-12 16:45:12 -07:00
Nick Winter
2eefdef191 Working on matching Surface paused state to the pause screen. 2014-05-12 15:54:07 -07:00
Nick Winter
78a0efac78 Fixed long words in Labels and empty GoldView. 2014-05-12 15:03:53 -07:00
Nick Winter
802889d115 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-12 13:28:51 -07:00
Nick Winter
1a5e30d5b5 Dynamic Canvas sizing. 2014-05-12 13:28:46 -07:00
Michael Schmatz
687872a97b Moved debug cache onto main thread 
UI responsiveness greatly improved
 2014-05-12 11:16:02 -07:00
Nick Winter
1aa72541ff Merged master into feature/thangload. 2014-05-12 09:57:31 -07:00
Nick Winter
e1b35251a3 Fixed bug with playback ending early. 2014-05-12 08:35:46 -07:00
Nick Winter
714d17fd7f Adding Clojure and Lua worker modes. 2014-05-11 22:52:43 -07:00
Nick Winter
0b5854765a Adding Clojure and Lua as choosable languages. 2014-05-11 22:51:44 -07:00
Nick Winter
74ef9bc987 Experimental support for preloading worlds when we would have autocast if manual cast is on. 2014-05-11 17:42:32 -07:00
Nick Winter
8df3b01f9e Merged world/lodash/aether breakup for world workers. 2014-05-10 18:52:55 -07:00
Nick Winter
1e18f0b42f Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds. 2014-05-10 18:24:50 -07:00
Scott Erickson
f1de2ca8d9 Brought the canvas size down again because it halves the FPS in Firefox at least. 2014-05-09 16:35:10 -07:00
Scott Erickson
504a904841 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-09 15:22:39 -07:00
Scott Erickson
7815951073 Split out aether from vendor.js. Should help #826. 2014-05-09 15:22:23 -07:00
Nick Winter
df88be1ab1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-09 15:07:55 -07:00
Nick Winter
6040d3b225 Shouldn't use much CPU when totally paused on Surface. 2014-05-09 15:07:30 -07:00
Michael Schmatz
1bbd4e6c68 Fixed frame-related bug 2014-05-09 15:05:50 -07:00
Michael Schmatz
f05af0fbe7 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/assets/javascripts/workers/worker_world.js
 2014-05-09 14:50:08 -07:00
Michael Schmatz
66cc427417 Forward simulation optimization 2014-05-09 14:48:43 -07:00
Nick Winter
a74d015d18 Fixed a couple minor bugs. 2014-05-09 14:30:33 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Nick Winter
c4819c647c Removed includeeFlow, since we're going to do it lazily with the debug worker. 2014-05-09 09:29:50 -07:00
Scott Erickson
0292be054e I think this fixes #976. I believe the client was attempting to save components and systems it didn't have write access to, and that was gumming up the works. Not 100% sure though; reopen if it rears its ugly head once more. 2014-05-08 14:56:02 -07:00
Scott Erickson
3d51969757 Fixed the patch view loading. 2014-05-08 14:54:47 -07:00
Scott Erickson
9c3cefa457 Removed a couple logs I forgot about. 2014-05-08 14:28:18 -07:00
Scott Erickson
8072629534 Merged the bug fix which I did too. 2014-05-08 13:43:15 -07:00
Scott Erickson
57f11ff3ea Fixed some bugs with the components tab. 2014-05-08 13:40:42 -07:00
Michael Schmatz
cb5ae5f2f6 Fix #983 
We need a generic scrolling solution
 2014-05-08 11:58:45 -07:00
Nick Winter
3819778bee Updating everything to Aether 0.2.0. 2014-05-08 11:43:00 -07:00
Nick Winter
775a2a87e2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-08 11:36:26 -07:00
Michael Schmatz
f0a873cf02 Fix #985 
I can’t wait until Chrome has majority market share
 2014-05-08 11:17:27 -07:00
Scott Erickson
1e938910ed Couple bug fixes. 2014-05-08 11:10:22 -07:00
Scott Erickson
9a5c4b6ced Merge remote-tracking branch 'origin/master' 2014-05-08 10:54:43 -07:00
Scott Erickson
e9fc3df7c1 Set up the versions modal to display changes between versions when you select two of them. 2014-05-08 10:54:39 -07:00
Michael Schmatz
9c58aef32b Merged worker_debug and worker_world 2014-05-08 09:47:02 -07:00
Scott Erickson
ed222338e7 Fixed #892 by having the components tab reload whenever it's opened. 2014-05-07 16:24:13 -07:00
Nick Winter
f3c6745b29 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-07 15:37:49 -07:00
Michael Schmatz
4221fd55cb Fixed #979 2014-05-07 13:56:10 -07:00
Michael Schmatz
ae213cc330 Fixed #982 2014-05-07 13:33:17 -07:00
Scott Erickson
c037ce14f2 Fixed #958. LevelLoader wasn't handling cached session objects passed in with the supermodel. 2014-05-07 13:28:42 -07:00
Michael Schmatz
7432112cba Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-07 11:37:04 -07:00
Michael Schmatz
7110f023f2 Merge branch 'feature/hover-debugger-performance' 
Conflicts:
	app/lib/God.coffee
	app/views/play/level/tome/spell_debug_view.coffee
 2014-05-07 11:37:03 -07:00
Scott Erickson
09a47cc5d8 Fixed #951. The parser was removing the shadow shape but not the tween of the shadow. 2014-05-07 11:11:22 -07:00
Michael Schmatz
806b159aab Fixed another off-by-one error 2014-05-07 10:20:22 -07:00
Michael Schmatz
6fd89f10b9 Fixed various debugger UI bugs 2014-05-07 10:03:49 -07:00
Michael Schmatz
4ef6548dad Fixed array prototype alteration conflict 2014-05-07 09:34:37 -07:00
Nick Winter
0c30ec0c12 Some weird bugs I noticed with {me}. 2014-05-06 16:58:08 -07:00
Michael Schmatz
da575f8945 Refactored hover debugger is functional 
Still needs optimizations and a few bug fixes, but it’s better than the
existing code existing to Nick
 2014-05-06 15:07:06 -07:00
Scott Erickson
d62f04cf88 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-06 14:52:28 -07:00
Scott Erickson
c345a31d14 Merge branch 'PatchesLayoutInconsistency' of https://github.com/dpen2000/codecombat into dpen2000-PatchesLayoutInconsistency 2014-05-06 14:50:01 -07:00
dpen2000
4ff1e9a3a3 Make components' patches tab and systems' patches tab look consistent 
Mix of previous stylings with spacing at top and white background
 2014-05-06 17:34:13 -04:00
Nick Winter
1f166406ac Some new names. 2014-05-06 12:47:38 -07:00
Michael Schmatz
e8d26af985 Implemented caching and fixed off by one error 2014-05-06 11:36:46 -07:00
Scott Erickson
c58a27fcbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-06 11:21:15 -07:00
Scott Erickson
ffdf11133e Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges 2014-05-06 11:19:11 -07:00
Nick Winter
ca8d5c1f3b Stop bobbing and more marks when world ended. 2014-05-06 11:02:53 -07:00
Michael Schmatz
dddd617a08 userCodeMap issues fixed 
Now beginning hooking up the UI
 2014-05-06 10:06:32 -07:00
Nick Winter
2e6bec5454 Some fixes for my accidental merge of #970. 2014-05-06 09:49:04 -07:00
Nick Winter
1f3cc8a004 Merge branch 'master' of git://github.com/domenukk/codecombat 2014-05-06 08:00:39 -07:00
Nick Winter
09c8a99a9b Merge branch 'patch-5' of git://github.com/gosnat/codecombat into gosnat-patch-5 2014-05-06 07:23:51 -07:00
Nick Winter
acccee33a3 Cleaner conditional init syntax. 2014-05-06 07:22:09 -07:00
Nick Winter
3e7edd8c61 Merge branch 'patch-4' of git://github.com/gosnat/codecombat into gosnat-patch-4 2014-05-06 07:18:26 -07:00
Nick Winter
9e40dcd2e3 Added a couple i18n tags. 2014-05-06 06:58:20 -07:00
Nick Winter
af5b878166 Fixed wizard setting things. 2014-05-06 06:56:14 -07:00
Roy Xue
03e5d1ca50 Merge pull request #1 from codecombat/master 
Update CodeCombat
 2014-05-06 14:09:42 +08:00
Dominik Maier
6d244e8560 + Merged Simulators 2014-05-06 05:07:34 +02:00
Nick Winter
81634190ef Added i18n for translating specific articles now, too. 2014-05-05 19:14:38 -07:00
Dominik Maier
ad85bf5b77 Merge remote-tracking branch 'upstream/master' 2014-05-06 03:12:24 +02:00
Nick Winter
0f5ee67fe1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-05 17:59:32 -07:00
Dominik Maier
c9bb488794 Created headless-client and an alternative implementation of god 2014-05-06 02:37:14 +02:00
Nick Winter
0e0ca785d9 Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab. 2014-05-05 16:59:12 -07:00
Scott Erickson
056f081cdb Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide 
Conflicts:
	app/views/modal/signup_modal.coffee
 2014-05-05 16:48:35 -07:00
Scott Erickson
8d67e28977 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-05 16:35:45 -07:00
Scott Erickson
684e61532a Fixed a bug with the deltas library identifying conflicts between patches. 2014-05-05 16:35:26 -07:00
Nick Winter
82529c781b Fixed some ladder home links. 2014-05-05 15:33:08 -07:00
Scott Erickson
8f9aea1b9b Fixed the patches view. 2014-05-05 15:19:35 -07:00
Michael Schmatz
97f3694dbf Basic backend functionality is there 2014-05-05 13:26:37 -07:00
gosnat
939509849c Update GoalManager.coffee 
Justification:

For a negative goal like saveThangs, let's say you have 5 thangs on the save list.  As things stand, if you don't have a HowMany defined, then the number of needed deaths to fail is 

numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.min(1, 5) + 1
numNeeded = 5

So you would only fail the goal if all 5 thangs you were supposed to save died.  This is contrary to the comment right above this line:

# saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done"

Therefore, I think it should be Math.max rather than Math.min.

numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(1, 5) + 1
numNeeded = 1

So any of the Thangs on the save list dying is enough to fail the goal.

As a double check, what if the level designer designated a HowMany of 5?

numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(5, 5) + 1
numNeeded = 1

So this is consistent.
 2014-05-05 14:08:41 -05:00
gosnat
93d117100a Update GoalManager.coffee 
For compound goals like GetAllToLocation, you should continue adding to the existing list of thang states.
 2014-05-05 13:22:57 -05:00
Roy Xue
2b2fea3092 Update zh.coffee 2014-05-05 21:33:01 +08:00
Vic___
e64ba30d33 Update zh-HANS.coffee 2014-05-05 20:05:57 +08:00
Nick Winter
b84a73cb8e Don't need huge raster images full-size in the Treema. 2014-05-04 21:29:50 -07:00
Nick Winter
3b891e6628 Merge pull request #954 from marc-portier/master 
first translation contribution
 2014-05-04 21:25:05 -07:00
Nick Winter
9dc66c1568 Merge pull request #961 from gosnat/patch-3 
Update GoalManager.coffee
 2014-05-04 21:12:50 -07:00
Roy Xue
fd3c008ca7 Update zh-HANS.coffee 2014-05-04 11:03:43 +08:00
gosnat
39b21da035 Update GoalManager.coffee 
I'd like to temporarily turn on console logging (lines 240 and 245) to take a peek at why numNeeded doesn't seem to be correct if howMany isn't defined.
 2014-05-03 21:36:24 -05:00
Nick Winter
b6a53a83e7 Fixed issue with play button not turning into rewind. 2014-05-03 13:26:37 -07:00
Nick Winter
73222a1a98 Don't start drawing Surface until needed. 2014-05-03 09:13:26 -07:00
Nick Winter
fbf5f52228 Merge pull request #955 from benojan/patch-3 
Update zh-WUU-HANT.coffee
 2014-05-03 07:22:57 -07:00
Nick Winter
8fbe2dedfc Propagated Wu name update. 2014-05-03 07:21:18 -07:00
Marc Portier
5212eca404 fixing typox - thx to @JasperDhaene 2014-05-03 16:04:08 +02:00
Marc Portier
f7b746c3ea making case consistent - thx to @JasperDhaene 2014-05-03 16:01:17 +02:00
Marc Portier
add2944a28 ogre ==> ork and a serious spelling error 2014-05-03 15:59:16 +02:00
Benojan
8a11990e89 Update locale.coffee 
巫师吴语->吴语
巫師吳語->吳語
 2014-05-03 17:55:36 +08:00
Benojan
50d4078ade Update zh-WUU-HANT.coffee 
translate others that was not translated.
 2014-05-03 17:14:11 +08:00
Marc Portier
d348c6f333 translate space 2014-05-03 11:06:39 +02:00
Marc Portier
e1482280c3 first translation contribution 2014-05-03 08:23:36 +02:00
Nick Winter
90bbe0bf55 Moved modals down a bit; watch out, not sure why they were !important before. 2014-05-02 19:28:08 -07:00
Nick Winter
77adebe181 Fixed #893. 2014-05-02 18:53:18 -07:00
Scott Erickson
db9a82d58a Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload 2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel. 2014-05-02 17:03:30 -07:00
Nick Winter
afbe5b063b Fix HTML icon syntax in the Markdown. 2014-05-02 15:51:07 -07:00
Nick Winter
a04f74de8b Implemented George's gold design. 2014-05-02 15:12:30 -07:00
Nick Winter
d54149d0f3 Reworked LevelView loading priorities to try to get world simulating earlier. 2014-05-02 12:32:41 -07:00
Nick Winter
e610ecb476 Propagated new i18n tags. 2014-05-02 11:02:48 -07:00
Nick Winter
9d45b22057 Added some i18n tags. 2014-05-02 11:00:30 -07:00
Scott Erickson
eacbf571c6 Merge branch 'master' into feature/thangload 2014-05-02 10:32:05 -07:00
Scott Erickson
06bc96d7d0 Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering. 2014-05-02 10:31:20 -07:00
Nick Winter
ef036b409b Merge pull request #930 from M-r-A/patch-1 
Update ru.coffee
 2014-05-02 09:58:55 -07:00
Nick Winter
3ac052a4a6 Merge branch 'benojan-patch-2' 2014-05-02 09:49:35 -07:00
Nick Winter
082a9d141a Keeping Wu English stub. 2014-05-02 09:49:02 -07:00
Nick Winter
302cb78095 Added zh-WUU-HANS stubs. 2014-05-02 09:48:40 -07:00
Nick Winter
f92fd122c6 Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so. 2014-05-02 09:46:00 -07:00
Scott Erickson
2952d7702c Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:20:03 -07:00
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:19:47 -07:00
Benojan
28a56c1c83 Create new language--the wuu-chinese 
Just for Wuu Chinese, including Shanghainese and such language in Zhejiang Province, China.
 2014-05-02 19:19:21 +08:00
Benojan
770345f84d Update zh.coffee 2014-05-02 16:09:13 +08:00
Nick Winter
ae31f90a25 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-01 17:41:10 -07:00
Nick Winter
9f18811701 Fixed logic for displaying runtime errors from last run based on code being the same as last cast. 2014-05-01 17:41:06 -07:00
Michael Schmatz
347292c985 Implemented save notes button 2014-05-01 17:36:49 -07:00
Michael Schmatz
9fb5826593 Scroll to candidate position while going back 2014-05-01 16:56:41 -07:00
Scott Erickson
26cafd2f19 Fixed #941. Actually it was no longer crashing probably because of the fix for #934, but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too. 2014-05-01 16:38:27 -07:00
Michael Schmatz
717651d6ff Progress on thang property serialization 
There is a bug where thang properties aren’t updated when simulating
forward
 2014-05-01 16:08:46 -07:00
Scott Erickson
3bc0c1710e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-01 15:45:00 -07:00
Scott Erickson
31c5890288 Fixed #934 2014-05-01 15:44:50 -07:00
Nick Winter
0f33bae1f1 Hid level done button better. Avoiding building wizard sprite when not needed. 2014-05-01 14:36:26 -07:00
Nick Winter
5376a42f94 Fixed serialization of tracked property arrays. 2014-05-01 13:23:14 -07:00
Nick Winter
bebe5a0620 Improved hover debugger tokenization specificity to not extend past end of line. 2014-05-01 11:18:20 -07:00
Michael Schmatz
c9ea301b29 Fixed various bugs with debug worker 2014-05-01 11:12:44 -07:00
Nick Winter
f7bdb7e840 Upgrades for teleportation imnterpolation performance, ACE search box styling. 2014-05-01 10:44:17 -07:00
Nick Winter
541a2756fd Simulate properly even if Simulator Supermodel starts fully loaded. 2014-04-29 16:54:57 -07:00
Nick Winter
2f174691c5 Fixed #939. 2014-04-29 16:44:38 -07:00
Nick Winter
04d74fb76f Fixed bug with scale not updating properly when paused. 2014-04-29 16:04:30 -07:00
Nick Winter
4ad7ebc95d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-29 15:31:23 -07:00
Nick Winter
bea0589fad Fixed #935. 2014-04-29 15:31:18 -07:00
Michael Schmatz
294570cb1b Made it so that modal doesn't show if you've signed the contract 2014-04-29 15:30:28 -07:00
Nick Winter
eca35ce371 Several minor bugfixes, and enabled API protection on all levels by default. 2014-04-29 15:25:59 -07:00
Nick Winter
8a6bec9d40 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-29 15:25:39 -07:00
Michael Schmatz
546bd26328 Fixed login flow and user profile issue 2014-04-29 15:12:50 -07:00
Nick Winter
d3a21f4959 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-29 09:43:08 -07:00
gosnat
d0900870b2 Update play_view.coffee 
Fixed ID for harvest-time level (was pointing to find-the-spy)
 2014-04-29 10:53:55 -05:00
Nick Winter
9fb549a394 Fixed Guide tabs cursor. 2014-04-29 08:46:57 -07:00
Nick Winter
2d057fa81f Cursor: pointer on docs modal tabs. 2014-04-28 19:57:59 -07:00
Nick Winter
369ea8a00f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 19:09:04 -07:00
Nick Winter
aea49cc27f Fixed bobbing. 2014-04-28 18:36:46 -07:00
Scott Erickson
bcad939eae Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 18:31:04 -07:00
Scott Erickson
57beb94b5c Fixed a bug with the levelloader loading articles. 2014-04-28 18:30:47 -07:00
Nick Winter
40fbf336c2 Using new level loading sound. 2014-04-28 17:59:02 -07:00
Nick Winter
b954e70d85 Let's try 30 FPS. Fixed Surface destruction bug. 2014-04-28 17:06:43 -07:00
Nick Winter
0b947dbeee Let's try 30 FPS for a while now. 2014-04-28 16:41:18 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Michael Schmatz
544cc62cdb First steps towards hover debugger improvements 2014-04-28 15:05:54 -07:00
Scott Erickson
e5e146c3c1 Got rid of an extraneous log. 2014-04-28 14:59:51 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Nick Winter
7e16fa5bd6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 14:01:43 -07:00
Nick Winter
6d75b5593a Fixed bug with pointer animation. 2014-04-28 14:01:33 -07:00
Scott Erickson
3a28f190a1 Merge branch 'master' into feature/loading-views 2014-04-28 11:55:17 -07:00
Scott Erickson
6f2e309d6d Added one last resource name. 2014-04-28 11:53:57 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Scott Erickson
8164c6881c Fixed a patches resource name. 2014-04-28 11:10:27 -07:00
Scott Erickson
01f2a556f9 Set up the patches view with the new loading system, fixing a few things in the meanwhile. 2014-04-28 11:09:21 -07:00
Nick Winter
4a2f2700bc Don't show tutorial level link if tutorial level doesn't exist for a ladder level. 2014-04-28 10:54:03 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Alexei Nikitin
d82c62f4e6 Update ru.coffee 
I am extremely dissatisfied the support of CodeCombat internationalization by programmers. Make changes to the requirements of the new code; it must be completely covered by the i18n tags reflected in en.coffee.
 2014-04-28 09:23:56 -07:00
dpen2000
0a8ec096f7 Make components read only for anonymous users 2014-04-28 02:03:08 -04:00
dpen2000
3165a2b654 Change all lines setting readonly from being admin only to being authenticated only 2014-04-28 02:03:08 -04:00
Nick Winter
0de5e715c7 Double-checked i18n propagation. 2014-04-27 20:28:53 -07:00
Nick Winter
d245dfd34c Merge pull request #915 from dpen2000/HideCreateComponentsSystems 
Hide Create New System/Component links in menus from non-admins
 2014-04-27 20:25:06 -07:00
Nick Winter
8cb8c63f21 Fixed merge conflicts in uk.coffee. 2014-04-27 20:23:13 -07:00
Nick Winter
c1637fe37a Fixed merge conflicts in es-419.coffee. 2014-04-27 20:19:05 -07:00
Nick Winter
3e3611e57d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-27 20:14:12 -07:00
Nick Winter
938a2bca1d Merge pull request #900 from julycoolwind/patch4 
Translate items under multiplayer_launch
 2014-04-27 20:13:27 -07:00
Nick Winter
e65202434b Merge pull request #890 from treby/update_ja_resource 
Update ja resource.
 2014-04-27 20:12:14 -07:00
Nick Winter
fc6ad1dd01 Properly tracking first-frame team gold. Slightly more visible team gold on hover. 2014-04-27 20:11:11 -07:00
Nick Winter
a7179ae3b2 Fixed some more gold view stuff. 2014-04-27 15:33:16 -07:00
Nick Winter
2ec225b0d0 Enabled API protection for Find the Spy. 2014-04-27 14:30:32 -07:00
Nick Winter
dac4f05fd9 Improved legibility of gold font. Moved Done button to not conflict with gold display. 2014-04-27 14:19:39 -07:00
Nick Winter
d542898663 Fixed indentation / commenting on a few lines from #924. 2014-04-27 09:40:43 -07:00
belian
75f37864da Update fr.coffee 
New update for "fr.coffee"
 2014-04-27 11:52:55 +02:00
Nick Winter
fa0e7f04f7 Fixed a thing. 2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Scott Erickson
14cffc5875 Did some refactoring to simplify using SuperModel and registering models and collections. 2014-04-26 12:54:03 -07:00
Scott Erickson
d5bcec5ad0 Fixed the level editor with the new loading system. 2014-04-25 19:11:32 -07:00
Nick Winter
834c27bbd7 Show spell palette for Thangs with apiProperties that aren't programmable. 2014-04-25 16:57:42 -07:00
Scott Erickson
14d62915f4 Got projection and backups set back up, partially fixed the level editor. 2014-04-25 16:14:05 -07:00
Scott Erickson
9a2311e792 Removed logic for dynamically finding referenced models. 2014-04-25 15:33:57 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
d8d2a57c38 Listed a few new levels. 2014-04-25 15:00:46 -07:00
Scott Erickson
7640a6365b Removed some logs. 2014-04-25 14:59:17 -07:00
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/views/editor/components/main.coffee
 2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Nick Winter
2ff97c3bcd I guess emails might not be there. 2014-04-25 10:55:37 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
abe07e6395 Potential popup blocker fix 2014-04-25 09:17:04 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
61458c97d6 Fixed jqxhr error display 2014-04-25 07:50:29 -07:00
Michael Schmatz
0dbcc861bf Various tweaks to employer signup 2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
dpen2000
69b3fe4b8c Hide Create New System/Create New Component links in menus from non-admins 2014-04-24 19:24:08 -04:00
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -07:00
Nick Winter
0975a86345 Propagated i18n. 2014-04-24 14:32:56 -07:00
Nick Winter
8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 14:31:54 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Scott Erickson
2d43b36022 Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText 2014-04-24 13:29:24 -07:00
Scott Erickson
e2c2657f34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 13:23:40 -07:00
Scott Erickson
472f8899dd Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master 
Conflicts:
	app/views/editor/level/edit.coffee
 2014-04-24 13:17:43 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
Scott Erickson
0a313a110c Removed a piece of logging. 2014-04-24 12:07:11 -07:00
Scott Erickson
cfbd7b9b12 Fixed #911 2014-04-24 11:51:00 -07:00
Scott Erickson
8ab50205aa Fixed more buttons in treema. 2014-04-24 11:50:49 -07:00
Scott Erickson
84d21490ab Fixed some treema styling. 2014-04-24 11:38:30 -07:00
Scott Erickson
1eb2adbc61 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 11:22:50 -07:00
Scott Erickson
76f36294b0 Fixed #908, while keeping things like opening revert or contact modals in the level editor from breaking. 2014-04-24 11:22:43 -07:00
Nick Winter
73f39095e6 Upgraded table sorter. 2014-04-24 11:09:01 -07:00
lordbam
8b9bc0c504 Update uk.coffee 
I have translated part of it. please check it for mistakes and add it to your page if all is alright. in few days i‘ll try to translate to the end
 2014-04-24 17:25:11 +03:00
tmrdja
14ebc957de Changed responsive view for LevelEditor 2014-04-24 11:51:16 +02:00
Michael Schmatz
c408196814 Fix for runtime errors 2014-04-23 16:44:31 -07:00
Nick Winter
86aa4cd0fe Updated janky include_flow skip levels. 2014-04-23 16:11:47 -07:00
Darredevil
47eef39bc7 Added Gold Rush level 2014-04-24 02:07:59 +03:00
Nick Winter
68f3eeb770 Two tiny profile improvements. 2014-04-23 11:26:20 -07:00
Michael Schmatz
628a784ac4 Progress towards LinkedIn integration 2014-04-23 11:25:36 -07:00
Nick Winter
d1ceec16bb Propagated i18n tags, as reminded by #884. 2014-04-23 10:48:31 -07:00
Nick Winter
d4cf31c8fe Improved admin view of pending candidates. 2014-04-23 10:21:58 -07:00
marianoluzza
0db33213f3 Update es-419.coffee 
Various sections translated
 2014-04-23 13:44:13 -03:00
林鑫
de1eb3860a Translate items under multiplayer_launch 2014-04-23 17:26:39 +08:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00
Scott Erickson
9c8841e838 Merge remote-tracking branch 'origin/master' 2014-04-22 16:42:50 -07:00
Scott Erickson
5921575a02 Hack to fix a bug with the components view in the thang editor. 2014-04-22 16:42:41 -07:00
dpen2000
dd00e2abe6 Replace generic text Sign Up to Create a New Content 2014-04-23 00:37:10 +01:00
Glen De Cauwsemaecker
afc447e596 Removed double got_questions i18n tag in en.coffee from commit e439e3f 2014-04-22 23:47:11 +02:00
Glen De Cauwsemaecker
7da89e8b00 Merge branch 'master' of https://github.com/JasperDhaene/codecombat into jasper-master 2014-04-22 23:44:50 +02:00
edtrist
3962d37681 #889 - moved CocoCollection.coffee to app/collections and updated references 2014-04-22 20:42:26 +01:00
Michael Schmatz
7419b269f1 Merge pull request #894 from codecombat/feature/worker-lint 
Background linting/transpilation/hasChangedSignificantly
 2014-04-22 12:05:03 -07:00
Michael Schmatz
6122d31e28 Removed web worker logging listener 2014-04-22 12:03:33 -07:00
Michael Schmatz
3110e6e56a Renamed test_worker to aether_worker 2014-04-22 11:58:27 -07:00
Michael Schmatz
392dbb9f8d Removed superfluous comment 2014-04-22 11:51:51 -07:00
Michael Schmatz
3bbedbc100 Added background transpile 2014-04-22 11:46:17 -07:00
Nick Winter
ab77176ed0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-22 11:11:10 -07:00
Nick Winter
675db1b76f Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents. 2014-04-22 11:11:08 -07:00
Michael Schmatz
e0f8d1343e Fixed race condition 2014-04-22 11:04:56 -07:00
Scott Erickson
bb0cbf1151 Removed some old code that didn't work out. 2014-04-22 10:43:08 -07:00
Scott Erickson
e8da248302 Made the level editor not break when using units that are incomplete. 2014-04-22 10:39:15 -07:00
Michael Schmatz
81809956b8 hasChangedSignificantly async refactor 
Still checking for bugs
 2014-04-22 08:54:35 -07:00
treby
6937d656c7 Added translate contributor. 2014-04-22 08:55:00 +09:00
treby
4898ff78a1 Updated ja.coffee 2014-04-22 08:54:10 +09:00
Scott Erickson
f57be1ae52 Migrated to the new email system, along with a setting for recruit notifications. 2014-04-21 16:15:23 -07:00
Michael Schmatz
0f435b41ae Merge pull request #885 from codecombat/master 
Merge master into worker-lint
 2014-04-21 14:13:43 -07:00
Scott Erickson
1e50ef36ce Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming 2014-04-21 12:53:11 -07:00
tmrdja
826a5f56db Added responsive view for LevelEditor 2014-04-21 21:15:22 +02:00
Scott Erickson
c754f7b943 Merge branch 'master' into feature/loading-views 2014-04-21 11:53:18 -07:00
Scott Erickson
9bc8ae11da Fixed some indentation. 2014-04-21 11:42:21 -07:00
Michael Schmatz
69ef951dba Merge pull request #874 from dpen2000/FixSystemsListDeltaIssue 
Fix deltas referring to last system saved
 2014-04-21 10:56:53 -07:00
JasperDhaene
e439e3fec8 added missing i18n tag 2014-04-21 19:56:38 +02:00
JasperDhaene
c49dc9457d fixed some lines to fit proper context 2014-04-21 19:54:14 +02:00
JasperDhaene
4d7e6ba849 fixed some lines to fit proper context 2014-04-21 19:52:27 +02:00
JasperDhaene
6a1d43435a fixed some lines to fit proper context 2014-04-21 19:50:43 +02:00
Michael Schmatz
486d1b75ff Changed moar to More 2014-04-21 10:40:22 -07:00
Daniel
baff84f0ae Update es-ES.coffee 
Hi!
I have translated the remaining lines. I have not tested all the text yet in order to remove overflowing or cut off texts (I had to modify two lines to avoid a couple of linguistic bugs) but I hope to do it soon.
Cheers!
 2014-04-21 01:13:34 +02:00
Nick Winter
5e2f3ac7cb Merge pull request #878 from JasperDhaene/master 
Update Dutch locale
 2014-04-20 13:21:07 -07:00
JasperDhaene
ef9ee024e1 update nl-NL.coffee 2014-04-20 21:34:43 +02:00
JasperDhaene
ad212d428c update nl-BE.coffee 2014-04-20 21:33:19 +02:00
JasperDhaene
6a03ddad74 Update nl.coffee 2014-04-20 21:31:11 +02:00
Nick Winter
6fa3d81fa1 Merged, fixed conflicts, restored rest of file. 2014-04-20 11:44:44 -07:00
Nick Winter
a829f3a537 Merge branch 'patch-2' of git://github.com/kinez/codecombat 2014-04-20 11:42:05 -07:00
Nick Winter
baca3876ca Merge pull request #869 from treby/improve_ja_resources 
Updated  for Japanese(ja).
 2014-04-20 11:20:46 -07:00
Inez KEMENES
4a2bcc2030 Update hu.coffee 2014-04-20 19:04:07 +02:00
Nick Winter
f281aa8e2d Fixed quotes. 2014-04-19 17:43:01 -07:00
Nick Winter
b806436232 Merge branch 'patch-3' of git://github.com/julycoolwind/codecombat into julycoolwind-patch-3 2014-04-19 17:40:58 -07:00
Nick Winter
0787349d32 Merge pull request #873 from dpen2000/patch-1 
Modify links on community page
 2014-04-19 17:38:20 -07:00
Nick Winter
4249ddce15 Merge pull request #868 from M-r-A/i18n 
Update ru
 2014-04-19 17:34:34 -07:00
dpen2000
de69f740e4 Fix deltas referring to last system saved 
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
 2014-04-19 19:59:21 -04:00
dpen2000
c241b06f76 Modify links on community page 2014-04-19 20:03:22 +01:00
Scott Erickson
044556e5a4 Fixed a bug with the level editor that prevented selecting thangs to add. 2014-04-19 10:27:14 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -04:00
Ting-Kuan
7321052c18 Fix supermodel with resource value and fix ladder view under supermodel resource management. 2014-04-19 13:06:47 -04:00
Ting-Kuan
375aca2c0a Fix: Some level systems load forever. 2014-04-19 12:08:40 -04:00
林鑫
984f2c2cc4 Translate some items under common,account_settions,employers,play_level. 2014-04-19 23:22:03 +08:00
Alexei Nikitin
ac47a88c39 Update ru 2014-04-19 13:54:51 +04:00
treby
fb2bf865cd Added some translation for Japanese. 2014-04-19 16:42:34 +09:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
Nick Winter
7186b414cf Merge pull request #861 from onion7878/patch-1 
Update zh-HANS.coffee
 2014-04-18 17:49:55 -07:00
Michael Schmatz
a7867e5e2d Added background linting 
Background hasChangedSignificantly is soon!
 2014-04-18 14:59:08 -07:00
dpen2000
75b759b1dc Add system names into delta messages 2014-04-18 17:25:25 -04:00
dpen2000
b20f8fd260 Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee 2014-04-18 21:06:57 +01:00
George Saines
fced3e821a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 13:02:11 -07:00
George Saines
71ee31ef49 styling the community page 2014-04-18 13:02:07 -07:00
Nick Winter
f38d17c64f Protected candidates from view by employers they work(ed) at. 2014-04-18 12:48:13 -07:00
Nick Winter
a88089b7fc Sass don't like that. 2014-04-18 09:54:27 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Ting-Kuan
75224e0cd9 hideLoading on ThangEditView and ComponentConfigView. 2014-04-17 22:41:07 -04:00
Ting-Kuan
64f986c286 Remove dependency management in supermodel. 2014-04-17 22:16:29 -04:00
Scott Erickson
8adca4a1da Added a transactional email for when changes are made, to notify watchers. 2014-04-17 17:30:55 -07:00
Scott Erickson
ed0c7e1412 Creators of documents are automatically added as watchers. Added a patch creation email for watchers. 2014-04-17 17:09:01 -07:00
Ting-Kuan
69fe4428e4 Before merge to master. 2014-04-17 19:52:09 -04:00
Ting-Kuan
a5e2069d60 Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts. 2014-04-17 19:37:31 -04:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Scott Erickson
21e8d7b26f Fixed patches denormalization. 2014-04-17 15:44:19 -07:00
Scott Erickson
7ccaa8c843 Fixed a bug, colored a badge. 2014-04-17 14:39:52 -07:00
Scott Erickson
cdaf2ebfaf Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible. 2014-04-17 14:23:33 -07:00
Ting-Kuan
b7439ed1ca Fix loading bar and retry block in ladder_view, #857. 2014-04-17 16:54:26 -04:00
Scott Erickson
781a8ec913 Fixed the play and save buttons. 2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Scott Erickson
b5406b0149 Set up the rest of the component/system buttons and nav bars. 2014-04-17 13:24:17 -07:00
Ting-Kuan
fe96289bf6 debugging: ladder_view doesn't show loading bar. 2014-04-17 15:57:08 -04:00
Nick Winter
2230b32829 Merge pull request #863 from dpen2000/FixTypeError 
Fix javascript error occuring when e is null/undefined
 2014-04-17 11:37:51 -07:00
Scott Erickson
9eff958dcb Fixed the level and component watch buttons. 2014-04-17 11:35:09 -07:00
Nick Winter
46487f55a4 Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping. 2014-04-17 11:34:55 -07:00
dpen2000
7bc9bb5328 Fix javascript error occuring when e is null/undefined 2014-04-17 14:32:35 -04:00
Scott Erickson
8f4535853b Fixed the component history button. 2014-04-17 11:29:12 -07:00
Scott Erickson
6057bd94b9 Refactored how the editor sets up its special nav through base.jade. 2014-04-17 11:27:20 -07:00
Scott Erickson
4c1143f026 Tweaked the versions history modal. 2014-04-17 11:22:33 -07:00
Scott Erickson
8a2b762446 Fixed a bug where opening a modal by data attributes would sometimes open it multiple times. 2014-04-17 11:12:09 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
Nick Winter
40367e701c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-17 10:12:26 -07:00
Nick Winter
eec1888b22 gzipping when in production but not going through Cloudflare. 2014-04-17 10:12:23 -07:00
Ting-Kuan
360e594f3d Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views 
Conflicts:
	server/commons/Handler.coffee
 2014-04-17 12:58:29 -04:00
ONion
498bb21280 Update zh-HANS.coffee 
more translation
 2014-04-17 13:27:43 +08:00
ONion
8724e23f1b Update zh-HANS.coffee 
add punctuation
 2014-04-17 12:57:44 +08:00
ONion
cf9cd1a228 Update zh-HANS.coffee 
Translate some
 2014-04-17 12:55:58 +08:00
dpen2000
a6ed7c9bff Fix players above the current player coming out in wrong order in original and simulators leaderboard 2014-04-16 18:20:59 -04:00
Michael Schmatz
e764277874 Merge pull request #850 from dpen2000/MoreSimulatorsLeaderboardImprovements2 
Implement rank column in simulators leaderboard
 2014-04-16 13:26:42 -07:00
Nick Winter
f95d814e90 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 12:57:31 -07:00
Nick Winter
f6242bbbac Fixed case on de-CH.coffee. 2014-04-16 12:28:39 -07:00
Nick Winter
1a4274a6db Broken German up into multiple country-specific Germans. 2014-04-16 12:28:15 -07:00
Glen De Cauwsemaecker
0bf4c81c91 Merge branch 'enGB' of https://github.com/edtrist/codecombat 2014-04-16 20:11:03 +02:00
Scott Erickson
02a7381fa9 Fixed the watch buttons for levels and components. 2014-04-16 11:02:40 -07:00
Nick Winter
cc9e200db8 Merge branch 'patch-2' of git://github.com/npani13/codecombat into npani13-patch-2 2014-04-16 11:01:28 -07:00
Nick Winter
d65699736f Fixed accidental hu.coffee truncation from #833. 2014-04-16 10:58:27 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
edtrist
0047835021 Added some specific en-GB spellings 2014-04-16 18:42:37 +01:00
Scott Erickson
f88e0ac0ab Set up patches for components. 2014-04-16 10:42:32 -07:00
Scott Erickson
9ed876d12a Some bug fixes to get Anya import to work. 2014-04-16 09:25:34 -07:00
dpen2000
62e2de6cee Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now 2014-04-16 17:07:25 +01:00
Scott Erickson
b9a978dd13 Fixed the colors tab view. 2014-04-16 08:44:04 -07:00
Scott Erickson
d5b0a83186 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 08:40:11 -07:00
Scott Erickson
bf7117d1c6 Merge pull request #854 from dpen2000/ShadowsIssue 
Fix #736 Invisible thangs still have shadows
 2014-04-16 08:38:59 -07:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Scott Erickson
476d153717 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 08:07:54 -07:00
Scott Erickson
94c4179417 Fixed some things that were keeping brunch from working. 2014-04-16 08:03:41 -07:00
Ting-Kuan
c53eb562a3 Remove debug msg. 2014-04-16 02:31:18 -04:00
Ting-Kuan
52a73ceae3 Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
edtrist
5aa1afbf7a Fix console.warning bug that prevents page from loading 2014-04-16 00:03:43 +01:00
dpen2000
eae2ba6913 Fix #736 Invisible thangs still have shadows 2014-04-15 18:32:29 -04:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
dpen2000
a74f89c30c Implement rank column in simulators leaderboard 2014-04-15 23:13:10 +01:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Glen De Cauwsemaecker
868dce91fa Merge branch 'patch-4' of https://github.com/kinez/codecombat 2014-04-16 01:47:16 +02:00
Scott Erickson
e06c3dbb0b Fixed the thangs tab view preventing the new patches view from handling clicks correctly. 2014-04-15 13:21:33 -07:00
Scott Erickson
1efabc3738 Fixed the fix. 2014-04-15 12:31:35 -07:00
Scott Erickson
69fba34f64 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-15 12:27:46 -07:00
Scott Erickson
b238ccaf27 Fixed the context-menu preventer in the level editor. 2014-04-15 12:27:35 -07:00
Scott Erickson
bb53e963b6 Removed a hack no longer needed. 2014-04-15 12:27:11 -07:00
Nick Winter
e49344bd87 A few job profile fixes and cleanup. 2014-04-15 10:45:54 -07:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Ting-Kuan
e58a5ee4b5 add debug msg. 2014-04-15 13:31:52 -04:00
Nick Winter
9194f842e6 Added some job description fields. 2014-04-15 09:28:19 -07:00
Nick Winter
2859db4279 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-15 08:39:22 -07:00
Nick Winter
03df078d5a Couple job profile fixes. 2014-04-15 08:39:18 -07:00
Scott Erickson
d65498998d Merge pull request #851 from JasperDhaene/master 
Added some schemas
 2014-04-15 08:18:03 -07:00
Inez KEMENES
844643454d Update hu.coffee 2014-04-15 17:03:17 +02:00
Nick Winter
04014ef2d7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 16:34:18 -07:00
Glen De Cauwsemaecker
a9806a6fa3 Added m website url to the about page 2014-04-15 03:12:54 +02:00
Glen De Cauwsemaecker
1354bc3d59 Merge https://github.com/codecombat/codecombat 2014-04-15 02:05:38 +02:00
Glen De Cauwsemaecker
891cf74a8a Resolved merge conflicts of Jasper's translations 2014-04-15 02:04:52 +02:00
Nick Winter
1239617bd4 Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp. 2014-04-14 16:34:11 -07:00
Nick Winter
954afad3f0 Fixed bug with job profile approval locale string tag. 2014-04-14 15:32:57 -07:00
Nick Winter
89ec5c900b Trying synchronous spritesheet building during level loading for speed. 2014-04-14 14:50:25 -07:00
Nick Winter
2b7e629c7f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 14:49:42 -07:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07:00
gosnat
ebddcb57a9 Update play_view.coffee 
Adding the "Find the Spy" level to the user created list.
 2014-04-14 15:43:23 -05:00
npani13
5d16f8e5ba Create de-ch.coffee 
Speechdata for Swissgerman (CH)
 2014-04-14 20:21:58 +02:00
Nick Winter
239b130d9c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 11:18:30 -07:00
Nick Winter
1794e5e040 Fixed #813 (sort of). 2014-04-14 11:18:02 -07:00
Scott Erickson
dd36cdd092 Fixed #836 2014-04-14 11:14:09 -07:00
Michael Schmatz
b40e4dca37 Simulation leaderboard aggregation framework and local fixes 2014-04-14 08:46:46 -07:00
Glen De Cauwsemaecker
df17021344 Merged conflicts and fixed line endings windows => unix 2014-04-14 10:12:23 +02:00
OlenaGapak
aea7b3ada0 Update uk.coffee 
Ukrainian localization
 2014-04-14 10:36:55 +03:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00
Nick Winter
fbc8b6ac35 Propagated new i18n tags. 2014-04-13 19:04:43 -07:00
林鑫
2bf654c8fa Translate some items under 'common','versions' and 'editor'. 2014-04-14 08:57:04 +08:00
Nick Winter
84884ca7d7 Merge pull request #837 from dpen2000/FixesTo831 
Additional fix on #831
 2014-04-13 17:07:37 -07:00
dpen2000
2345a7d8e8 Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code 2014-04-13 19:58:50 -04:00
Nick Winter
7fcff825a8 Fixed #310 by tweaking the styling to emphasize stroke over fill. 2014-04-13 16:42:21 -07:00
Nick Winter
7b14215339 Fixed footer background color on LevelView. 2014-04-13 16:06:47 -07:00
Nick Winter
af0b8aa5e2 A few fixes and cleanup for #831. 2014-04-13 15:28:16 -07:00
Nick Winter
3d945492b0 Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2 2014-04-13 14:48:45 -07:00
Nick Winter
a9725f2dc6 A bit of error handling. 2014-04-13 14:48:36 -07:00
Ting-Kuan
8e19d8b71f Change some resource loading logic to fit new SuperModel. 2014-04-13 13:29:43 -04:00
Inez KEMENES
094704f0c5 Update hu.coffee 2014-04-13 17:29:29 +02:00
Ting-Kuan
573a4ae847 Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
 2014-04-13 10:37:35 -04:00
Ting-Kuan
4979344ee5 Remove schema loading code. 2014-04-13 10:36:09 -04:00
Jasper D'haene
2cde44319c added some app schemas + missing schema stub 2014-04-13 16:05:11 +02:00
Jasper D'haene
4157447337 completed bus schemas 2014-04-13 15:23:24 +02:00
Aditya Raisinghani
ffd057899e Removed anon name collisions and reset anon user name if name is taken in interim. 2014-04-13 17:55:49 +05:30
Glen De Cauwsemaecker
0ce04b147d Merge pull request #824 from julycoolwind/patch-1 
Update zh-HANS.coffee
 2014-04-13 13:49:55 +02:00
JasperDhaene
3915ebc8b3 Updated some Bus schemas. 2014-04-13 12:31:12 +02:00
Jasper D'haene
9f1ef2bb8d updated Dutch locale + README 2014-04-13 12:05:45 +02:00
dpen2000
ec3c292b72 Implement simulators leaderboard 2014-04-13 02:35:58 +01:00
Nick Winter
9941607bcd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-12 14:53:15 -07:00
Nick Winter
08616def10 Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available. 2014-04-12 14:53:09 -07:00
Ting-Kuan
77c4c586dd Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/locale/en.coffee
 2014-04-12 17:13:06 -04:00
Ting-Kuan
508b570fea Merge branch 'master' into feature/loading-views 
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
 2014-04-12 17:07:30 -04:00
Alexei Nikitin
9879cffdbc Update RU.coffee 2014-04-13 01:06:42 +04:00
Ting-Kuan
0e08a4106b Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	scripts/windows/coco-dev-setup/batch/localisation/fr.coco
	scripts/windows/coco-dev-setup/batch/localisation/languages.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh.coco
	scripts/windows/coco-dev-setup/batch/localization/de.coco
	scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco
	scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
	scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
	scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
	scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
	scripts/windows/coco-dev-setup/batch/scripts/setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
	scripts/windows/coco-dev-setup/batch/setup.bat
	scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
	scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
 2014-04-12 16:52:14 -04:00
Ting-Kuan
7ae3bd5a60 Fix style and supermodel based on #815. 
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
 2014-04-12 16:29:49 -04:00
Nick Winter
8349578057 Fixed #786. 2014-04-12 12:35:45 -07:00
Scott Erickson
30f785f7cf Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
Scott Erickson
5a794306fe Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas 2014-04-12 08:53:24 -07:00
Scott Erickson
775821feec Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-12 08:52:50 -07:00
Scott Erickson
6eab5003f8 Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419 Fixed the level editor so you can save again. 2014-04-12 08:48:49 -07:00
julycoolwind
9078061af2 Update zh-HANS.coffee 
Translate items under editor.
 2014-04-12 17:56:56 +08:00
Aditya Raisinghani
e04787475c Rebased master to get updated schemas and added patch schema 2014-04-12 15:16:42 +05:30
Aditya Raisinghani
b932bf1e7c Deleted schemas from /server and modified files to point to /app/schemas 2014-04-12 14:45:59 +05:30
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Nick Winter
059b5e9b66 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 23:08:26 -07:00
Nick Winter
a4284e6209 Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization. 2014-04-11 23:07:48 -07:00
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632 Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
 2014-04-11 22:52:05 -07:00
Scott Erickson
308adec7c7 Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
 2014-04-11 22:52:00 -07:00
Scott Erickson
0eb74ab287 Added buttons for performing actions on patches. 2014-04-11 22:33:09 -07:00
Nick Winter
a792286161 Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more. 2014-04-11 22:30:28 -07:00
Scott Erickson
34bf484bf2 Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
Ting-Kuan
65a32a262d Before change dependency without name. 2014-04-12 00:03:56 -04:00
Nick Winter
fc9d30ccae Smarter fix for #810, since not all 24-character strings are like MongoDB ids. 2014-04-11 20:38:34 -07:00
Nick Winter
99ead5d193 #223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff. 2014-04-11 19:51:20 -07:00
Ting-Kuan
a6235842b6 Change populate model to accept resource name. 2014-04-11 22:35:20 -04:00
Nick Winter
f0aa5e1d5e Fixed #681 by removing full-screen button in Safari. 2014-04-11 18:19:52 -07:00
Nick Winter
99b430c1b4 Fixed #714 with a hack. 2014-04-11 17:55:47 -07:00
Nick Winter
91c2f0fa33 Fixed #715, and some misc cleanup. 2014-04-11 17:36:15 -07:00
Michael Schmatz
7ddd84248b Simulator fixes! 
Fixed memory bug with aggregation framework
 2014-04-11 17:11:57 -07:00
Nick Winter
97d4017869 Hacky way to get play background to fit with new loading image. 2014-04-11 16:15:26 -07:00
Scott Erickson
177dd2c8cd Set up Bootstrap 3 glyphicons. 2014-04-11 15:37:04 -07:00
Nick Winter
bbf26ecc9c Fixed lcoale line endings again. 2014-04-11 15:02:01 -07:00
Nick Winter
72d1a6fe5a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 14:59:19 -07:00
Nick Winter
1607790ea3 Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug. 2014-04-11 14:59:09 -07:00
George Saines
96f4f1a3d2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 14:51:25 -07:00
Glen De Cauwsemaecker
7a866981f7 Merge https://github.com/codecombat/codecombat 2014-04-12 01:30:40 +02:00
Glen De Cauwsemaecker
e9715f078f Fixed merge conflicts for Jasper's commits. 2014-04-12 01:28:25 +02:00
George Saines
722165b0ad adding ladder buttons and new load screen 2014-04-11 14:51:21 -07:00
Scott Erickson
bbb9fb7a64 Added a patches view. 2014-04-11 14:19:17 -07:00
Nick Winter
10bb17c38a Added getThangByID method to Thang. Handled a few error corner cases with the time popup. 2014-04-11 14:03:13 -07:00
Nick Winter
82b47f6c0f Added i18n for #809. 2014-04-11 13:37:39 -07:00
Nick Winter
b330e783bf Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons 2014-04-11 13:28:11 -07:00
Nick Winter
b2da399e29 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:20:14 -07:00
Nick Winter
5ccdf680db Updated all i18n tags. 2014-04-11 13:19:38 -07:00
Scott Erickson
0e26f317b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:18:28 -07:00
Scott Erickson
cce2fe3153 Removed an import that no longer exists. 2014-04-11 13:18:05 -07:00
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Scott Erickson
d11b6a5751 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:29 -07:00
Nick Winter
ca13324e99 Resolved merge conflicts. 2014-04-11 11:32:51 -07:00
Scott Erickson
e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader 
Conflicts:
	app/views/kinds/CocoView.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-11 11:19:16 -07:00
Ruben Vereecken
a07457acac Finished minor refactorings 2014-04-11 20:09:50 +02:00
Nick Winter
3751bf903e Merge pull request #806 from 1c7/master 
New features: chinese language version use Youku
 2014-04-11 10:33:10 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Nick Winter
26266963f4 Updated to jQuery 2.1. 2014-04-11 10:12:39 -07:00
Ruben Vereecken
f94dfeae6d Reached a steady state without bower component backbone mediator 2014-04-11 15:00:16 +02:00
Ruben Vereecken
fc8684967d Added initialization of the schema files 2014-04-11 14:37:08 +02:00
Ruben Vereecken
c2c0496883 Added schema stubs for about everything 2014-04-11 14:22:49 +02:00
Jasper D'haene
f2332b0694 Completed + reviewed latest Dutch locale changes 2014-04-11 09:11:12 +02:00
Jasper D'haene
23cb736d71 resolved merge conflicts 2014-04-11 08:05:11 +02:00
Nick Winter
a68f3efb99 Added specific job profile photo support. Improved right column design a bit. 2014-04-10 17:54:28 -07:00
Nick Winter
7a35a6248f Adding contact form for employers to contact candidates. 2014-04-10 14:59:32 -07:00
Michael Schmatz
e17fbdae73 Fixed common programmables not being saved 2014-04-10 14:08:20 -07:00
Ting-Kuan
a5e6496a7c Make resources as static class to avoid loading multiple times. 
Clean debug message.
 2014-04-10 16:59:08 -04:00
Scott Erickson
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128 Added some autocompleters for job profile Treema. Projects are now entirely links. 2014-04-10 11:58:51 -07:00
Michael Schmatz
a796d88967 Fixed tutorial modal for nonexistent tutorials 2014-04-10 11:42:22 -07:00
Scott Erickson
3c832d3707 Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks. 2014-04-10 11:13:33 -07:00
Michael Schmatz
42bf2996af Made Aether ignore variable hoisting 
See #813
 2014-04-10 10:36:32 -07:00
Scott Erickson
5629284c76 Added text diff library to delta view. 2014-04-10 10:24:14 -07:00
Scott Erickson
66d455285e Integrated the delta view into the save view for levels. 2014-04-09 19:07:44 -07:00
Nick Winter
26cebf7e7e Fixing some recruitment profile bugs. 2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
Scott Erickson
b15380047c Tweak to view. 2014-04-09 16:09:53 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Nick Winter
f17775cc10 Implemented George's jobs page design. 2014-04-09 13:14:52 -07:00
Aditya Raisinghani
b3804e7445 Minor corrections in format 2014-04-10 01:07:48 +05:30
Aditya Raisinghani
495d1be620 Added social buttons to Sign up modal 2014-04-10 01:01:30 +05:30
Ting-Kuan
3ea4d1677c able to load level editor. 2014-04-09 15:11:59 -04:00
Nick Winter
76054345d7 Fixed #805. 2014-04-09 09:04:59 -07:00
DjBRINE
7f4c251f43 Update ru.coffee 2014-04-09 03:57:40 -07:00
Alper ALIN
a2ebcc6433 Update tr.coffee 
a few changes
 2014-04-09 12:31:25 +03:00
1c7
56c18441e4 use youku for Chinese Version 2014-04-09 13:50:13 +08:00
Nick Winter
c226835ff2 Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00
Nick Winter
54cceb4311 Merge pull request #796 from adi2412/master 
Moved nanoscroller to bower components
 2014-04-08 15:59:28 -07:00
Nick Winter
3325c55c3f Fixed #759. 2014-04-08 14:58:34 -07:00
Ting-Kuan
354e3570e2 Merge branch 'feature/loading-views-ResourceManager' into feature/change-supermodel-to-general-resource-loader 2014-04-08 12:03:59 -04:00
Ting-Kuan
6729cfc292 First commit. 2014-04-08 12:03:03 -04:00
Glen De Cauwsemaecker
4bd058d1be Merge branch 'master' of https://github.com/1c7/codecombat 2014-04-08 16:25:29 +02:00
1c7
102c707fa9 Chinese Translate(zh-HANS.coffee) 2014-04-08 22:17:40 +08:00
Glen De Cauwsemaecker
e02087f4ed Merge pull request #798 from endrilian/patch-1 
Update uk.coffee
 2014-04-08 15:15:58 +02:00
Alexei Nikitin
33f26c3da0 Sync i18n 2014-04-08 12:23:16 +04:00
Glen De Cauwsemaecker
afbfa08416 fixed errors made in last contribution to the Turkish translation. 2014-04-08 09:06:11 +02:00
Alexei Nikitin
f8d6857633 Fix crlf 2014-04-08 10:50:58 +04:00
Nick Winter
b96bca8c18 Finished most of basic features for job profiles. 2014-04-07 17:58:02 -07:00
Alex
f798142b87 Update uk.coffee 2014-04-08 01:51:40 +03:00
Alexei Nikitin
e87c0c4b91 Work on thang tab 2014-04-08 02:49:27 +04:00
Nick Winter
9af6694054 More work on the job profiles. 2014-04-07 15:21:05 -07:00
Alper ALIN
51847c77ce Update tr.coffee 2014-04-08 00:40:25 +03:00
Alexei Nikitin
5f062ad25c Work on revert, save modal 2014-04-08 01:38:46 +04:00
Aditya Raisinghani
89670526ba Removed nanoscroller code from main.html 2014-04-08 03:08:16 +05:30
Aditya Raisinghani
7cc9d22254 Moved nanoscroller to bower components and related fixes. 2014-04-08 03:04:36 +05:30
Alexei Nikitin
d64690e8d9 Work on fork modal 2014-04-08 00:29:40 +04:00
Ting-Kuan
16fe28ff55 Add ResourceManager. 2014-04-07 16:27:50 -04:00
Alexei Nikitin
69406df0ed Work on create_new modal 2014-04-07 23:27:42 +04:00
Alexei Nikitin
630c44135a Work on wizard settings 2014-04-07 21:44:47 +04:00
Alexei Nikitin
9dab4b39e6 Update ru.coffee 2014-04-07 19:46:01 +04:00
OlenaGapak
780541ea58 Update uk.coffee 
ukrainian localization
 2014-04-07 15:35:09 +03:00
Nick Winter
1b79de0d86 Loading active candidate profiles from the database into a table for employers. 2014-04-06 17:01:56 -07:00
Nick Winter
4ae8927d09 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-06 15:08:27 -07:00
Nick Winter
d8999fb4f3 Got rid of the css of antiscroll in favor of nanoscroller. 2014-04-06 15:08:13 -07:00
Nick Winter
13f34341b2 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -07:00
Nick Winter
4070aab48a Merge pull request #777 from Digot/patch-1 
Update de.coffee
 2014-04-06 14:37:43 -07:00
Nick Winter
06d846ccbf Fixed bugs with some i18n from #793; copied new i18n tags over. 2014-04-06 14:35:40 -07:00
Nick Winter
8f1ef4e3bb Merge pull request #793 from kinez/patch-4 
Update hu.coffee
 2014-04-06 14:26:06 -07:00
Nick Winter
31a170bf67 Merge pull request #771 from kinez/patch-2 
Update hu.coffee
 2014-04-06 14:24:38 -07:00
Nick Winter
69ba442261 Merge pull request #770 from kinez/patch-1 
Update hu.coffee
 2014-04-06 14:24:32 -07:00
Ting-Kuan
ac51404d4c remove debug msg. 2014-04-06 16:40:06 -04:00
Ting-Kuan
20c624e0b8 Refactor CocoView. 2014-04-06 16:37:00 -04:00
Aditya Raisinghani
634ed82938 Fixed the background for spectate view 2014-04-07 01:00:35 +05:30
Ting-Kuan
d7fabd7133 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
 2014-04-06 13:43:59 -04:00
Inez KEMENES
7d3b7de8b4 Update hu.coffee 2014-04-06 16:49:00 +02:00
Glen De Cauwsemaecker
3feb694756 Merge pull request #788 from 1c7/master 
Chinese translate for windows automatic tool
 2014-04-06 12:17:01 +02:00
Glen De Cauwsemaecker
9ea8282b89 Merge pull request #790 from zloysmiertniy/patch-1 
Update es-419.coffee
 2014-04-06 12:12:44 +02:00
1c7
13cfba91a8 add myself into diplomat.jade 2014-04-06 11:56:25 +08:00
Vindurrin
7a8f3849a6 Update es-ES.coffee 
Line #231, “Atajos de teclado” means “Keyboard Shortcuts” — let me know if this isn’t close enough to what is meant by “Key Bindings”: the reason that I chose this phrase is because I don’t know of an exact or approximate translation of “key bindings” into Spanish, but several other software platforms have used the phrase “atajos de teclado” to express this meaning.
 2014-04-05 21:09:10 -04:00
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Evelyn Solorzano
af887fd4b8 Update es-419.coffee 
Translated some commented lines up to play: category
 2014-04-05 18:21:05 -05:00
Scott Erickson
8fe568d3a4 Fixed schema loading. 2014-04-05 11:48:21 -07:00
Ting-Kuan
4e41676219 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-05 10:51:40 -04:00
1c7
51142627d4 translate app/locale/zh-HANS.coffee 2014-04-05 14:34:21 +08:00
Scott Erickson
abaf32fc7a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-04 14:57:55 -07:00
Michael Schmatz
2411269f2b Added rank/number of sessions text 2014-04-04 14:55:55 -07:00
Michael Schmatz
0684bcff9c Improved styling on graphs 2014-04-04 14:22:30 -07:00
Scott Erickson
2093049f5c Fixed a bug with the profile view caused by the new page loading system. 2014-04-04 13:59:40 -07:00
Michael Schmatz
06f164525f Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
 2014-04-04 13:48:39 -07:00
Michael Schmatz
7019bb6dea Added score histogram to ladder tab 2014-04-04 13:38:36 -07:00
Ting-Kuan
2f5f65314d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-04 15:35:44 -04:00
Ting-Kuan
de9337820b Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/assets/main.html
	scripts/windows/coco-dev-setup/batch/config/finished_header.coco
	scripts/windows/coco-dev-setup/batch/config/github_header.coco
	scripts/windows/coco-dev-setup/batch/config/install_header.coco
	scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
	scripts/windows/coco-dev-setup/batch/config/readme.coco
	scripts/windows/coco-dev-setup/batch/localisation/de.coco
	scripts/windows/coco-dev-setup/batch/localisation/fr.coco
	scripts/windows/coco-dev-setup/batch/localisation/languages.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh.coco
	scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
	scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
	scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
	scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
	scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
	scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
	scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
	scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
	scripts/windows/coco-dev-setup/batch/scripts/setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
	scripts/windows/coco-dev-setup/batch/setup.bat
 2014-04-04 14:32:42 -04:00
Scott Erickson
1971ddcefb Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time. 2014-04-04 10:12:22 -07:00
Alexei Nikitin
63f72cb454 Update ru.coffee 2014-04-04 10:01:03 -07:00
Ting-Kuan
fe27756b06 Pull from upsatream. 2014-04-04 12:52:22 -04:00
Vindurrin
79d19d61db Update pt-BR.coffee 2014-04-04 00:14:28 -04:00
Scott Erickson
978c84bc89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0 Set up a new loading/progress system for views. 2014-04-03 18:43:29 -07:00
Nick Winter
ef8388dac2 Merge pull request #781 from Darredevil/patch-6 
Update ro.coffee
 2014-04-03 16:38:04 -07:00
Nick Winter
9a70abb104 Don't need to explicitly skip Mobile Artillery's next level now. 2014-04-03 16:37:24 -07:00
Nick Winter
255cef83fb Fixed #738. 2014-04-03 16:16:53 -07:00
Darredevil
df3b51e5bd Update ro.coffee 2014-04-04 02:15:50 +03:00
Nick Winter
62f91d14b0 Merged. 2014-04-03 16:06:32 -07:00
Nick Winter
0ad4cc7c04 Merge branch 'patch-1' of git://github.com/Vindurrin/codecombat into Vindurrin-patch-1 2014-04-03 16:05:27 -07:00
Michael Schmatz
9bb109dd7d First iteration of mobile styling! 2014-04-03 15:10:24 -07:00
Vindurrin
d58c70b456 Update es-ES.coffee 2014-04-03 16:11:09 -04:00
Digot
eca934d6a5 Update de.coffee 2014-04-03 21:58:12 +02:00
Aditya Raisinghani
1c3117836f Shifted nanoscroller to vendor. 2014-04-04 00:13:09 +05:30
Michael Schmatz
c434325ec0 Fixed line endings and locale error 2014-04-03 10:53:29 -07:00
Michael Schmatz
75b278b333 Fixed table overflow, added wrapper for histogram 2014-04-03 09:57:35 -07:00
Glen De Cauwsemaecker
12cf298467 Merge conflicts master 2014-04-03 17:42:08 +02:00
Glen De Cauwsemaecker
a2ac89094a Merge conflicts: ms.coffee 2014-04-03 17:38:46 +02:00
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Nick Winter
52de546727 Merged. 2014-04-02 15:09:40 -07:00
Nick Winter
6a51bd6837 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-02 14:43:09 -07:00
Nick Winter
670f94cc22 Fixed #418, no more print/save dialogues evaaarr. 2014-04-02 14:42:34 -07:00
Aditya Raisinghani
44979c074d Integrated nanoscroller. 2014-04-03 03:10:06 +05:30
Scott Erickson
0a78368217 Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it. 2014-04-02 13:12:24 -07:00
Inez KEMENES
70d42b6eae Update hu.coffee 2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c Update hu.coffee 2014-04-02 15:24:26 +02:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
ba3c4af536 Fixed last piece of #673. 2014-04-01 10:51:03 -07:00
Nick Winter
7807fdbbc6 Merged pt-PT locale conflicts. 2014-04-01 10:41:40 -07:00
Nick Winter
99c4704e1f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-01 10:31:42 -07:00
Nick Winter
bfa71d01ff Merged. 2014-04-01 10:31:22 -07:00
Nick Winter
477545d50d Merge pull request #763 from OlenaGapak/patch-1 
Update uk.coffee
 2014-04-01 10:26:55 -07:00
Nick Winter
b316a3e078 Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing 2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2 Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master 2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408 added two programming quotes 2014-04-01 17:16:35 +02:00
swapnesh
497563bc0a Added more names for #53 2014-04-01 17:50:33 +05:30
OlenaGapak
1799310261 Update uk.coffee 
ukrainian localization
 2014-04-01 14:59:46 +03:00
jaudhaen
be9edb74af updated dutch locale 2014-04-01 09:26:42 +02:00
Ting-Kuan
e076440d1b Move Noty to vendor folder. 2014-04-01 02:41:04 -04:00
Ting-Kuan
085d181ed3 Use Noty to produce warning message while adding component with not added system. 2014-04-01 00:47:50 -04:00
Michael Schmatz
f084588adf Merge pull request #758 from dkundel/master 
update de.coffee
 2014-03-31 16:06:38 -07:00
Nick Winter
0bd8321345 Updated Mondo Bizarro i18n comma. 2014-03-31 16:02:56 -07:00
Dominik Kundel
a9b225ec03 fixed indentation de.coffee 2014-04-01 00:55:45 +02:00
Nick Winter
8c013c1192 Fixed 101: added level completion status to /play. 2014-03-31 15:48:22 -07:00
Dominik Kundel
069a7a41e4 update de.coffee 2014-04-01 00:34:51 +02:00
Michael Schmatz
b021b65ee1 Copied new i18n tags to all languages 2014-03-31 15:31:38 -07:00
Alexei Nikitin
0473ce2df1 Update ru.coffee 2014-03-31 15:11:56 -07:00
Alexei Nikitin
6ff8d0fbe3 Update en.coffee 2014-03-31 15:10:51 -07:00
Bia41
898018ac91 Updated pt-PT locale 
Added some translations for European Portuguese.
 2014-03-31 22:53:08 +01:00
Jazzis18
c3e4b4d279 Update ru.coffee 
Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.
 2014-04-01 03:34:45 +06:00
Nick Winter
a319e183b6 Fixed a little mistake with user signup. 2014-03-31 14:02:15 -07:00
Nick Winter
382422829e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-31 13:56:17 -07:00
Nick Winter
389323953b Fixed #180. 2014-03-31 13:56:13 -07:00
Alexei Nikitin
4c3e8671a3 Update ru.coffee 2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f Update en.coffee 2014-03-31 13:32:11 -07:00
Nick Winter
d8a194f895 Actually using loading screen template. 2014-03-31 13:21:08 -07:00
Nick Winter
0af05176f6 Re-added a minor fix that got lost. 2014-03-31 13:00:40 -07:00
Nick Winter
a9a0a55331 Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master 2014-03-31 12:42:53 -07:00
Dominik Kundel
725a8bc2d9 updated locales 2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856 Update ru.coffee 2014-03-31 11:32:01 -07:00
Alexei Nikitin
aeddb64f90 Update base.jade 2014-03-31 11:09:44 -07:00
tmrdja
dfe6bce351 Added contextmenu 
Added contextmenu
 2014-03-31 18:33:14 +02:00
Bia41
167ee90a70 #673 Replaced .once with @listenToOnce 
Replaced .once with @listenToOnce on CocoModel, as requested on Issue #673
 2014-03-31 05:02:13 +01:00
Nick Winter
cb27124285 Fixed #135. 2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions. 2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1 Merged 2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d Added Thang names 2014-03-30 20:43:48 +01:00
tmrdja
f8de6162d1 Added contextmenu 
Added contextmenu with Delete and Duplicate button
 2014-03-30 19:38:54 +02:00
tmrdja
470a79e6b0 Added contextmenu 2014-03-30 19:33:21 +02:00
Nick Winter
6bff295d2e Linking up Prabh's Coin Mania level. 2014-03-29 18:04:29 -07:00
Nick Winter
1b92654a44 Merged. 2014-03-29 17:45:01 -07:00
Nick Winter
54f4e8d1e9 Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor 2014-03-29 17:38:14 -07:00
Nick Winter
a79fe37ca1 Merged; made a couple tweaks. 2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88 Update ru.coffee 2014-03-29 17:28:44 -07:00
Dominik Maier
78c18b03b6 Merged new tips 2014-03-30 00:48:31 +01:00
Dominik Maier
fb607d06fa Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670 2014-03-30 00:38:45 +01:00
Nick Winter
c58a1682f4 Fixed #519 for real, I think. 2014-03-29 14:09:45 -07:00
Nick Winter
e08265a725 Merge pull request #730 from Darredevil/master 
Added setGoalState
 2014-03-29 14:04:33 -07:00
Nick Winter
b6e0f9037f Merge pull request #731 from herby/locale 
some more Slovak
 2014-03-29 14:02:38 -07:00
Nick Winter
bd0ecd76e5 Fixed SearchView projections. 2014-03-29 13:22:21 -07:00
Ting-Kuan
130d322d60 Move error_view's dom to template file. 2014-03-28 23:51:15 -04:00
Herbert Vojčík
f0298f4596 some more Slovak 2014-03-29 03:18:45 +01:00
Darredevil
c4de6ef996 Added setGoalState 2014-03-29 03:54:16 +02:00
Darredevil
0a969bb103 Added setGoalState 2014-03-29 03:53:19 +02:00
Darredevil
e060d4b73d Added setGoalState 2014-03-29 03:52:02 +02:00
Nick Winter
5bcaf2c746 Fixed #64 (I hope; let's UX test.) 2014-03-28 17:06:21 -07:00
Nick Winter
cf81d51a89 Fixed #46. 2014-03-28 15:23:12 -07:00
Nick Winter
5e30ab091b Updated i18n tags. 2014-03-28 13:19:17 -07:00
Nick Winter
13d5536eb3 Merged. 2014-03-28 13:08:30 -07:00
Jasper D'haene
7f6510823a merged 2014-03-28 20:59:05 +01:00
Nick Winter
c4a56dc9a5 Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11. 2014-03-28 12:22:53 -07:00
Jasper D'haene
fa6ef5aa49 added authors to quotations 2014-03-28 19:58:33 +01:00
Nick Winter
62f2fe80c3 Updated CoordinateDisplay styles; fixed #10. 2014-03-28 11:55:24 -07:00
Nick Winter
ff7e2d5d47 Fixed #728. 2014-03-28 11:02:23 -07:00
Jasper D'haene
cd3019296c added tips/quotes to loading bar 2014-03-28 19:01:31 +01:00
Nick Winter
62867534a7 Fixed #727. 2014-03-28 09:52:07 -07:00
Scott Erickson
84cb0bfd0d Merge pull request #713 from Sighne/master 
Migrate .on, .once - ThangTypeEditView
 2014-03-28 09:34:29 -07:00
Michael Schmatz
20c54400b8 Merge pull request #722 from dc55028/master 
fr.coffee: fixed typos and translated glen_description
 2014-03-28 09:16:35 -07:00
Michael Schmatz
e0f50d04a8 Uncomment translations 2014-03-28 09:13:08 -07:00
Dominik Kundel
267d033997 initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline 2014-03-28 14:42:08 +01:00
Dominik Kundel
35a16b47ff Merge remote-tracking branch 'upstream/master' 2014-03-28 14:37:14 +01:00
Dom
15590252f1 Update fr.coffee 
fixed other typos and translated a definition
 2014-03-28 00:38:31 +01:00
Arni Mc.Frag
0388376d99 Update ca.coffee 2014-03-28 00:29:54 +01:00
Dom
6f02748311 Update fr.coffee 
fixed typos
 2014-03-28 00:29:31 +01:00
Nick Winter
5763cdca87 Merge pull request #718 from Darredevil/patch-4 
Added funny tip
 2014-03-27 15:19:28 -07:00
Darredevil
a91e067549 Added funny tip 2014-03-28 00:13:40 +02:00
Darredevil
f4a81f43a2 Added funny tip 2014-03-28 00:13:30 +02:00
Nick Winter
b0b37aa9d8 Made play/pause and scrubber look even more disabled when disabled. 2014-03-27 15:07:37 -07:00
Nick Winter
2677751dc5 Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog 2014-03-27 14:58:06 -07:00
Nick Winter
31119f402a Cleaned up readyToRank logic a bit. 2014-03-27 14:55:45 -07:00
Nick Winter
1cab83236c Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master 2014-03-27 14:22:44 -07:00
Nick Winter
7ab5adcdac Merge pull request #700 from pedrofgsrj/loginAutocomplete 
Fixed issue #597
 2014-03-27 14:20:58 -07:00
Nick Winter
127c4a4e0f Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging. 2014-03-27 13:36:33 -07:00
Laura Lebbah
5d894ea053 Migrate .on, .once - ThangTypeEditView 2014-03-27 21:33:59 +01:00
Nick Winter
c076bb1da8 Tweaking some styles; perhaps fixed #6. 2014-03-27 13:15:22 -07:00
Ting-Kuan
6012a3ce9e Show error message when editor fails to initiate. 2014-03-27 14:35:20 -04:00
AKeeper
d21fbbfe4d Update ru.coffee 2014-03-27 16:48:30 +02:00
Aditya Raisinghani
deb3ddeece Longer modals are now scrollable. 2014-03-27 12:31:29 +05:30
Pedro Sobrinho
38bf27020a Fixed issue #597 2014-03-26 20:55:03 -04:00
Alexei Nikitin
780743a40d Update ru.coffee 2014-03-26 15:57:16 -07:00
Alexei Nikitin
2ffc2efaa5 Update ru.coffee 2014-03-26 15:42:03 -07:00
Jayant Jain
648df5eb41 Updated rank my game check, fixes #666 2014-03-27 03:36:27 +05:30
Scott Erickson
37beb1bc6b Made the ladder tab better able to handle unloaded gplus and facebook apis. 2014-03-26 14:53:09 -07:00
Scott Erickson
092810eba2 Fixed a small error in the migration. 2014-03-26 14:44:11 -07:00
Scott Erickson
8001e58848 Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:39:01 -07:00
Scott Erickson
fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:29:16 -07:00
Scott Erickson
462d365ce0 Sorted the friend sessions a bit. 2014-03-26 14:22:04 -07:00
Scott Erickson
781b33092c Added a google plus connect button. 2014-03-26 14:19:05 -07:00
Scott Erickson
132b22f14a Got the gplus friends loading now. 2014-03-26 13:50:01 -07:00
Nick Winter
544070e578 Fix for infinite loop fix. 2014-03-26 12:34:45 -07:00
Nick Winter
515b8723a3 Simulator handles more errors. 2014-03-26 12:12:43 -07:00
Nick Winter
ac222c27e8 "Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 12:12:18 -07:00
Scott Erickson
ad70a7f0c6 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master 2014-03-26 11:48:47 -07:00
Scott Erickson
3b8cba291d Removed some unnecessary callbacks. 2014-03-26 11:48:40 -07:00
Nick Winter
127eb3cef6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:32:49 -07:00
Nick Winter
aec4669780 Merge pull request #687 from kgy01/master 
Hide arrow's shadow if buried
 2014-03-26 11:27:11 -07:00
Nick Winter
cab343b0b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14 Added infinite loop handling to Simulator. 2014-03-26 11:25:05 -07:00
Jayant Jain
71294f14b2 Updates fb and g+ functions to be called on api load, fixes #695 2014-03-26 22:03:20 +05:30
Glen De Cauwsemaecker
5825b2676b Added myself to the signature. 2014-03-26 04:46:49 +01:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/de.coffee
	bower.json
 2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603 Merge pull request #688 from 1c7/master 
Translate some word from English -> Chinese.  (zh-HANS.coffee)
 2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc Translate some word from English -> Chinese. (zh-HANS.coffee) 2014-03-25 23:15:17 +08:00
kgy01
29aad01697 hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition 2014-03-25 08:48:26 -04:00
kgy01
a420064bc1 hide spear's shadow if buried 2014-03-25 08:31:38 -04:00
Glen De Cauwsemaecker
305e2f6d68 Merge pull request #685 from JasperDhaene/master 
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
 2014-03-25 13:27:13 +01:00
kgy01
3cc422a281 Merge remote-tracking branch 'upstream/master' 2014-03-25 08:10:30 -04:00
kgy01
c48863fae6 Hide arrow's shadow if buried 2014-03-25 08:06:37 -04:00
Aditya Raisinghani
6208e8e324 Additional fixes for double scrollbars of modals. 2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9 Fixed issue with two scroll bars appearing. 2014-03-25 16:36:24 +05:30
JasperDhaene
748081b4a7 Added myself to the diplomate list, fixed typos and made corrections to Dutch locale 2014-03-25 09:25:20 +01:00
Shrihari
aee18523b0 Fix for #506 2014-03-25 13:28:22 +05:30
Darredevil
4bb1ee5c74 Update ro.coffee 2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat 2014-03-25 01:13:30 +01:00
Scott Erickson
bda499b561 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 14:43:08 -07:00
Scott Erickson
2c329a256f Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties. 2014-03-24 14:42:56 -07:00
Nick Winter
97613f12b4 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 14:38:35 -07:00
Nick Winter
a42e33764e Merged, fixed. 2014-03-24 14:38:18 -07:00
Scott Erickson
53118984ff Undid a listenTo on a jQuery elem. 2014-03-24 14:29:53 -07:00
Scott Erickson
57f6f4d244 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 14:27:28 -07:00
Scott Erickson
e9b3db2eb9 Fixed destroy to not break stopListening, which uses off. 2014-03-24 14:27:10 -07:00
Ruben Vereecken
a3f65ace7a Created differentation between nl-BE and nl-NL 2014-03-24 22:21:34 +01:00
Nick Winter
e6e216fcd3 Mergred Diplomats. 2014-03-24 14:20:40 -07:00
Ruben Vereecken
3f3eeab02a Fixed NaN in ladder in case a player has never played before 2014-03-24 19:46:50 +01:00
Michael Schmatz
83bfc28a9e Partially refactored scoring callback pyramid of hell 2014-03-24 10:58:43 -07:00
Scott Erickson
f55cef5ced Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents 2014-03-24 10:38:57 -07:00
Shrihari
093cc66fa0 Reverted few wrong migrations 2014-03-24 22:56:32 +05:30
Shrihari
f085b0d319 Refactored cast-button events 2014-03-24 22:41:27 +05:30
Shrihari
0160538b44 More migrations 2014-03-24 22:28:34 +05:30
Scott Erickson
bf039ed485 Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema) 
Select dependents when a extant component is selected.
 2014-03-24 09:31:27 -07:00
Scott Erickson
6de62154bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 09:28:06 -07:00
Shrihari
69ee16f77f Fixed wrong migrations 2014-03-24 21:37:09 +05:30
Nick Winter
92c87dc4ad Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view 2014-03-24 08:28:48 -07:00
Ting-Kuan
e9118142db Fix issue #662 2014-03-24 10:54:59 -04:00
Shrihari
5845125b43 Migrate .on, .once - Fixed a small error 2014-03-24 12:32:29 +05:30
Shrihari
67f5270bfc Migrate .on, .once - Batch 1 2014-03-24 12:23:41 +05:30
Akaza Akari
3e4d7d745a Script-based movement for all CocoSprites for #140 2014-03-23 23:19:18 -07:00
Nick Winter
5852b87aa3 A little longer debounce is better. 2014-03-23 18:55:44 -07:00
Nick Winter
808762c229 Merge pull request #663 from domenukk/master 
fixes codecombat/codecombat#655
 2014-03-23 18:11:40 -07:00
Dominik Maier
f66e210c73 regarding codecombat/codecombat#655 debounce debounces. 2014-03-24 01:18:36 +01:00
Nick Winter
dbeb3d445b Give focus back to spell view on palette click. 2014-03-23 16:48:30 -07:00
Dominik Maier
dcbd55a864 regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works. 2014-03-24 00:47:41 +01:00
Nick Winter
4a47c5b517 Dead Thangs sink down a bit in the layer order. 2014-03-23 16:21:36 -07:00
Nick Winter
656b34fc34 Fixed comment gutter icons jumping all over the place. 2014-03-23 16:00:23 -07:00
Glen De Cauwsemaecker
d6178aa2cc Fixed a small error 2014-03-24 00:46:44 +01:00
Glen De Cauwsemaecker
724592601c Merge branch 'master' of github.com:JasperDhaene/codecombat 2014-03-24 00:45:09 +01:00
Dominik Maier
0dee3d042f fixes codecombat/codecombat#655 completely 
Removes asynchronous name checking, though, if it ever worked.
 2014-03-23 23:04:39 +01:00
JasperDhaene
58601e95f6 finished review of nl.coffee 2014-03-23 22:54:30 +01:00
Nick Winter
9fbd008f59 Merge branch 'ItsLastDay-arrow' 2014-03-23 14:15:24 -07:00
Nick Winter
d85dd9f62c Bringing in #664, but only when maximizesArc is on. 2014-03-23 14:15:06 -07:00
Mikhail Koltsov
13338afe3d Now absolutely done scaling (#46) 
also commented math's out.
 2014-03-23 23:51:46 +04:00
Mikhail Koltsov
446726acc9 done rotating, looks good in Zone of Danger (#46) 2014-03-23 22:13:07 +04:00
Dominik Maier
459a1f9e48 fixes codecombat/codecombat#655 2014-03-23 18:41:15 +01:00
Nick Winter
111973e1c8 Maybe this will be better - more on #650. 2014-03-23 10:29:08 -07:00
Nick Winter
7ba959045a A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added. 2014-03-23 10:00:16 -07:00
Scott Erickson
8ca5f23749 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-23 09:30:46 -07:00
JasperDhaene
e5d2c07ff1 general revision until line 254 2014-03-23 17:30:45 +01:00
Scott Erickson
72b88a3ee9 First pass on setting up gplus friends on the ladder page. 2014-03-23 09:30:01 -07:00
Mikhail Koltsov
edeeb3c3eb some work on arrows 2014-03-23 20:21:11 +04:00
Nick Winter
1789723d4d Merge pull request #650 from dpen2000/Issue390 
Fix #390
 2014-03-23 09:14:41 -07:00
Nick Winter
f8f5f718bb Merge pull request #660 from dpen2000/SimulatorTextFix 
Fix "Simulating game between" line to only have one "and"
 2014-03-23 09:13:20 -07:00
Nick Winter
4c1dc0d7f9 Merge pull request #661 from M-r-A/patch-2 
Update ru.coffee
 2014-03-23 09:11:52 -07:00
Nick Winter
90832f6015 Merge pull request #653 from 3rr3s3v3n/patch-1 
Translating Multiplayer lines
 2014-03-23 09:11:11 -07:00
JasperDhaene
dde626e759 Update nl.coffee - small revisions/additions 2014-03-23 16:57:33 +01:00
Alexei Nikitin
20e111d307 Update ru.coffee 2014-03-23 07:30:14 -07:00
dpen2000
970552a6d6 Fix "Simulating game between" line to only have one "and" 2014-03-23 13:35:24 +00:00
3rr3s3v3n
f4de280cee Translating more Lines. 
Password remains password in Italian, such as VS.
 2014-03-23 11:53:39 +01:00
3rr3s3v3n
5ef6f6974f Translation actived! 
I removed the # mark from the lines I've translated yesterday.
 2014-03-23 11:39:35 +01:00
Nick Winter
fd2d9b6833 Merge pull request #658 from ItsLastDay/editor_tweaks 
Added tooltip in level-editor (issue #174)
 2014-03-22 17:30:52 -07:00
Nick Winter
487b2aae9b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 14:28:25 -07:00
Nick Winter
eec46dcb48 Don't try to draw a grid if it's not going to work (no lands). 2014-03-22 14:28:18 -07:00
Mikhail Koltsov
2316773cb1 removed Label requierment 2014-03-22 23:25:18 +04:00
Mikhail Koltsov
36cfdfda46 Added labels above selected thangs in level-editor (issue #174) 2014-03-22 23:17:15 +04:00
Michael Schmatz
c3b745b271 Added Catalan language file 2014-03-22 11:30:58 -07:00
Nick Winter
76ec738213 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 10:54:38 -07:00
Nick Winter
5e311cdefa Fixed css for IE warnings. 2014-03-22 10:54:35 -07:00
Nick Winter
96fe1e42f0 Merge pull request #657 from adi2412/reloadCode 
Made changes to reloadAllCode to reload only the team's code.
 2014-03-22 10:36:17 -07:00
Aditya Raisinghani
bee5d528ec Made changes to reloadAllCode to reload only the team's code. 2014-03-22 22:56:41 +05:30
Mikhail Koltsov
baf8adcc74 added nothing 2014-03-22 20:50:50 +04:00
Nick Winter
29e7b8e5c1 Fixed mail to correctly capture the matches. 2014-03-22 09:48:36 -07:00
Michael Schmatz
5141873725 Added resimulateAllSessions method 2014-03-22 09:07:01 -07:00
Nick Winter
808cf9280b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 08:53:02 -07:00
Nick Winter
d289ca825e Fixed Simulator to actually use protectAPI. 2014-03-22 08:52:47 -07:00
3rr3s3v3n
6b660dade2 Translating Multiplayer lines 
Ok, I tried to translate in italian some lines ;) hope this helps.
 2014-03-22 10:38:32 +01:00
therealbond
7d03c2e520 Merge branch 'master' of https://github.com/therealbond/codecombat 2014-03-22 02:05:19 -04:00
therealbond
b2c500369b Added more names for #53 2014-03-22 01:56:32 -04:00
Scott Erickson
0df09f7f35 Fixed an ever-reloading bug. 2014-03-21 21:11:51 -07:00
Scott Erickson
2cdfbf1c48 Merged conflicts. 2014-03-21 19:56:25 -07:00
Scott Erickson
6445924598 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
	app/views/play/ladder/ladder_tab.coffee
 2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce Added facebook friends to the ladder page. 2014-03-21 19:50:54 -07:00
dpen2000
6c151acaa7 Optimizations of markToRevert: Switch to using $.extend instead of _.cloneDeep and only when type is not a "ThangType" 2014-03-22 02:22:08 +00:00
dpen2000
60ca991c58 Fix #390 
The issue here was configSchema is an attribute within attributes and so revertAttributes and attributes get the same instance of it when clone is used. Later calls to _.equals fail when only configSchema has changed.
 2014-03-22 01:34:24 +00:00
Nick Winter
b91f3200c2 Merge pull request #649 from jayant1992/master 
Fixes #641, the list of levels in editor reloads properly upon changing ...
 2014-03-21 17:46:10 -07:00
Nick Winter
e101fb04eb For #648: Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627. 2014-03-21 17:42:13 -07:00
Nick Winter
5abe0746ba Merge pull request #648 from dpen2000/lastLevel 
Implement saving lastLevel in database re #627
 2014-03-21 17:27:31 -07:00
Jayant Jain
860c3a34d3 Fixes #641, the list of levels in editor reloads properly upon changing language 2014-03-22 05:51:44 +05:30
Nick Winter
dfcdcaa678 No email addresses for non-admins on CLA submissions. 2014-03-21 17:20:47 -07:00
Nick Winter
4bc1e6805b Improved page title. Fixed Twitter card image. 2014-03-21 17:06:51 -07:00
dpen2000
a35d0cb651 Implement saving lastLevel in database re #627 2014-03-22 00:01:32 +00:00
Nick Winter
f0640dd2e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1 Adding CLAs view. 2014-03-21 16:22:47 -07:00
Nick Winter
893f446b0a Merge pull request #645 from dpen2000/autocastDelay 
Save autocastDelay as a setting on User re #627
 2014-03-21 16:01:00 -07:00
dpen2000
b1b0579cb3 Save autocastDelay as a setting on User re #627 2014-03-21 22:46:14 +00:00
dpen2000
6363c40fe2 Update cla.jade 
p -> a. Using html syntax to avoid linking full stop.
 2014-03-21 21:59:31 +00:00
Ting-Kuan
0db309f526 Select dependents when a extant component is selected. 2014-03-21 12:19:47 -04:00
Sérgio Batista
ee4858f725 Update pt-PT.coffee 
Some new additions and minor fixes to old ones
 2014-03-21 16:39:47 +01:00
Nick Winter
b30bf35945 Fixed #638, I hope. 2014-03-21 08:09:08 -07:00
Nick Winter
a3dadd6a40 Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks 2014-03-21 07:25:33 -07:00
Mikhail Koltsov
096c59b6cf fix some assymetry 2014-03-21 15:42:29 +04:00
Mikhail Koltsov
af18e7a27e Thang editor: components tab finally looks good and does not overlay other tabs 2014-03-21 15:40:32 +04:00
Mikhail Koltsov
45b87ed38e finally got it right 2014-03-21 13:45:56 +04:00
Muhammad Nuzaihan Bin Kamal Luddin
eaa9443969 grammar mistake 2014-03-21 17:10:03 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
966e99510e Probably too little commits at one time. more grammar fixes 2014-03-21 16:45:34 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cb8c146029 grammar fixes 2014-03-21 16:41:23 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d876f975e6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-21 16:33:18 +08:00
Mikhail Koltsov
0ece400a18 Level editor: selecting a thang now moves the scroll in existant-thang list 2014-03-21 11:54:55 +04:00
David Hallberg Jönsson
75138cb67b Update sv.coffee 
Updated some existing translations, mostly grammar corrections.
 2014-03-21 08:40:37 +01:00
Muhammad Nuzaihan Bin Kamal Luddin
4804065c94 Comment out WIP. Uncomment missed line. 2014-03-21 15:07:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6f0915e7ce Messed up with string interpolation 2014-03-21 15:03:40 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9a44c3fd31 Some important information 2014-03-21 14:53:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
b288e53a89 Put 'parti' in blockquotes so highlight difference from 'political party' 2014-03-21 14:47:11 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d71e13977f More grammar issues.... sigh 2014-03-21 14:40:13 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
e51c3502c1 some grammar fixes 2014-03-21 14:36:42 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d84bee3c3e Fix malay grammatical errors 2014-03-21 14:27:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9ec615f58c Correct some punctuations and add new translations 2014-03-21 14:25:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
3b18a3f24e Errors in Daftar masuk 2014-03-21 13:24:09 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
ffde1595da Some small details on accounts 2014-03-21 13:14:50 +08:00
Nick Winter
424390ae84 Moved antiscroll init; disabled it for now because of bugginess. 2014-03-20 22:00:34 -07:00
Karthig
f52dced0ce - initial implementation of antiscroll, squashed 2014-03-20 21:39:03 -07:00
Nick Winter
89d720dc30 Uncommented multiplayer modal i18n section for Polish. 2014-03-20 21:29:03 -07:00
Nick Winter
0c6a22e26d Merge pull request #631 from TigroTigro/patch-3 
Update pl.coffee
 2014-03-20 21:27:53 -07:00
Nick Winter
53f39e9cc7 Pointed locale at correct file. 2014-03-20 21:25:20 -07:00
Nick Winter
f55654130e Merge branch 'master' of git://github.com/muhammadn/codecombat into muhammadn-master 2014-03-20 21:23:12 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
3047d5c696 Minor changes 2014-03-21 10:47:46 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6e32b79921 and to dan 2014-03-21 10:46:27 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cf4f8dc9b7 Add some must-have information in translation 2014-03-21 10:45:11 +08:00
Nick Winter
bba85745f7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-20 19:18:49 -07:00
Nick Winter
9e4908ade2 A couple ladder tweaks. 2014-03-20 19:18:46 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
282fd50b3c Major additions to MS locale in Codecombat 2014-03-21 09:58:52 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6eccb459cf Additions to Bahasa Malaysia 2014-03-21 09:28:39 +08:00
J Phani Mahesh
edc90c4598 Fix login popup being displayed under trailer. (#596) 2014-03-21 06:44:21 +05:30
Scott Erickson
29b51c470c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-20 17:03:19 -07:00
Scott Erickson
431d3054b6 Set up Facebook to work when working on localhost. 2014-03-20 17:02:25 -07:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07:00
Scott Erickson
6e9daf59c9 Merge remote-tracking branch 'origin/master' 2014-03-20 14:40:29 -07:00
Glen De Cauwsemaecker
18cf143bfb Corrected some errors in the swedisch local. file 2014-03-20 23:03:19 +01:00
Scott Erickson
22555790b5 Set up a trimmed down leaderboard showing just top players and your rank. 2014-03-20 14:40:17 -07:00
TigroTigro
a8716000a4 Update pl.coffee 2014-03-20 22:16:26 +01:00
iamhj
d0be8b36b6 Update sv.coffee 
Added Swedish text to all the places where there wasn't any.
 2014-03-20 20:13:54 +01:00
Scott Erickson
dbbf9ce8b3 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master 
Conflicts:
	app/styles/editor/level/thangs_tab.sass
	app/templates/editor/level/thangs_tab.jade
	app/views/editor/level/thangs_tab_view.coffee
 2014-03-20 11:22:23 -07:00
Nick Winter
2f3c0b0cc6 Need updated Aether. 2014-03-20 10:43:24 -07:00
Nick Winter
81a459dc02 Merged and fixed indentation to two spaces instead of three. 2014-03-20 08:25:12 -07:00
OlenaGapak
d43c05b558 Update uk.coffee 
ukrainian localization. spelling fixes, new translation
 2014-03-20 15:05:58 +02:00
Mikhail Koltsov
a6523719e4 Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks 
Conflicts:
	app/locale/ru.coffee
 2014-03-20 09:07:11 +04:00
Nick Winter
1ce67710c5 Merged. 2014-03-19 19:26:17 -07:00
kvasnyk
802f0069b7 Polish language translations bug fixes. 2014-03-20 03:03:03 +01:00
Nick Winter
b7e8f2ecb5 Merge pull request #605 from kvasnyk/master 
Fix for #272 bug.
 2014-03-19 18:31:20 -07:00
Nick Winter
ff1e64e1f6 Less useless ladder refresh requests. 2014-03-19 18:26:38 -07:00
Nick Winter
9713f7d142 Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow 2014-03-19 18:01:49 -07:00
Nick Winter
097c6bc2cd Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed. 2014-03-19 17:25:56 -07:00
Nick Winter
87f16f2550 Merge branch 'Shrihari-range-radii' 2014-03-19 17:17:05 -07:00
Nick Winter
fec8e34a78 Merged. 2014-03-19 17:16:48 -07:00
Scott Erickson
954a3ac4cb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-19 17:11:53 -07:00
Glen De Cauwsemaecker
225fd6d355 Fixed a spelling mistake I made yesterday. 2014-03-20 02:02:40 +01:00
Glen De Cauwsemaecker
dfbba38dd3 Merge github.com:codecombat/codecombat 2014-03-20 01:55:12 +01:00
Scott Erickson
b6c9b6276c Tweaked logging of sprite building. 2014-03-19 17:11:45 -07:00
Glen De Cauwsemaecker
71a13a5670 Adding missing translations for the Dutch local file 2014-03-20 00:33:50 +01:00
Nick Winter
b580203a7d Merge pull request #618 from fusspawn/master 
Added Function.Prototype.bind shim to world worker
 2014-03-19 16:18:25 -07:00
Fusspawn
b10b9fcb4e Added Function.Prototype.bind shim to world worker to enable running on headless browsers 2014-03-19 23:12:35 +00:00
Glen De Cauwsemaecker
e2a7c15776 Merge conflicts resolved from Ruben's branch 2014-03-20 00:05:41 +01:00
OverProgram
f6e5ceb1ef More Updates fore he.coffee 
Here is some more translate to hebrow.
 2014-03-19 20:18:30 +02:00
Nick Winter
777420ebd8 Merge pull request #614 from M-r-A/patch-2 
Update ru.coffee
 2014-03-19 09:28:39 -07:00
Nick Winter
6a5c24cc69 Merge pull request #616 from OverProgram/patch-1 
Update he.coffee
 2014-03-19 09:28:12 -07:00
Nick Winter
9edd5e751d Merge pull request #615 from MartinDelille/translation 
first multiplayer translations
 2014-03-19 09:26:29 -07:00
OverProgram
00d17c6d2f Update he.coffee 2014-03-19 16:13:41 +02:00
Alexei Nikitin
5b2a219ca5 Update ru.coffee 2014-03-19 03:42:38 -07:00
Alexei Nikitin
4a119cd6b0 Update ru.coffee 2014-03-19 02:53:13 -07:00
Glen De Cauwsemaecker
c98ee7314a Applied Vietnamese translations made by Nguyen Thi Thien An via email. 2014-03-19 03:24:16 +01:00
Glen De Cauwsemaecker
91ff1bd4c6 Translated glen_description in dutch (Nederlands). 2014-03-19 02:49:55 +01:00
Glen De Cauwsemaecker
a523d74b2d Added the glen_description i18n tag to all languages. 2014-03-19 02:47:25 +01:00
Glen De Cauwsemaecker
a9fc1cb35a Added a newline 2014-03-19 02:34:23 +01:00
Glen De Cauwsemaecker
9f391408e7 Merge branch 'translations' of github.com:iulianR/codecombat into iulianR-translations 2014-03-19 02:27:55 +01:00
Glen De Cauwsemaecker
eab52f45e5 Applied proofread of Julian. 2014-03-19 02:21:45 +01:00
Glen De Cauwsemaecker
f7777ef501 Merge branch 'patch-2' of github.com:feugy/codecombat 2014-03-19 02:16:54 +01:00
Glen De Cauwsemaecker
5dc89529ca Described myself. 2014-03-19 02:10:58 +01:00
iulianR
8735ed20d4 Updated ro.coffee 2014-03-19 02:06:02 +02:00
iulianR
bfac03a73c Rearranged play_view.cofee for consistency 2014-03-19 01:57:21 +02:00
Mikhail Koltsov
dfe5cd8f41 Polished ru.coffee a bit 2014-03-19 03:29:53 +04:00
Nick Winter
96bc752747 Merge pull request #603 from feugy/patch-1 
Add some french translations
 2014-03-18 15:55:11 -07:00
Mikhail Koltsov
c9a08a0b25 thang editor: added i18n binding to 'Save' button 2014-03-19 01:43:27 +04:00
Martin Delille
93ec4f94fc first translation shot 2014-03-18 22:37:10 +01:00
Mikhail Koltsov
62a1701063 even better positioning 2014-03-19 01:26:41 +04:00
Mikhail Koltsov
1cc3e79db9 fixed thang editor appearance: components view was overlapping with tabs. 
Now looks neat, but still unclickable.
 2014-03-19 01:21:11 +04:00
Scott Erickson
74e068af0b Fixed some bugs from the migration from _.cloneDeep to $.extend 2014-03-18 13:47:51 -07:00
Scott Erickson
a461a14d6e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-18 13:08:34 -07:00
Scott Erickson
37a9b7f319 Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
Jayant Jain
80f53d2c6b Adds search bar for adding thangs in level editor 2014-03-19 00:41:03 +05:30
Nick Winter
358d7fa181 Dont' need to load sessions, too. 2014-03-18 11:52:23 -07:00
Nick Winter
4355813d69 Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them. 2014-03-18 11:26:15 -07:00
Shrihari
ee76e41c78 Range radii - renamed few variales for clarity 2014-03-18 18:33:39 +05:30
Shrihari
8f5e8efce0 Range radii - Some cleanup 2014-03-18 18:22:26 +05:30
Shrihari
ea24ae2fd8 Range radii - Some cleanup 2014-03-18 18:13:38 +05:30
Shrihari
22af95e7b9 Added 4 fallback colors for extra ranges 2014-03-18 18:06:44 +05:30
Shrihari
b283757315 Refactored buildRadius() to work with any range radius 2014-03-18 17:39:16 +05:30
Ruben Vereecken
04465eb72c Wrapped up locale files 2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c Merged in old locale 2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333 Ladder i18n refactoring 2014-03-18 10:18:38 +01:00
kvasnyk
5216432bf9 Fix for #272 bug. 2014-03-18 05:47:53 +01:00
Dominik Kundel
084ef5563b Merge remote-tracking branch 'upstream/master' 2014-03-18 01:10:43 +01:00
Damien
65f148974c Add to french diplomats list 2014-03-17 23:39:36 +01:00
Damien
71d248afef Add some french translations 2014-03-17 23:38:41 +01:00
Nick Winter
a58faa1acd Merged. 2014-03-17 14:07:37 -07:00
Nick Winter
2dd762a0d7 Merge pull request #600 from M-r-A/patch-2 
Update ru.coffee
 2014-03-17 14:01:48 -07:00
Nick Winter
2098bef39e Fixed quoting problem. 2014-03-17 13:58:40 -07:00
Nick Winter
21ca74d76f Merge branch 'patch-koreanlocale' of git://github.com/walkingtospace/codecombat into walkingtospace-patch-koreanlocale 2014-03-17 13:58:11 -07:00
Mikhail Koltsov
97f9e548e2 added perspectivizion for arrows (issue #46) 2014-03-18 00:40:37 +04:00
Björn Kimminich
4ea7d0e9b2 Update de.coffee 2014-03-17 21:36:53 +01:00
Björn Kimminich
b0a361abb2 Update de.coffee 2014-03-17 20:32:57 +01:00
Alexei Nikitin
4860e2e7a1 Update ru.coffee 2014-03-17 12:00:28 -07:00
fist0512
9d75fa5588 Added korean locale and modified unnatural translation 2014-03-18 03:49:15 +09:00
armaldio
2eb84252f3 Update fr.coffee 2014-03-17 19:47:44 +01:00
Dominik Kundel
c55b608886 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/templates/play/level/modal/editor_config.jade
 2014-03-17 19:39:38 +01:00
Nick Winter
bf323d59f2 Merge pull request #594 from ahmed80dz/patch-1 
Update ar.coffee
 2014-03-17 11:09:17 -07:00
Cassio Cardoso
970d5e46a2 Update pt-BR.coffee 
Add multiplayer translation
 2014-03-17 14:47:22 -03:00
ounis ahmed
aab91057f2 Update ar.coffee 2014-03-17 10:12:24 -07:00
BonnieBBS
9a9480ea83 Update zh-HANS.coffee 
Some words about "Ambassador" have been translated. :D
 2014-03-18 00:18:09 +08:00
Nick Winter
5fef126672 Merge pull request #592 from ImmortalJoker/patch-2 
Update ru.coffee
 2014-03-17 08:51:18 -07:00
Nick Winter
794b1472f6 Merge pull request #587 from cassiocardoso/patch-1 
Update diplomat.jade
 2014-03-17 08:50:45 -07:00
Nick Winter
df2c1b443e Merge pull request #589 from yangxuan8282/patch-2 
Update diplomat.jade
 2014-03-17 08:49:30 -07:00
Nick Winter
98025f1ae2 Merge pull request #588 from yangxuan8282/patch-1 
Update zh-HANS.coffee
 2014-03-17 08:49:21 -07:00
Nick Winter
763f08a05e Merge pull request #590 from ImmortalJoker/patch-1 
Update uk.coffee
 2014-03-17 08:49:09 -07:00
Krasnov Ehor
c9d916fb7a Update ru.coffee 2014-03-17 17:49:07 +02:00
Krasnov Ehor
172ad1d17a Update uk.coffee 2014-03-17 17:40:51 +02:00
BonnieBBS
abf90cf8f5 Update zh.coffee 
Translated some of the words. :D
 2014-03-17 23:38:13 +08:00
yangxuan8282
4b2bcc283f Update diplomat.jade 
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
 2014-03-17 23:32:20 +08:00
yangxuan8282
43ecfec28f Update zh-HANS.coffee 
a little change,make grammar more idiomatic
 2014-03-17 23:27:38 +08:00
Cassio Cardoso
2917255193 Update diplomat.jade 
Add my username in brazilian portuguese diplomats list.
 2014-03-17 11:51:55 -03:00
Scott Erickson
87b225b061 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-17 07:34:02 -07:00
Scott Erickson
564d267463 Removed a TODO. 2014-03-17 07:33:53 -07:00
Aditya Raisinghani
b5bef94eb3 Fixed issue with video on multiplayer page modal 2014-03-17 19:52:03 +05:30
Randi Katrine Hillerøe
5cecbeea40 Update diplomat.jade 
Added my name to the contributors list.
 2014-03-17 13:59:48 +01:00
Randi Katrine Hillerøe
a936964434 Update da.coffee 
Added a few of the missing translations.
 2014-03-17 13:55:58 +01:00
Nick Winter
6c2a78c060 Show videos in HD if possible. Use ready state on level loader. 2014-03-17 05:52:19 -07:00
Nick Winter
3d56cc4393 Merge pull request #584 from batista/patch-1 
Update pt-PT.coffee for multiplayer
 2014-03-17 05:26:57 -07:00
Sérgio Batista
641fa482d8 Update pt-PT.coffee for multiplayer 2014-03-17 13:13:45 +01:00
bbeasmile
03f309a441 Update hu.coffee 2014-03-17 13:01:17 +01:00
Nick Winter
36a90de7f9 Last bits of #546. 2014-03-17 04:44:00 -07:00
Nick Winter
1397b63e50 Merged. 2014-03-17 04:37:54 -07:00
pouyio
f5e3e717f1 Update diplomat.jade 
added a spanish translator
 2014-03-17 12:33:35 +01:00
Nick Winter
fe56e82348 Merge pull request #581 from pouyio/patch-1 
Update es.coffee
 2014-03-17 04:31:24 -07:00
Nick Winter
833c310a91 Merge pull request #579 from ItsLastDay/popover 
Fix for issue #496
 2014-03-17 04:30:57 -07:00
pouyio
9092a7961d Update es.coffee 2014-03-17 12:30:34 +01:00
Maximilian Bachhuber
5903dc1ae2 Update de.coffee 2014-03-17 12:27:46 +01:00
Nick Winter
287bf0398e Embedded new video in multiplayer launch modal. 2014-03-17 03:18:13 -07:00
Mikhail Koltsov
df3739517d fixed issue #496 2014-03-17 12:28:49 +04:00
Scott Erickson
db4ae0cd2d Made some tips show up more rarely. 2014-03-17 00:12:11 -07:00
Scott Erickson
7555dce172 Tweaked the loading page progress bar. 2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f More tweaks to the video. 2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0 Added a border to the home view video. 2014-03-16 22:46:57 -07:00
Nick Winter
65c53a9e43 Check anonymous for clicking link. 2014-03-16 22:17:56 -07:00
Scott Erickson
5ddd2b9109 Added a few more tips. 2014-03-16 22:11:21 -07:00
Scott Erickson
8eed311aea Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 22:01:41 -07:00
Scott Erickson
dc4252a94d Moved the tips into the level loader screen and gave them i18n. 2014-03-16 22:01:21 -07:00
Nick Winter
566c9e6c9d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:48:37 -07:00
Nick Winter
b51f51f636 Fix for no Camera for creating Marks in the Thang Editor. 2014-03-16 21:48:28 -07:00
Scott Erickson
5a8d1b0a2b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:43:21 -07:00
Scott Erickson
de34896a9a Playback is now disabled during casting. Also cleaned out some remaining hover logic. 2014-03-16 21:43:14 -07:00
Nick Winter
af57e88a1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:33:50 -07:00
Nick Winter
f02f4e77d0 Improved next game routing and speed. Hid that catastrophically dangerous reset all games button. 2014-03-16 21:33:46 -07:00
Scott Erickson
661c60ec50 Merge branch 'adi2412-simulator-teardown' 2014-03-16 21:14:56 -07:00
Scott Erickson
e88c79681d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:04:44 -07:00
Scott Erickson
c663bd74cf Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click. 2014-03-16 21:04:36 -07:00
Nick Winter
3dd47ec98e Propagated new multiplayer_launch i18n. 2014-03-16 20:56:48 -07:00
Nick Winter
fc93ede891 Merged some merging in the locales. 2014-03-16 20:54:34 -07:00
Nick Winter
cfab3061f5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 20:52:29 -07:00
Nick Winter
680c12707a Merge pull request #567 from 2xG/patch-1 
Update es-419.coffee
 2014-03-16 20:51:58 -07:00
Nick Winter
f3a76da47c Added i18n for multiplayer launch modal. 2014-03-16 20:50:49 -07:00
Nick Winter
ffb9ec2908 Merged. 2014-03-16 20:36:18 -07:00
Scott Erickson
17af4cec0c Slight tweak. 2014-03-16 20:36:02 -07:00
Scott Erickson
dc32add6cb Merge branch 'simulator-teardown' of https://github.com/adi2412/codecombat into adi2412-simulator-teardown 2014-03-16 20:34:03 -07:00
Nick Winter
9a64fb5dac Work on /multiplayer modal. 2014-03-16 20:32:24 -07:00
Scott Erickson
296a7584a6 Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play. 2014-03-16 20:28:02 -07:00
Scott Erickson
a3df986567 Added a tween for size changes. 2014-03-16 19:27:48 -07:00
honam bang
41d26f5709 Refactoring ModalView Templates 2014-03-17 11:00:25 +09:00
Scott Erickson
957fdd22e6 Tweaked the rank button to be much larger in the my matches tab. 2014-03-16 18:48:56 -07:00
Dominik Kundel
6a983dcb8c changed name of event triggered when config is changed and introduced new event when language is changed 2014-03-17 02:14:04 +01:00
Scott Erickson
5cb42fa92c Tweaked the video on the home page. 2014-03-16 18:10:39 -07:00
Scott Erickson
150077ab22 Removed the new button from the home view. 2014-03-16 17:48:16 -07:00
Darredevil
123de3a997 Update ro.coffee 2014-03-17 02:44:29 +02:00
Scott Erickson
e430a6c2de Added multiplayer launch view. 2014-03-16 17:33:57 -07:00
Scott Erickson
3fa0124d7e Removed wizard loading code from home view, for now anyway. 2014-03-16 17:21:17 -07:00
Scott Erickson
dd8ea18186 Merge remote-tracking branch 'origin/master' 2014-03-16 17:13:18 -07:00
Scott Erickson
f23e3285cd Fixed a bug. 2014-03-16 17:12:55 -07:00
Nick Winter
b550708113 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 17:07:24 -07:00
Nick Winter
6db33fd967 Brawlwood protectAPI on! 2014-03-16 17:07:10 -07:00
Scott Erickson
209a1a3563 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 17:00:12 -07:00
Scott Erickson
eee8fbba2c New level page with new artwork. 2014-03-16 16:59:48 -07:00
Nick Winter
1f1802dc38 A couple tweaks for #577. 2014-03-16 16:04:17 -07:00
Nick Winter
753952e519 Merge pull request #577 from IngridMorstrad/templates 
Templates
 2014-03-16 16:00:24 -07:00
IngridMorstrad
dadf0dab86 refactored docs and reload 2014-03-17 02:57:15 +05:30
Nick Winter
aa4f1baf73 Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions. 2014-03-16 13:23:01 -07:00
IngridMorstrad
57f24932fb Removed redundant code for close button 2014-03-17 01:10:55 +05:30
IngridMorstrad
52115876bb Refactored docs.jade to use the base template 2014-03-17 01:03:27 +05:30
honam bang
29a88ee128 Merge remote-tracking branch 'codecombat/master' 2014-03-17 02:20:44 +09:00
Nick Winter
125ffa9f43 Merged 2014-03-16 10:06:47 -07:00
honam bang
3940ba23b8 Merge branch 'master' of https://github.com/walkingtospace/codecombat 2014-03-17 01:47:16 +09:00
honam bang
34be8917cb Fixes #546 2014-03-17 01:41:19 +09:00
Nick Winter
28b049d8a4 Adjusted some i19n commenting. 2014-03-16 09:10:17 -07:00
Nick Winter
f266db7aaa Merge pull request #573 from AlessioPaternoster/master 
#01 Updated Italian Local
 2014-03-16 09:08:40 -07:00
IngridMorstrad
8d9a8aaf73 Change victory.jade to use the base template 2014-03-16 21:16:00 +05:30
honam bang
b42bf45ddb Added korean locale 2014-03-16 23:40:10 +09:00
Alessio Paternoster
dd2a55928e Updated Italian Local 2014-03-16 13:53:57 +01:00
Aditya Raisinghani
226ae29caf Added CocoClass as superclass to Simulator and updated destroy method. 2014-03-16 13:37:17 +05:30
2xG
6efe87982c Update es-419.coffee 
small fix2
 2014-03-16 01:10:29 -05:00
2xG
9107937f75 Update es-419.coffee 
small fix
 2014-03-16 01:09:31 -05:00
2xG
3765ffa87d Update es-419.coffee 
Few translated strings
 2014-03-15 22:10:11 -05:00
Nick Winter
2e2c9459d8 Even better-looking loading background. 2014-03-15 16:06:35 -07:00
Nick Winter
4e14ff3b11 Merge pull request #565 from jayant1992/master 
Bugfix for play, usability improvement for editor.
 2014-03-15 15:32:17 -07:00
Nick Winter
38bfe222a0 Merge pull request #564 from Shrihari/range-radii 
Added radii marks for voiceRange, visualRange and attackRange
 2014-03-15 15:31:12 -07:00
Dominik Kundel
ce6533de59 changing ace edit mode based on setting 2014-03-15 23:14:57 +01:00
George Saines
417ff1e48d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 15:12:09 -07:00
Jayant Jain
93bb2d0893 Restricts wizard to level bounds when moving around 2014-03-16 03:11:55 +05:30
Jayant Jain
91515b1cea Clicking a thang in the left list automatically pans to the sprite on the editor map 2014-03-16 03:11:40 +05:30
Shrihari
005a91cec2 Moved createMarks() to setupSprite() to optimize loading 2014-03-16 02:48:19 +05:30
Dominik Kundel
46133ab85d added select statement for programming language 2014-03-15 22:00:29 +01:00
Shrihari
d186ae0a15 Added radii marks for voiceRange, visualRange and attackRange 2014-03-16 02:02:17 +05:30
TigroTigro
19d3f4af76 Update pl.coffee 
Translated one tag which I earlier missed, edited the more_about_X tags to make them shorter and solve the unneeded line splitting which occured where they were displayed.
 2014-03-15 21:29:44 +01:00
TigroTigro
30fb039675 Update pl.coffee 
Translated new tags
 2014-03-15 20:35:18 +01:00
Nick Winter
b210423419 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 12:31:43 -07:00
Nick Winter
ca75cc4a1a Fixed #405 with a sledgehammer--just loading all Components before loading level editor. 2014-03-15 12:31:39 -07:00
Michael Schmatz
efba8a0654 Fixed control bar leaderboard button for #429 2014-03-15 11:34:59 -07:00
Nick Winter
e97bff6a3c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 11:34:53 -07:00
Nick Winter
4b9c7a3784 Fixed bug with sprites being offset incorrectly when starting with an action not in their ThangType. 2014-03-15 11:31:12 -07:00
Michael Schmatz
6dcbaddbbd Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-15 09:20:44 -07:00
Michael Schmatz
2c6e667bb7 Added API for queue messages count 2014-03-15 09:20:13 -07:00
honam bang
e63e787a30 Removed spaces for coding convention 2014-03-15 08:30:47 -07:00
bang honam
70f3ca8f8e Added a line for coding convention 2014-03-15 08:30:37 -07:00
Nick Winter
7b1f8d1114 Merge pull request #547 from jayant1992/master 
Improved panning and zooming for editor
 2014-03-15 08:05:02 -07:00
Nick Winter
95cd3782a1 Oops, don't keep sending ladder updates just to me. 2014-03-15 07:45:44 -07:00
Nick Winter
8276dbf2d1 Merge branch 'loading-view' 2014-03-14 19:44:33 -07:00
Nick Winter
b2efb1bba5 More work on the loading view. 2014-03-14 19:44:19 -07:00
Nick Winter
fc7d403785 Fixed two bugs with destroying sprites. 2014-03-14 17:15:07 -07:00
Nick Winter
efd0d82dea Working on new loading view design. 2014-03-14 17:06:08 -07:00
Michael Schmatz
357b73be93 Fixed bug in next game button, fixed wizard positions 2014-03-14 16:14:35 -07:00
George Saines
c00c7ed56b adding the new website background images 2014-03-14 15:24:36 -07:00
Michael Schmatz
075ea23be9 Fixed random sessions fetching 2014-03-14 12:54:54 -07:00
Scott Erickson
39ed6c3a43 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-14 11:58:42 -07:00
Scott Erickson
af8008596a Made editing thangs in the level editor not so slow by avoiding calling level.serialize. 2014-03-14 11:58:29 -07:00
Michael Schmatz
71aa6cc2c6 Added random session pair choosing 
Due to a bug I cannot test this immediately
 2014-03-14 11:30:06 -07:00
Jayant Jain
ece932595c Enables drag-panning for editor and region chooser 2014-03-14 23:57:00 +05:30
Jayant Jain
d8418f7bb2 Fixes issue where panning occurs upon mouse scroll at max/min zoom 2014-03-14 23:57:00 +05:30
Nick Winter
c0e966a08c Propagated new editor i18n tags. 2014-03-14 10:24:07 -07:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
3c0b496033 Fix for if aceConfig doesn't exist yet. 2014-03-14 07:46:36 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master 
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
 2014-03-14 07:35:11 -07:00
Dominik Kundel
190469d794 removed unnecessary comment 2014-03-14 03:28:20 +01:00
Dominik Kundel
0392f630cc including i18n support for new editor config and minor styling changes 2014-03-14 03:26:53 +01:00
Nick Winter
6e9945040f Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now. 2014-03-13 19:20:22 -07:00
Dominik Kundel
7e955c72b8 apply config to editor 2014-03-14 02:49:58 +01:00
Nick Winter
795bd8f63b Moved Glen from Archmages to About. 2014-03-13 18:27:08 -07:00
Dominik Kundel
8a5aeb6227 save editor config to database 2014-03-14 02:09:11 +01:00
Nick Winter
42a8862fa9 Merge pull request #541 from dkundel/master 
Easy use of coordinates as discussed in #10 and minor fixes
 2014-03-13 18:05:04 -07:00
Darredevil
88659aa191 Update ro.coffee 
Check line 234
Also need alternative for the word "ladder" in this context, there is translation that makes sense(will try to see how other games translate it and come back)
 2014-03-14 03:00:32 +02:00
Nick Winter
8b572f0647 Using isThang instead of instanceof Thang. 2014-03-13 17:59:17 -07:00
Dominik Kundel
6f2a04c5c0 added new editor config modal 2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32 added button to access new modal for editor config 2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b highlight lines after insertion 2014-03-14 00:52:18 +01:00
Nick Winter
8ccd12866e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:46:53 -07:00
Scott Erickson
8431fd1e57 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:45:41 -07:00
Scott Erickson
abd50b9495 Fixed the new build queue system for levels where there are multiple builders for a single thang type. 2014-03-13 15:45:24 -07:00
Nick Winter
8554de7c4b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:35:31 -07:00
Nick Winter
e2d2e96cf5 Fixed several bugs with Thang selection and the SpellView and HUD. 2014-03-13 15:35:28 -07:00
Michael Schmatz
3262ad81f2 Merge branch 'master' of github.com:codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-13 15:24:04 -07:00
Michael Schmatz
7aa506e58c Various changes to spectate view 2014-03-13 15:22:35 -07:00
Scott Erickson
b2e9768127 Set up a build queue for async sprite sheet building, which lessens blocking the main thread. 2014-03-13 13:25:03 -07:00
Scott Erickson
c238b49f52 Fixed initial wizard position. 2014-03-13 11:07:08 -07:00
Nick Winter
485b179f5d Added Opponent i18n placeholder to other locales, and restored some new placeholders to pl.coffee. 2014-03-13 10:33:20 -07:00
Nick Winter
2b41efe466 Resolved some merge conflicts. 2014-03-13 10:32:18 -07:00
Nick Winter
9d8b8e7395 Probably too mean to tell users that their password is wrong three times, so just once will do. 2014-03-13 10:27:32 -07:00
TigroTigro
206af3184d Update diplomat.jade 2014-03-13 18:01:52 +01:00
Björn Kimminich
055241c994 Update de.coffee 2014-03-13 17:57:27 +01:00
TigroTigro
94e7e6185b Update pl.coffee 2014-03-13 17:04:22 +01:00
TigroTigro
13fce18d5f Update pl.coffee 2014-03-13 17:03:07 +01:00
Nick Winter
c8103154a9 Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n. 2014-03-13 09:02:19 -07:00
Nick Winter
2d848b4cce Merged some conflicts. 2014-03-13 08:39:53 -07:00
Nick Winter
4ad0fba860 Merge pull request #537 from jayant1992/master 
UI and UX improvements to editor
 2014-03-13 07:07:13 -07:00
Nick Winter
0be08574fc Merge pull request #536 from bkimminich/master 
Added/fixed some German translations
 2014-03-13 07:05:17 -07:00
Nick Winter
3e50e0c58c Merge pull request #535 from M-r-A/patch-1 
Update i18n
 2014-03-13 07:04:45 -07:00
Nick Winter
10e4bc737a Merge pull request #534 from Shrihari/fix-grid-toggle 
Fix Grid Toggle consistency
 2014-03-13 06:50:56 -07:00
Björn Kimminich
87ddd10dd4 Update diplomat.jade 2014-03-13 14:19:59 +01:00
Björn Kimminich
e87031afa0 Update de.coffee 2014-03-13 14:18:57 +01:00
Jayant Jain
17debf49e6 Implements smoother panning around the map for keyboard controls 2014-03-13 18:32:23 +05:30
Alexei Nikitin
e7c85d76b9 Update ru.coffee 2014-03-13 03:24:33 -07:00
Alexei Nikitin
3b04cd1e19 Update en.coffee 2014-03-13 03:24:26 -07:00
Alexei Nikitin
f844a4f630 Update ru.coffee 2014-03-13 03:07:55 -07:00
Shrihari
fb7f64ddb0 Grid toggle consistent with the button and the shortcut 2014-03-13 15:21:00 +05:30
Shrihari
d230c267a3 Fixed a locale issue which was making brunch fail 2014-03-13 15:00:00 +05:30
Jayant Jain
3c1ebc25ca Sass changes for footer and search in editor 2014-03-13 13:30:30 +05:30
Jayant Jain
c24469e86b Minor UI updates to level editor's thang tab 2014-03-13 12:19:51 +05:30
Nick Winter
8be2f8c455 Used i18n script to add new i18n tags to other languages. 2014-03-12 21:21:23 -07:00
Nick Winter
19a30bb1c7 Saved some commented-out translations. 2014-03-12 21:16:16 -07:00
Nick Winter
28d56f526e Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces. 2014-03-12 20:59:19 -07:00
Dominik Kundel
5c97fea363 fixed issue of multiple insertions due to multiple event handlers 2014-03-13 03:38:34 +01:00
Dominik Kundel
c01d29907d try to achieve higher contrast between background and 'executing' line 2014-03-13 03:08:28 +01:00
Dominik Kundel
60214abb41 Change cursor if moving on map with pressed 'shift' 2014-03-13 02:50:09 +01:00
Michael Schmatz
6eda2d24a5 Commented out line 133 2014-03-12 17:52:05 -07:00
Michael Schmatz
aea9e9d1a6 Spectate view is nearing completion 2014-03-12 17:51:13 -07:00
Dominik Kundel
8990b9d194 paste coordiante if click + shift 2014-03-13 01:50:59 +01:00
Ruben Vereecken
96ec29d80e Added the finishing touch. Solved issue #15 2014-03-13 01:07:47 +01:00
Ruben Vereecken
3856ac597f Finished perfecting i18n 2014-03-13 00:47:08 +01:00
Nick Winter
7e16821743 Updates for /play levels list. 2014-03-12 16:41:09 -07:00
TigroTigro
d0c5beafd0 Update pl.coffee 2014-03-13 00:24:11 +01:00
Nick Winter
1250207113 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 16:03:39 -07:00
Nick Winter
ac8f12ef20 I don't think we need this template any more. 2014-03-12 16:03:32 -07:00
Nick Winter
d2fd36c15f Merge pull request #531 from Darredevil/patch-1 
Update ro.coffee
 2014-03-12 16:02:18 -07:00
Nick Winter
ddea7d1531 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 15:44:33 -07:00
Scott Erickson
660e9ceca5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 15:12:22 -07:00
Darredevil
4e4474c819 Update ro.coffee 
miniupdate , testing if github works
 2014-03-13 00:00:23 +02:00
Ruben Vereecken
dbc37b177a Working on test. 2014-03-12 22:48:27 +01:00
Nick Winter
cf663f6775 Merge pull request #530 from rubenvereecken/i18n 
Added i18n tags for new Ladder views
 2014-03-12 14:03:44 -07:00
Ruben Vereecken
8c7c49fdbb Reverted work done on wrong branch 2014-03-12 21:54:54 +01:00
Scott Erickson
68c5144838 Added AoE circles. 2014-03-12 13:49:36 -07:00
Scott Erickson
19184a88b0 Fixed showing the guide at the beginning of the level.... more. 2014-03-12 13:49:28 -07:00
Ruben Vereecken
6d3525afe6 Finished NL translations for ladder 2014-03-12 21:47:10 +01:00
Ruben Vereecken
b845961218 Clean up 2014-03-12 21:25:14 +01:00
Ruben Vereecken
f4637251be Added i18n to play modal 2014-03-12 21:23:25 +01:00
Ruben Vereecken
ca271fedd6 Added i18n to my matches tab 2014-03-12 21:13:01 +01:00
Ruben Vereecken
9f5c0f03be Added i18n to ladder_tab 2014-03-12 20:51:38 +01:00
Ruben Vereecken
c2e81db200 Added i18n to ladder.jade 2014-03-12 20:46:25 +01:00
Nick Winter
1ca9b2d3e5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 12:45:46 -07:00
Scott Erickson
ed60f5932f Fixed showing the guide at the beginning of the level. 2014-03-12 12:44:06 -07:00
Scott Erickson
853a80dd23 Fixed loading marks so they are positioned correctly when they load and the world is paused. 2014-03-12 12:43:51 -07:00
TigroTigro
19f458b193 Update pl.coffee 2014-03-12 20:38:12 +01:00
Ruben Vereecken
76110423c0 Created i18n utility function 2014-03-12 20:30:43 +01:00
Nick Winter
77c9217357 Better handling of refreshing ladder and matches views depending on idle state. 2014-03-12 11:39:09 -07:00
Scott Erickson
7e8f74f385 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 10:09:06 -07:00
Scott Erickson
fe93d31929 Fixed loading marks so they are positioned correctly when they load and the world is paused. 2014-03-12 10:08:57 -07:00
Nick Winter
49ab47e3fe Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script. 2014-03-12 10:01:31 -07:00
Nick Winter
f83fe6ce14 Fixed bugs with sprite rotation updating. 2014-03-12 09:31:45 -07:00
Nick Winter
d9b8375744 Merge pull request #513 from rubenvereecken/treema_fix 
Treema fix
 2014-03-12 09:21:52 -07:00
Ruben Vereecken
bd129f5824 No dropdown for sound in readOnly Treemas. 2014-03-12 17:19:47 +01:00
Scott Erickson
52733d5a1e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 09:15:48 -07:00
Scott Erickson
939c5faa1a Fixed a bug when a thang has multiple effects. 2014-03-12 09:15:37 -07:00
Nick Winter
2e354a7f11 Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one. 2014-03-12 09:10:36 -07:00
Nick Winter
da762fbc4f Merge branch 'rubenvereecken-versions_modal' 2014-03-12 08:30:02 -07:00
Nick Winter
0125c46dc2 Resolved merge conflict. 2014-03-12 08:29:42 -07:00
Ruben Vereecken
27fd580324 Got rid of CRLF line endings 2014-03-12 16:03:36 +01:00
Ruben Vereecken
4b72ee1d04 Clean up 2014-03-12 15:43:49 +01:00
Ruben Vereecken
8acf35b290 Added i18n for components 2014-03-12 15:42:57 +01:00
Ruben Vereecken
ddae5d0763 Added Version History to Level Components 2014-03-12 15:32:55 +01:00
Michael Schmatz
a6fb2a3994 Various changes to spectate view 2014-03-12 07:32:30 -07:00
Ruben Vereecken
2a86daaa2a Added Version History to Thang Types 2014-03-12 15:22:15 +01:00
TigroTigro
a8eff71438 Update pl.coffee 2014-03-12 14:01:35 +01:00
TigroTigro
85b1b81149 Update pl.coffee 2014-03-12 13:47:58 +01:00
TigroTigro
b1ab6225ee Update pl.coffee 2014-03-12 13:16:09 +01:00
Prabh Simran Singh Baweja
5e964cd6cf Update play_view.coffee 
New Level Added : Sword Loop
 2014-03-12 15:58:33 +05:30
Dominik Kundel
dd87215012 Avoid overwriting gutter symbols of error, warning, info 2014-03-12 11:26:56 +01:00
Scott Erickson
9cb80783ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 22:01:47 -07:00
Scott Erickson
8ddbb49845 Trying out promises to simplify view loading. 2014-03-11 22:01:38 -07:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Nick Winter
2b487eeed8 Using /db/thang.type instead of /db/thang_type in URLs, for consistency. 2014-03-11 18:30:25 -07:00
Nick Winter
4f9db0a7f7 Merged in all names. 2014-03-11 18:11:48 -07:00
Nick Winter
ce895ffd75 Merge pull request #524 from Darredevil/master 
Added GetALLToLocations and KeepALLFromLocations
 2014-03-11 18:09:50 -07:00
Nick Winter
40ea643f67 Merge pull request #523 from dkundel/master 
Avoid flickering of editor when executing the script.
 2014-03-11 18:07:17 -07:00
Nick Winter
8d718a4b16 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 18:06:52 -07:00
Nick Winter
8c57b31c54 Fixed a couple bugs with the matches tab. 2014-03-11 18:06:48 -07:00
Dominik Kundel
c7ca878c69 added class property that got missing 2014-03-12 01:26:11 +01:00
Michael Schmatz
8eb5f1b830 Merge pull request #517 from Darredevil/patch-10 
Update ro.coffee
 2014-03-11 17:26:05 -07:00
Darredevil
012c25a817 Added GetALLToLocations and KeepALLFromLocations 2014-03-12 01:57:30 +02:00
Alexandru
5f2587da18 Merge remote-tracking branch 'upstream/master' 2014-03-12 01:38:54 +02:00
Nick Winter
392534878a Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase. 2014-03-11 16:31:39 -07:00
Alexandru
4552455284 Merge branch 'master' of https://github.com/Darredevil/codecombat 2014-03-12 01:23:55 +02:00
Scott Erickson
eeff462051 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 16:23:20 -07:00
Scott Erickson
da58b68fa0 Fixed a bug with the music player where sometimes it wouldn't loop. 2014-03-11 16:23:04 -07:00
Dominik Kundel
714c6ddf9b Merge remote-tracking branch 'upstream/master' 2014-03-11 23:50:51 +01:00
Dominik Kundel
4c7da1ea69 update Gutter only if changed 2014-03-11 23:47:27 +01:00
Nick Winter
852b1c97ac Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking. 2014-03-11 13:59:12 -07:00
Nick Winter
bba3c78107 Ties are not victories in the emails. 2014-03-11 13:20:52 -07:00
Michael Schmatz
4062bba245 Created initial spectate level view 2014-03-11 13:12:45 -07:00
Ruben Vereecken
8709cdc472 Finished Article History 2014-03-11 19:33:27 +01:00
Nick Winter
d012e0d7a9 Merge pull request #508 from Rahazan/patch-2 
Update Dutch Translations
 2014-03-11 09:46:18 -07:00
Sam Epps
11ca60765d Added some additional names to names.coffee 2014-03-11 17:16:09 +01:00
Nick Winter
eac219a2be Inserted score history graph into ladder update emails. 2014-03-10 22:03:33 -07:00
Nick Winter
32baf2ae79 Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes. 2014-03-10 21:30:46 -07:00
Nick Winter
c393ecd51a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-10 20:22:31 -07:00
Nick Winter
6ce65488aa Added simple rank history graph. Improving ladder update mail. 2014-03-10 20:22:25 -07:00
Darredevil
97633dec26 Update ro.coffee 
Getting there...
Please suggest alternatives for lines 297 and 331
 2014-03-11 04:24:11 +02:00
Michael Schmatz
93d0e293cd Merge pull request #509 from Darredevil/patch-7 
Update ro.coffee
 2014-03-10 16:17:39 -07:00
Darredevil
6b48577e56 Update ro.coffee 2014-03-11 01:03:20 +02:00
Ruben Vereecken
af73e5a594 Added a versions modal for every type 2014-03-10 23:29:34 +01:00
Ruben Vereecken
8e989ec08f Got the level history view set up as before, but better 2014-03-10 23:17:19 +01:00
Nick Winter
c4a3b71786 Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal 2014-03-10 13:57:51 -07:00
Tigrowski
a5edfbcaa7 Update pl.coffee 2014-03-10 21:57:16 +01:00
Tigrowski
50469a8ae4 Update pl.coffee 2014-03-10 21:40:53 +01:00
Nick Winter
6055512ac7 Working on ladder updates. 2014-03-10 13:20:00 -07:00
Ruben Vereecken
68b10d9023 History now shows a loading bar upon opening 2014-03-10 20:06:36 +01:00
Nick Winter
77f7276759 Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal 2014-03-10 11:29:47 -07:00
Ruben Vereecken
29901787f7 Added i18n for Version History 2014-03-10 19:11:37 +01:00
Ruben Vereecken
06ae06fa34 Used mix-ins to combine Modal and VersionView 2014-03-10 19:08:53 +01:00
Nick Winter
234b3f105d Reworked ladder game victory modal main call to action to actually submit game for ranking. 2014-03-10 10:36:28 -07:00
Nick Winter
6a71e97204 Improvements to HUD actions. 2014-03-10 09:37:05 -07:00
Nick Winter
c6b1d9089c Fixed sounds spamming on last frame. 2014-03-10 08:45:36 -07:00
Ruben Vereecken
f6ece2d63e Created a modal version of Version History 2014-03-10 12:16:08 +01:00
Darredevil
5e634f9915 Update ro.coffee 
Almost done.
The legal stuff is the most boring thing i ever had to translate...
 2014-03-10 04:10:29 +02:00
Nick Winter
3d71fcbc70 Wins, losses, and realizing that I'm not doing server code right. 2014-03-09 18:46:11 -07:00
Rahazan
66b7ba40e8 Added missing Dutch diplomats 2014-03-09 23:54:06 +01:00
Rahazan
2daa70bef4 Changed manual 
Manual is ambiguous, is it manual as in "manual instead of automatic" or manual as in a handbook/guide. I thought it was the latter, so I changed it here.
 2014-03-09 23:45:04 +01:00
Rahazan
e55a43b396 Fixed some formatting of sentences 2014-03-09 23:37:25 +01:00
Nick Winter
2d32bc1ac4 Reduced unnecessary name fetching. 2014-03-09 13:22:22 -07:00
Nick Winter
3e82e0b599 Disallow submission of non-denormalized sessions to ladders. 2014-03-09 12:53:11 -07:00
Nick Winter
34983059aa Fixed bug with trying to show challenger modals with no hash to indicate we should. 2014-03-09 11:52:05 -07:00
Nick Winter
03abbc44cb Better error messages for missing Component dependencies. 2014-03-09 11:46:53 -07:00
Darredevil
c9a56048ca Update GoalManager.coffee 2014-03-09 20:35:33 +02:00
Nick Winter
9e56540cee Uncommented out some headers in uk.coffee localization. 2014-03-09 11:03:21 -07:00
Nick Winter
802454bbb9 Merge pull request #504 from gorodsb/patch-1 
Update uk.coffee
 2014-03-09 08:55:11 -07:00
gorodsb
6be9ff2bb7 Update uk.coffee 2014-03-09 17:54:08 +02:00
Nick Winter
59314bcb3c Merge pull request #500 from M-r-A/i18n 
Update i18n
 2014-03-09 08:19:02 -07:00
gorodsb
adc8c8eddf Update uk.coffee 2014-03-09 16:47:48 +02:00
Darredevil
ed93b2bbe5 More than half done 2014-03-09 05:53:22 +02:00
Alexei Nikitin
59318678ba Update ru 2014-03-09 05:06:53 +04:00
Alexei Nikitin
bcaa801f88 Sync en i18n 2014-03-09 05:04:11 +04:00
Alexei Nikitin
81084a24c6 Add admin i18n 2014-03-09 04:36:48 +04:00
Alexei Nikitin
f6d6805534 Add password i18n 2014-03-09 04:31:15 +04:00
Alexei Nikitin
bfebd0b47a Add revert i18n 2014-03-09 04:13:30 +04:00
Nick Winter
39c4657204 Fixed HUD showing actions backwardly. Added rank numbering to leaderboard. 2014-03-08 15:43:56 -08:00
Nick Winter
b3964571e1 Fixed bug importing animations into existing ThangTypes that had only containers. 2014-03-08 15:04:11 -08:00
Nick Winter
5bde534757 Fixed parsing for ThangTypes that don't have lib.properties. 2014-03-08 14:53:17 -08:00
Nick Winter
be12d38e34 Taking into account null rects and library width/height subtraction on sprite parsing. 2014-03-08 14:38:35 -08:00
Scott Erickson
57f1588dea Fixed another bug related to the race condition fix. 2014-03-08 14:34:25 -08:00
Scott Erickson
afbe2200a6 Fixed a bug with the new race condition fix. Moving the schemas to the application would be good. 2014-03-08 13:52:34 -08:00
Scott Erickson
ad6317434d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-08 13:07:12 -08:00
Scott Erickson
2861f62248 Simple fix for a race condition where the user schema might load after /auth/whoami, overwriting /auth/whoami's cookie. 2014-03-08 13:06:04 -08:00
Nick Winter
b0238d74a4 Let's just show 200 leaderboard entries for now until we have paging. 2014-03-08 11:50:10 -08:00
Nick Winter
c3c5782fd9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-08 11:37:37 -08:00
Nick Winter
1c44e3df1e Fixed bug with linking to #my-matches tab. 2014-03-08 11:37:33 -08:00
Nick Winter
cd79403736 Merge pull request #494 from M-r-A/patch-3 
Fix l18n tags
 2014-03-08 11:27:00 -08:00
Nick Winter
027643fd2a Merge pull request #493 from M-r-A/patch-2 
Update ru.coffee
 2014-03-08 11:26:18 -08:00
Yinkan Li
bfad68b03b refine skip_tutorial 
refine skip_tutorial
using Chinese （）
 2014-03-09 00:01:13 +08:00
Yinkan Li
452857e66c update Chinese Simplified 
update
legal
concat
 2014-03-08 23:56:05 +08:00
Yinkan Li
bcd8c837b4 Update ： employers for Chinese simplified 
Update ： employers for Chinese simplified
 2014-03-08 23:53:47 +08:00
Nick Winter
68099bbd7c Victory modal for ladder games takes you back to the ladder matches. 2014-03-07 21:20:09 -08:00
Nick Winter
085fb82cc9 Fixed a multiplayer link and debug mark alpha. 2014-03-07 21:02:10 -08:00
Michael Schmatz
2f378106ca Added checking level ladder status before submitting 2014-03-07 18:16:50 -08:00
Scott Erickson
2fa40fb2db Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-07 17:37:19 -08:00
Scott Erickson
fe2ced1a67 Gave the health bar a border, made it a little more high res. 2014-03-07 17:37:11 -08:00
Alexei Nikitin
98b36d299c Update article model 2014-03-08 05:05:35 +04:00
Nick Winter
b6ae73ef29 Merge pull request #492 from Shrihari/issue464 
Fixed Spell Debug View width bug
 2014-03-07 16:14:57 -08:00
Nick Winter
ec86a07906 Changed Camera min/max zoom. 2014-03-07 15:20:54 -08:00
Scott Erickson
8fa9c9c410 Set up the level play view to show the guide on startup based on the showGuide property. 2014-03-07 15:18:56 -08:00
Scott Erickson
13b9a9cb58 Added dungeon arena tutorial to a few hardcoded places. 2014-03-07 15:16:13 -08:00
Scott Erickson
17231bce06 Added showsGuide and type properties to level. 2014-03-07 13:13:58 -08:00
Scott Erickson
be03485538 Set up the ladder play modal to be more forthright getting new players to play the tutorial. 2014-03-07 12:58:17 -08:00
Alexei Nikitin
683c578dcb Fix lolwtf deleting 2014-03-07 12:36:17 -08:00
Alexei Nikitin
a3afa802d9 Update ru.coffee 2014-03-07 12:33:18 -08:00
Alexei Nikitin
16f2379af9 Update ru.coffee 2014-03-07 12:27:12 -08:00
Alexei Nikitin
535881b637 Update ambassador.jade 2014-03-07 12:20:17 -08:00
Alexei Nikitin
b002ae376b Update counselor.jade 2014-03-07 12:19:14 -08:00
Alexei Nikitin
317ae5cc32 Update scribe.jade 2014-03-07 12:17:32 -08:00
Scott Erickson
d8d917ecf9 Set up better teardown for the ladder view. 2014-03-07 12:15:16 -08:00
Alexei Nikitin
517ef8611b Update ru.coffee 2014-03-07 12:13:15 -08:00
Alexei Nikitin
4e24e2a244 Update ru.coffee 2014-03-07 12:10:25 -08:00
Scott Erickson
cf2a0a999e Set up the ladder play modal to point to the tutorial level dynamically. 2014-03-07 11:57:31 -08:00
Scott Erickson
610fc0694b Turning off view caching by default now. Should help lower the memory footprint. 2014-03-07 11:57:15 -08:00
Shrihari
5274f22467 Fixed Spell Debug View width bug 2014-03-08 01:10:12 +05:30
Scott Erickson
d14f862359 Ladder view can now be linked to to play against a specific team. 2014-03-07 11:23:06 -08:00
Scott Erickson
12f1042530 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-06 19:17:21 -08:00
Nick Winter
6e47416d24 Fixed some level IDs. 2014-03-06 19:09:15 -08:00
Scott Erickson
8012addaa1 Merge remote-tracking branch 'origin/master' 2014-03-06 19:01:30 -08:00
Michael Schmatz
45cd7e31ca Made simulator level-independent 2014-03-06 18:48:41 -08:00
Scott Erickson
34278a8648 Merge remote-tracking branch 'origin/master' 2014-03-06 17:27:01 -08:00
Scott Erickson
a4edb76c98 Fixed a couple of the bugs with marks. 2014-03-06 17:25:40 -08:00
Nick Winter
40e896868b Fixed CocoSprite getOffset to not apply scale to registration points. 2014-03-06 17:21:24 -08:00
Scott Erickson
5b11e132b2 Fixed the effect marks so they properly go away. 2014-03-06 17:13:16 -08:00
Nick Winter
b6335a30ae More fixes for empty string array serialization. 2014-03-06 16:32:13 -08:00
Scott Erickson
2fb1c184f9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-06 16:22:19 -08:00
Scott Erickson
1b61b928b0 Couple tweaks to the cocosprite for effect marks. 2014-03-06 16:21:06 -08:00
Nick Winter
ea406bd3c7 Fixed some event listeners on destroyed loaders. 2014-03-06 15:52:51 -08:00
Scott Erickson
2ac5a94055 Merge remote-tracking branch 'origin/master' 2014-03-06 15:52:14 -08:00
Scott Erickson
041f4512e8 Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple. 2014-03-06 15:52:09 -08:00
Nick Winter
40a32d7b43 Fixed array / string ThangState key serialization conflicts. Fixed #333. 2014-03-06 14:53:37 -08:00
Nick Winter
a03403de94 Started some more name categories. 2014-03-06 09:35:58 -08:00
Nick Winter
fddd210d34 Fixed Archer M names conflict. 2014-03-06 09:27:06 -08:00
Nick Winter
b5c72e4b4a Merge pull request #477 from iraladson/patch-1 
Update names.coffee
 2014-03-06 09:25:37 -08:00
Nick Winter
d3dd0eb32d Fixed i18n tag typo: adventurer_sumamry -> adventurer_summary. 2014-03-06 09:25:16 -08:00
Nick Winter
49dac82897 Merge pull request #484 from akaza-akari/cn-locale 
Chinese(Simpified) translation for Contribute and About page
 2014-03-06 09:18:39 -08:00
Nick Winter
58069fc071 Merge branch 'enh-panning' of git://github.com/akaza-akari/codecombat into akaza-akari-enh-panning 2014-03-06 09:02:41 -08:00
Akaza Akari
ad3019a6cb Translated more strings 2014-03-06 16:51:21 +08:00
Akaza Akari
929d10588e Translate passages on Contribute and About page 2014-03-06 16:02:42 +08:00
Akaza Akari
030da44c23 Added volume manipulation, adjusted panning parameters 2014-03-05 20:12:42 -08:00
Scott Erickson
a6c4fe8d02 Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master 2014-03-05 20:04:14 -08:00
Akaza Akari
51d7bd656d Made updatePosition use getWorldPosition 2014-03-05 19:54:58 -08:00
Akaza Akari
99f43028a0 Add thang sound panning for #454 2014-03-05 19:39:14 -08:00
Scott Erickson
aa3167f303 Temporary hack fix while mongodb text search is broken. 2014-03-05 15:06:20 -08:00
Darredevil
398fa3c426 Update ro.coffee 
so much to translate....
 2014-03-06 00:12:58 +02:00
Nick Winter
2d69abf674 Merge pull request #481 from dkundel/master 
Proposed UX improvement for #6
 2014-03-05 13:45:14 -08:00
Dominik Kundel
a033a80722 Merge remote-tracking branch 'upstream/master' 2014-03-05 22:18:53 +01:00
Dominik Kundel
b0d571c7ad highlight only the executing statement 2014-03-05 22:17:34 +01:00
Scott Erickson
7a2d5b4bff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-05 12:53:57 -08:00
Scott Erickson
fc42043cb8 Fixed #480 2014-03-05 12:53:48 -08:00
Scott Erickson
af265ebee8 Tweaked an error message to be more generally useful. 2014-03-05 12:53:11 -08:00
Jayant Jain
db0fc82eb0 Minor bugfix for freezing editor due to out of bounds frame index 2014-03-06 01:54:09 +05:30
iraladson
8d046c31b9 Update names.coffee 
"Added more names for #53
 2014-03-05 14:06:29 -06:00
iraladson
7885b21b4b Update names.coffee 2014-03-05 14:03:57 -06:00
Nick Winter
5ec06159a6 Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging. 2014-03-05 12:00:29 -08:00
Darredevil
ea98a9917d Update ro 2014-03-05 20:40:14 +02:00
Scott Erickson
0a8d5b5b97 Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master 2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3 Moved "Skip (esc)" next to Continue button 2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782 further changes in design of highlighting lines in code 2014-03-05 17:06:46 +01:00
Shrihari
0ec431f90a Moved 'skip tutorial' text to locales. 2014-03-05 13:46:21 +05:30
Dominik Kundel
a0e39480e3 new UI design for executing and executed lines in ACE editor 2014-03-05 02:00:38 +01:00
Scott Erickson
03b60838b6 Merge remote-tracking branch 'origin/master' 2014-03-04 12:21:07 -08:00
Scott Erickson
9726840d8a Trying to handle a case where a user did not have their user account created. 2014-03-04 12:21:02 -08:00
Scott Erickson
3680d628e7 Fixed showing generic errors. 2014-03-04 12:06:31 -08:00
Darredevil
e02780e441 Update for ro.coffee 
-first 80 lines done
 2014-03-04 21:26:52 +02:00
Nick Winter
1532396ceb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 11:15:35 -08:00
Nick Winter
4556536df4 Hooked up new HUD icons. 2014-03-04 11:15:31 -08:00
Yos Riady
195b1941ea Added even more names for #53 2014-03-05 02:53:54 +08:00
George Saines
3ea4439fc1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 10:24:23 -08:00
Nick Winter
2f653c966e Simulator now swaps in empty methods when code doesn't compile. 2014-03-04 08:30:50 -08:00
Ruben Vereecken
d43ff5d217 Added an anonymous check on the Fork button 2014-03-04 11:24:38 +01:00
George Saines
33e2571934 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 18:04:01 -08:00
George Saines
113c71e141 adding new hud icons 2014-03-03 18:03:54 -08:00
Scott Erickson
1f091b93b8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 17:15:54 -08:00
Scott Erickson
246bbefc91 Made the file uploading just overwrite files with the same name. 2014-03-03 17:14:13 -08:00
Nick Winter
65d9186ef1 Fixed actions showing up under dialogue bubbles on repeated toggling. 2014-03-03 16:55:36 -08:00
Scott Erickson
1b257252f9 Merge branch 'production' 2014-03-03 16:52:01 -08:00
Nick Winter
7b25eeec47 HUD properties now flow into columns more evenly, have max styling. 2014-03-03 16:45:03 -08:00
Scott Erickson
619b628661 Reworked the victory modal styling a bit. 2014-03-03 16:39:56 -08:00
Nick Winter
873c560a06 Added Alexandru's Bubble Sort Bootcamp Battle to /play. 2014-03-03 16:22:50 -08:00
Nick Winter
c944e78271 Ladder views now show level descvription content if present. 2014-03-03 14:59:39 -08:00
Scott Erickson
e231952fcf Added the jquery minicolors image. 2014-03-03 14:17:36 -08:00
Ruben Vereecken
b7fbf67e89 Enabled Fork button again. Previous commits solve issue #455 2014-03-03 22:52:37 +01:00
Ruben Vereecken
0aa8e7bb7d Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet 2014-03-03 22:21:56 +01:00
Scott Erickson
d66a9d6be0 Set up a generic choose tab for root views so hash->tab behavior is baked in. 2014-03-03 13:21:05 -08:00
Nick Winter
461d66c795 Typo in my matches team ranking. 2014-03-03 13:02:34 -08:00
Nick Winter
0c4a2a2f2b Multiplied visible scores by 100 for more awesome. 2014-03-03 12:27:32 -08:00
Ruben Vereecken
05b4f536c1 Fixed a link to point correctly 2014-03-03 21:22:04 +01:00
Nick Winter
0c45b6c0e3 Fixes for ladder refreshing. 2014-03-03 12:21:59 -08:00
Ruben Vereecken
ee920afea9 Disabled buttons for non-owners in Article Editor 2014-03-03 21:13:02 +01:00
Michael Schmatz
a5864c4f0c Live leaderboard updating 2014-03-03 12:10:27 -08:00
Scott Erickson
1efb96f24a Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
 2014-03-03 12:08:11 -08:00
Scott Erickson
fb75ad36e7 Added team icons to the ladder play view. 2014-03-03 12:04:31 -08:00
Ruben Vereecken
942b69ea9f Created hasWriteAccess on Cocomodel, used it for level access 2014-03-03 20:41:35 +01:00
Scott Erickson
65d39e658d Removed the old team view cruft. 2014-03-03 11:15:46 -08:00
Scott Erickson
ff3f3e5a07 Removed a link to the old team view. 2014-03-03 11:11:27 -08:00
Scott Erickson
c5521a1311 Level now uses the universal wizard thang type. 2014-03-03 11:04:03 -08:00
Scott Erickson
0d054bec8e Refactored the universal wizard loading to happen silently when you import ThangType. 2014-03-03 10:42:11 -08:00
Scott Erickson
feaeb1dc98 Made the wizard icons colored based on user settings. 2014-03-03 10:21:51 -08:00
Scott Erickson
d3b6836a06 Fixed some bugs with the new ladder view when you haven't played before. 2014-03-03 09:20:14 -08:00
Scott Erickson
5bb56ac818 Merge branch 'feature/new-ladder-view' 2014-03-03 09:05:52 -08:00
Scott Erickson
22e80f6d24 Set up a play modal, starting to refactor wizard thang type loading to be shared across the site. 2014-03-03 09:03:44 -08:00
Karthig
b04d63d5bf - create sass file to center 404 image on page 2014-03-03 11:42:07 -05:00
Karthig
357ef45cb0 - insert random error image into 404 page 2014-03-03 10:58:33 -05:00
Nick Winter
20fb9ba5b4 Merge pull request #461 from rubenvereecken/master 
Localization centred patches and additions
 2014-03-03 07:37:46 -08:00
Nick Winter
980a3b6f21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 07:29:07 -08:00
Nick Winter
86fd098159 Localized WizardSprite movement hey handling to WizardSprite file. 2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat 2014-03-03 07:22:44 -08:00
Nick Winter
a665aca039 Merge pull request #443 from M-r-A/master 
Finalized Russian translations
 2014-03-03 07:21:49 -08:00
Nick Winter
c858fb5e24 Merge pull request #440 from FinnDS/patch-1 
Update names.coffee
 2014-03-03 07:20:55 -08:00
Ruben Vereecken
b8b22bb739 Localized 'Create New ..' and 'Search .. Here' 2014-03-03 12:45:04 +01:00
George Saines
94b98a2d46 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 18:21:46 -08:00
George Saines
4b6ebd6532 styled the victory modal a bit 2014-03-02 18:21:42 -08:00
Nick Winter
82b250b9a3 protectAPI off again for Brawlwood, too slow for now. 2014-03-02 17:51:57 -08:00
Nick Winter
ca274f9787 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 16:06:31 -08:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Ruben Vereecken
c2d247e686 Editor tables now load i18n correctly after search. 2014-03-03 00:31:49 +01:00
Ruben Vereecken
c3c699df49 Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications' 2014-03-02 23:28:16 +01:00
Ruben Vereecken
bea002a8d4 Fixed some wrong translations 2014-03-02 22:59:15 +01:00
Scott Erickson
956e2b3c40 Set up the my matches tab in the new ladder view. 2014-03-02 13:24:41 -08:00
Scott Erickson
d0f416f668 Rearranging the ladder view. 2014-03-02 12:43:21 -08:00
Ruben Vereecken
e4bf752e20 Changed Dutch (NL) ambassador_summary to match the English version 2014-03-02 20:30:18 +01:00
Ruben Vereecken
60f79e261d Patched up tonnes of minor language mistakes (Dutch-Nederlands) 2014-03-02 20:24:14 +01:00
Ruben Vereecken
fb57e634a5 Patched up some grammar mistakes (Dutch-Nederlands). 2014-03-02 18:44:47 +01:00
Muhammed Thanish
da2ebf857a Increase delay 2014-03-02 14:02:30 +05:30
Nick Winter
6c48660922 No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit. 2014-03-01 16:57:29 -08:00
YF
2db9fa708b Update zh-HANS.coffee 2014-03-02 07:27:15 +08:00
Muhammed Thanish
d7e031fd00 Use key.isPressed() to get movement direction 2014-03-02 03:27:06 +05:30
Muhammed Thanish
a092557973 Add camera zoomTo(pos) 2014-03-02 02:13:37 +05:30
Muhammed Thanish
7ea9260322 Use WizardSprite 2014-03-02 01:45:49 +05:30
Nick Winter
c2f82690b4 Put Archmage and Artisan avatars in GitHub README. 2014-03-01 11:21:24 -08:00
Nick Winter
2f130da090 HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing. 2014-03-01 11:06:44 -08:00
Muhammed Thanish
8cc8103288 Add keyboard shortcuts to move the wizard 2014-03-01 19:58:15 +05:30
Tay Yang Shun
47b37426d0 Added Level Editor page breadcrumbs. 2014-03-01 14:52:51 +08:00
Tay Yang Shun
f43dd2f3ff Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages. 2014-03-01 14:47:31 +08:00
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
George Saines
58f2aa6123 adding victory and 404 images 2014-02-28 18:58:40 -08:00
Nick Winter
71ebe7a0aa Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat. 2014-02-28 17:12:23 -08:00
Nick Winter
9a9bc20c68 Merge pull request #442 from Rahazan/patch-1 
Finalized Dutch translations
 2014-02-28 16:57:22 -08:00
Alexei Nikitin
d68ff5a899 Fix diplomat.jade building 2014-03-01 04:54:54 +04:00
Alexei Nikitin
789b49e15f Update diplomat.jade 2014-03-01 03:37:11 +04:00
Alexei Nikitin
9c107f24f8 Finishing ru.coffee 2014-03-01 03:31:36 +04:00
Rahazan
ef6acfe157 Fixed small typos. 2014-02-28 23:33:10 +01:00
Rahazan
22c7f9f690 Fixed line indentation, removed some double entries 2014-02-28 23:09:47 +01:00
Scott Erickson
4de425bd58 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 13:59:33 -08:00
Scott Erickson
10795df7d9 Renamed hardcoded project-dotas to brawlwoods. 2014-02-28 13:59:02 -08:00
Nick Winter
b5ff264ad0 Merge pull request #441 from yangshun/level-editor-freeze 
Redirect to level editor only after modal hidden event is triggered. Fixes #438 and #439.
 2014-02-28 12:48:56 -08:00
Nick Winter
52903cc0de Using String and Array docs when appropriate now. 2014-02-28 12:43:31 -08:00
Rahazan
d58909a39a Finalized Dutch translations 2014-02-28 21:22:10 +01:00
Nick Winter
6db8051122 Only show action timeline when 'action' is in the hudProperties. 2014-02-28 11:38:41 -08:00
Scott Erickson
2894d4f39c Set up session-repeating scripts. 2014-02-28 11:28:23 -08:00
Nick Winter
9b8eb6a296 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 11:27:36 -08:00
Nick Winter
3cee341887 Big performance improvements for scrubbing between frames; look out for bugs. 2014-02-28 11:27:32 -08:00
Scott Erickson
ef9c0a610f Fixed a bug with the casting screen. 2014-02-28 11:10:56 -08:00
Scott Erickson
d12b923eaf Made a casting progress bar on the canvas to test vs having it shown in the cast button. 2014-02-28 11:05:41 -08:00
Tay Yang Shun
8af62d53cd Redirect to level editor only after modal hidden event is triggered. Fixes #438. 2014-03-01 01:55:30 +08:00
Finn
5b5af5a55a Update names.coffee 
Added the name "Cid" under "Soldier M".
 2014-02-28 12:06:26 +01:00
Nick Winter
e20e9d68cf Construct sprite sheets as ThangTypes load. 2014-02-27 22:15:13 -08:00
Nick Winter
97197bd89d Got rid of potentially unnecessary (and definitely slow) SpriteSheetBuilder _.cloneDeep. Watch out. 2014-02-27 20:54:29 -08:00
Nick Winter
aef1bc63ba Smarter infinite loop detection vs. web-worker-is-still-loading detection. 2014-02-27 20:01:27 -08:00
Nick Winter
ad30130814 Merge pull request #437 from M-r-A/master 
Fix indents
 2014-02-27 17:10:48 -08:00
M-r-A
873cd55cf3 Update ambassador.jade 2014-02-27 17:00:04 -08:00
M-r-A
a1bb322e7c Update archmage.jade 2014-02-27 16:56:02 -08:00
M-r-A
0d7eb52fb8 Update ambassador.jade 2014-02-27 16:55:24 -08:00
M-r-A
095b14e41a Update adventurer.jade 2014-02-27 16:54:59 -08:00
M-r-A
772c0b1ab7 Update artisan.jade 2014-02-27 16:54:22 -08:00
Nick Winter
e64796bba6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 16:53:05 -08:00
Nick Winter
01845a0175 Some translations weren't done yet. 2014-02-27 16:52:58 -08:00
Scott Erickson
04a0337b92 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 16:44:54 -08:00
Scott Erickson
df196cc531 Modals now stop the level from starting until they close. 2014-02-27 16:44:11 -08:00
Nick Winter
de4c9cb60d Merge pull request #436 from M-r-A/master 
Fix link in legal.jade
 2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc Fix link in legal.jade 2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9 Added an async name checker for the wizard settings modal. 2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0 Improved a bunch of things with the wizard settings view. 2014-02-27 12:25:59 -08:00
Gokul
63f70f7a39 Made changes in the language, It was earlier showing English(Au) for both Lithuanian and Norwegian Nynorsk. Couldno't change Bahasa Melayu. It keeps showing {English} in the description instead of Bahasa Melayu 
Changed English(Au) in two wrong places to Luthanian and Norwegian

Changed English(Au) in two wrong places to Luthanian and Norwegian and made corrections in Bahasa

Cleaned up some more lang. descriptions and issue #272 shouldn't happen now i guess

Update not_found.jade

A couple tweaks to gokul1794's commits.
 2014-02-27 12:07:57 -08:00
Scott Erickson
f991bc3a58 Removed some vestigial wizard coloring code from the settings account view. 2014-02-27 12:02:08 -08:00
Nick Winter
7453ada074 Uncommented some translations that were added. 2014-02-27 11:57:23 -08:00
Nick Winter
ffbef0de5b Merge pull request #428 from Darredevil/patch-1 
Added more names for #53
 2014-02-27 11:50:59 -08:00
Nick Winter
33ff7a48aa Merge pull request #426 from M-r-A/patch-1 
Update ru.coffee
 2014-02-27 11:08:39 -08:00
Nick Winter
190ab6e792 Merge pull request #417 from Vic020/patch-1 
Update zh-HANS.coffee
 2014-02-27 11:08:10 -08:00
Michael Schmatz
5d2c430779 Merge pull request #435 from yangshun/editor-modal-input-focus 
Auto-focus on the modal's input field for creation of new entities in editor.
 2014-02-27 09:21:09 -08:00
Tay Yang Shun
d2a6b3822e Re-added submit form event 2014-02-28 01:17:19 +08:00
Michael Schmatz
53a317df77 Merge pull request #434 from yangshun/play-button 
Deferred saving of latest level
 2014-02-27 09:07:27 -08:00
Michael Schmatz
9deadad99f Merge pull request #427 from yangshun/music-button 
Blur the music button after click so that subsequent space and enter keydown events do not trigger it.
 2014-02-27 09:06:18 -08:00
Tay Yang Shun
57f896b950 Added newline to end of file. 2014-02-27 15:38:03 +08:00
Tay Yang Shun
947b8766c2 Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379 2014-02-27 15:32:18 +08:00
Tay Yang Shun
04895a9204 Merge branch 'master' into play-button 2014-02-27 14:09:37 +08:00
Tay Yang Shun
514fe358c1 Trigger storage of latest level only after the level is guaranteed to be able to load 2014-02-27 14:08:25 +08:00
Scott Erickson
8d828939b6 Fixed a bug where the jingle wouldn't play during level loading if the audio had been loaded previously. 2014-02-26 20:23:13 -08:00
Scott Erickson
74186b7772 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 19:30:49 -08:00
Scott Erickson
ec7028af60 Fixed uploading images for articles. 2014-02-26 19:30:37 -08:00
Nick Winter
c26995a3a9 Home button on ladder level goes to ladder. 2014-02-26 18:58:25 -08:00
Scott Erickson
4e8c0b65e2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 18:49:43 -08:00
Scott Erickson
7052b0600b Made mouse dragging not interrupt selecting units so much. 2014-02-26 18:42:39 -08:00
Nick Winter
48122000ed Gold shows up as an int in the HUD now. 2014-02-26 18:09:09 -08:00
Nick Winter
5c1c17c8dd Green Guide button for attention. 2014-02-26 17:52:08 -08:00
Nick Winter
081274579b Forget old goals. 2014-02-26 17:45:08 -08:00
Nick Winter
0cf20b577d Added a delay to the property documentation on spell debug hover. 2014-02-26 17:23:59 -08:00
Nick Winter
172242d226 Re-denormalize session if things have changed. Removed some logs. 2014-02-26 17:06:21 -08:00
M-r-A
1c675ea2e2 Update ru.coffee 2014-02-26 16:40:51 -08:00
Scott Erickson
0fd1c03b7f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 15:56:25 -08:00
Scott Erickson
c86feb13e8 Fixed the region and point choosers for the level editor. 2014-02-26 15:56:05 -08:00
Scott Erickson
ea73d91a6b Made the docs modal larger. 2014-02-26 15:44:46 -08:00
Michael Schmatz
b648098c95 Implemented espionage mode 2014-02-26 14:14:43 -08:00
Darredevil
55ab142d75 Added more names for #53 2014-02-26 23:21:03 +02:00
Michael Schmatz
a052180250 Improved match scheduling 2014-02-26 12:14:02 -08:00
M-r-A
1a7e1f2384 Update ru.coffee 2014-02-26 10:56:40 -08:00
Tay Yang Shun
b48a9fabc6 Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306. 2014-02-27 02:42:25 +08:00
Michael Schmatz
bb76fb241c Fixed simulator 
The format of something must have suddenly changed?
 2014-02-26 09:21:44 -08:00
M-r-A
ab6fc69e6c Update ru.coffee 2014-02-25 23:49:43 -08:00
Scott Erickson
f89768d76d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 17:15:01 -08:00
Scott Erickson
02d1dc2445 Added a screen for when playback ends. 2014-02-25 17:14:39 -08:00
Nick Winter
3c5902a1d2 Trying to get session code merging to work again. 2014-02-25 14:46:48 -08:00
Nick Winter
b86c32c3e2 Merge pull request #422 from yangshun/level-not-found 
Redirect to play page for non-existent levels. Fixes issue #396
 2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff Moved internationalisation of level load error message into template file 2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a Used internationalised strings for level not found message 2014-02-26 05:54:33 +08:00
Tay Yang Shun
e3a81137e0 Modified locale messages for "level_load_error" 2014-02-26 05:52:49 +08:00
Scott Erickson
a53498224c Tweaked sprite scripts to use given response buttons even if the script is not skippable. 2014-02-25 13:27:02 -08:00
Tay Yang Shun
8a24407d3e Redirect to play page for non-existent levels. Fixes issue #396 2014-02-26 04:59:35 +08:00
Scott Erickson
1b4699556a Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily. 2014-02-25 12:39:22 -08:00
Scott Erickson
eee434ab51 Tweaked the coordinate display position to be a bit more above the mouse. 2014-02-25 12:38:47 -08:00
Scott Erickson
356d1b55ed Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 11:59:23 -08:00
Scott Erickson
f4084ba5cc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:50:53 -08:00
Scott Erickson
45e6fadfe2 Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 10:50:40 -08:00
Scott Erickson
a1a5d5eea0 Fixed some script handling by not having playback changed when the first world is built. 2014-02-25 10:50:12 -08:00
Nick Winter
a440c4dff0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:48:33 -08:00
Nick Winter
0380a30522 Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. 2014-02-25 10:48:23 -08:00
Vic___
547bda9748 Update zh-HANS.coffee 2014-02-25 22:38:01 +08:00
Scott Erickson
168f268d21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 19:49:12 -08:00
Scott Erickson
242342315f Can now drag the mouse to move around the map. 2014-02-24 19:49:05 -08:00
Nick Winter
3472b3da97 Working on different shadow shapes. Fixed bug with palette property ownership. 2014-02-24 17:53:35 -08:00
Nick Winter
4a4a702f1e Fixed a bug where scrubbing playback wouldn't always update sprite existence properly. 2014-02-24 17:01:36 -08:00
Scott Erickson
01b91eb7e2 Lowered the bob height for the wizard a bit. 2014-02-24 16:59:17 -08:00
Scott Erickson
12b28397e0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 16:54:10 -08:00
Scott Erickson
7f738562e9 Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly. 2014-02-24 16:53:55 -08:00
Nick Winter
6e557d354e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 16:42:37 -08:00
Nick Winter
2e2f184485 Not sure why beam behaves differently, but fixed its scaling. 2014-02-24 16:42:34 -08:00
George Saines
d62630d0a7 final tweaks to dialogue text styling 2014-02-24 16:03:56 -08:00
George Saines
8192a6153d fiddling with text formatting 2014-02-24 15:51:10 -08:00
Nick Winter
ab8d63f545 Improved grouping of palette properties. 2014-02-24 15:48:30 -08:00
Scott Erickson
34205a0789 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 14:58:02 -08:00
Scott Erickson
79ce16dbba Hiding most of the ladder page if not logged in. 2014-02-24 14:57:51 -08:00
Scott Erickson
052d35afe7 Added a screen darkener for when the spell is casting. 2014-02-24 14:40:28 -08:00
Nick Winter
32c45b80a9 Fixed performance problem with duplicate user code problem annotations. 2014-02-24 14:12:41 -08:00
Scott Erickson
e48bdfa1a7 Added your score to the ladder/team view. 2014-02-24 13:03:04 -08:00
Scott Erickson
43a49b3e6f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 12:52:43 -08:00
Scott Erickson
77f923752f Fixed #411. 2014-02-24 12:52:35 -08:00
Nick Winter
21975bedd2 Fixed #408. 2014-02-24 11:21:51 -08:00
Scott Erickson
953c9064f5 Fixed #407. 2014-02-24 11:20:35 -08:00
Scott Erickson
8138a5b678 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 11:13:21 -08:00
Scott Erickson
2be752ceed Refactored user creation to /auth/whoami, and made the app call that first, so only one user is created. Fixed #318. Think this also fixes #406. 2014-02-24 11:12:52 -08:00
Nick Winter
97ebe6dec8 Lightened problem info background highlight color for legibility. 2014-02-24 10:36:00 -08:00
Nick Winter
10e10aa961 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69 Playback and level editor shortcut tweaks. 2014-02-24 09:58:12 -08:00
Scott Erickson
d146febb32 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556 Finished up work on the wizard settings modal. 2014-02-24 09:46:40 -08:00
Scott Erickson
4d9dd9bd36 Fixing the wizard settings modal. 2014-02-24 09:06:50 -08:00
Scott Erickson
2d6dd36a68 Saturation and lightness was flipped on the spritebuilder. Fixed. 2014-02-24 09:06:22 -08:00
Nick Winter
af43f18c23 Fixed selective includeFlow. 2014-02-24 08:59:50 -08:00
Nick Winter
af965ccb93 Fixes for ThangListEntryView popover hover states. 2014-02-23 17:11:27 -08:00
Nick Winter
3a0ed0af9b Still let people copy out of spell palette entries while suppressing selection color. 2014-02-23 16:49:25 -08:00
Nick Winter
b3eadef818 Merge pull request #404 from tips48/master 
Change spell palette colors
 2014-02-23 16:34:28 -08:00
Nick Winter
933bcf9e6b Showing property documentation when hovering in code in addition to clicking on palette entries. 2014-02-23 16:34:03 -08:00
Aidan Matzko
8bef99e394 Make spell palette prettier 2014-02-23 18:10:03 -05:00
Nick Winter
68497b2cf3 Added arg names or ... for functions which take arguments in spell palette entries. 2014-02-23 13:27:02 -08:00
Nick Winter
a156edc0a2 Merge pull request #403 from tips48/master 
Silly error names
 2014-02-23 12:32:08 -08:00
Nick Winter
5b88b58a75 Fixed application of a few i18n tags in wizard/picture settings. 2014-02-23 12:31:41 -08:00
Aidan Matzko
b69fe85134 Silly error names 2014-02-23 15:30:33 -05:00
Nick Winter
11f742ff0f Included Hour of Code explanation in play footer. 2014-02-23 11:48:34 -08:00
Nick Winter
60eb0db1aa A few fixes for IE, anonymous errors, and cast button overflow. 2014-02-23 11:23:26 -08:00
Nick Winter
5f4d5afe4f Sped up CoordinateDisplay hover based on Russ's feedback. 2014-02-23 09:55:40 -08:00
Nick Winter
2aa103dd87 Merge pull request #402 from Vic020/master 
Update zh-HANS.coffee
 2014-02-23 09:47:00 -08:00
Nick Winter
d27925d862 Merge pull request #401 from sikandar47/patch-1 
Update es-ES.coffee
 2014-02-23 09:43:52 -08:00
Nick Winter
34b2c6dba8 Merge pull request #394 from OviiiOne/patch-1 
Update es.coffee
 2014-02-23 09:39:04 -08:00
Vic___
fb9a424146 Update zh-HANS.coffee 
Translated wizard_settings and  editor page ,and fix up some Inaccurate words.
 2014-02-24 01:11:11 +08:00
sikandar47
b3fe74e2a2 Update es-ES.coffee 2014-02-23 18:08:41 +01:00
Nick Winter
d8d514849f Merge pull request #400 from M-r-A/patch-1 
Update ru.coffee
 2014-02-23 08:34:55 -08:00
Nick Winter
0a334b310f Merge pull request #398 from jmr0/master 
fixing language selection disappearance when showing cached home view
 2014-02-23 08:32:27 -08:00
M-r-A
01a1d9e871 Update ru.coffee 2014-02-22 18:50:47 -08:00
jmr0
f00d9b2acc changing showDiplomatSuggestionModal function name and moving language build call to it from afterRender 2014-02-22 21:06:37 -05:00
Nick Winter
43c1240a03 Fixed cast button moving around due to anticipated errors early. 2014-02-22 18:02:58 -08:00
Nick Winter
c21952646a Stop cast button progress overlay before cast settings gear. 2014-02-22 17:50:45 -08:00
Nick Winter
0d9213ad44 Faded Contact link until hover. 2014-02-22 17:45:24 -08:00
Nick Winter
f88cbba262 Got rid of some unnecessary scrolling behavior on /play/level due to footer when aspect ratio is cramped. 2014-02-22 17:40:38 -08:00
Nick Winter
8565e3f315 Adding the button, not just the shortcut, for beautification. 2014-02-22 17:18:58 -08:00
Nick Winter
9eb8bb97f5 Trying out a Ctrl+Shift+B code beautifier option. 2014-02-22 16:58:54 -08:00
jmr0
1562b02fd1 still need this for rendering after a language switch 2014-02-22 19:32:43 -05:00
jmr0
34df232d4f fixing language selection disappearance when showing cached home view 2014-02-22 19:32:43 -05:00
Nick Winter
b3009ae909 Fixed #7 with a nice cast-end sound (just reverse of cast sound). 2014-02-22 15:26:38 -08:00
Nick Winter
702eca5c81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-22 12:04:10 -08:00
Nick Winter
72cfcf96ed Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels. 2014-02-22 12:01:05 -08:00
Scott Erickson
90ec07fc75 Fixed the camera to properly follow thangs again. Also tweaked the camera to center around the torso rather than the feet. 2014-02-22 11:31:31 -08:00
Scott Erickson
5c85f227c6 Removed the hover playback control. 2014-02-21 17:11:16 -08:00
Scott Erickson
90ea365dc6 Fixed the background to match the footer so that there's no white at the bottom of the screen when playing full screen. 2014-02-21 17:07:31 -08:00
Nick Winter
a60a3fa796 Fixed a syntax problem with the tr merge. 2014-02-20 17:47:38 -08:00
Gediz
822405f3f5 Just updated Turkish translation 
I've translated a little part. And planning to translate the rest of document tomorrow. I'm not so sciential about GitHub, do I have to do anything else after I propose it?
 2014-02-21 03:37:27 +02:00
Nick Winter
26f11f40a9 Fix for destroying level. 2014-02-20 17:21:15 -08:00
Nick Winter
4e5ecb0c9e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 17:21:03 -08:00
Scott Erickson
bf80b806c6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 17:06:25 -08:00
Scott Erickson
da0238ceba Switched the level view to grab opponent code from submittedCode instead of code. 2014-02-20 16:53:08 -08:00
Scott Erickson
7261f9960c Tweaked the name column size in the ladder view. 2014-02-20 16:52:46 -08:00
Nick Winter
06f1e284c9 Added comment highlighting icon. 2014-02-20 16:14:31 -08:00
George Saines
c8669d1f19 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 15:32:51 -08:00
George Saines
c11e1b897f adding comment text color 2014-02-20 15:32:40 -08:00
Nick Winter
edcb7f45b6 Merge pull request #395 from tips48/master 
Block Ctrl-S while playing
 2014-02-20 15:29:16 -08:00
George Saines
10b14e3d65 adding comment color 2014-02-20 15:28:20 -08:00
Scott Erickson
367b1c2007 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 15:13:44 -08:00
Scott Erickson
d9b86b84dc Fixed a bug with the coloring of avatars in the hud. 2014-02-20 15:13:15 -08:00
Scott Erickson
eccabd2dc5 Apparently you shouldn't boldify text in ACE. 2014-02-20 15:12:57 -08:00
Aidan Matzko
e3ab7a4d7e Block Ctrl-S while playing 2014-02-20 18:11:20 -05:00
Oviii_One
fc662f7f98 Update es.coffee 2014-02-20 23:57:19 +01:00
Oviii_One
e9c460c642 Update es.coffee 2014-02-20 23:56:22 +01:00
Nick Winter
91a641d3ab Updated Diplomat instructions and related locale files. 2014-02-20 14:52:42 -08:00
Scott Erickson
9c30b9f0d0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:49:17 -08:00
Scott Erickson
7ea9f8549f Fixed some scroll bars from appearing when they shouldn't. 2014-02-20 14:45:54 -08:00
Nick Winter
67e1959341 Merge pull request #393 from daegren/master 
Misaligned social share buttons
 2014-02-20 14:42:24 -08:00
Nick Winter
54276c2bca Merge pull request #389 from liyinkan/master 
Translate and refine Chinese simplified
 2014-02-20 14:39:39 -08:00
Nick Winter
81d3702b49 Merge pull request #388 from jcvno/patch-1 
Update names.coffee
 2014-02-20 14:38:43 -08:00
Nick Winter
02ca5db1d6 Merge pull request #387 from EagleTA/patch-1 
first step of translation
 2014-02-20 14:38:17 -08:00
Scott Erickson
48cf9a1443 Added a link to the tutorial level. 2014-02-20 14:31:33 -08:00
Scott Erickson
0198bd1ec5 Gave the tome popovers a bit of margin on the right so the scroll bars don't hang off the side. 2014-02-20 14:31:04 -08:00
Scott Erickson
8bbce727ee Made the goals view a little more opaque. 2014-02-20 14:26:04 -08:00
Scott Erickson
5bda4d5e5f Fixed the camera to not move around when the world is reset and being cast. 2014-02-20 14:25:39 -08:00
Nick Winter
3c651abe20 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8 Tweaks for ladder views. 2014-02-20 13:58:35 -08:00
Oviii_One
245fa11811 Update es.coffee 
Chanched a lot of words
 2014-02-20 22:26:37 +01:00
Nick Winter
284576521f Added fullscreen toggle to play with. 2014-02-20 13:19:49 -08:00
George Saines
7d4431d2f2 adding youtube link for instructional vid 2014-02-20 12:41:04 -08:00
Scott Erickson
63ef2860d6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:48 -08:00
Nick Winter
cc8a8cabd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02 Upgrading docs return value schema. Added button template for tutorial and screencast on ladder. 2014-02-20 11:57:04 -08:00
Scott Erickson
5cefb8fc30 Merge branch 'production' 2014-02-20 11:47:02 -08:00
Scott Erickson
8184d0b9d3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:43:46 -08:00
Scott Erickson
6b2e0bc364 Changed how the goal manager handles arriving at goals and figuring out the how many requirement. 2014-02-20 11:43:35 -08:00
Scott Erickson
251d483eaa Tweaked some level view styling. 2014-02-20 11:42:19 -08:00
Michael Schmatz
6d6cac7309 Various interface tweaks 2014-02-20 10:56:32 -08:00
Michael Schmatz
a2b811d52f Added visual feedback for simulation buttons 2014-02-20 10:40:19 -08:00
Nick Winter
bce184b9da Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 10:39:19 -08:00
Nick Winter
f81e0c85ef Fixes for popover behavior. 2014-02-20 10:39:16 -08:00
Michael Schmatz
cb0c22f0c9 Replaced rank button with button going to ladder page 2014-02-20 10:14:25 -08:00
Michael Schmatz
7c5192820f Put more security on the session submissions and improved simulation status rendering 2014-02-20 09:44:44 -08:00
Michael Schmatz
99de854536 Put in link to detail view 2014-02-20 08:39:27 -08:00
Michael Schmatz
e593fd23b4 Improved interface for simulating games 2014-02-20 08:06:14 -08:00
David Mills
79a3bea575 Misaligned social share buttons 2014-02-19 22:04:13 -05:00
Nick Winter
f85a55c8b7 Cast -> Cast Spell 2014-02-19 18:20:21 -08:00
Nick Winter
7c2960f2ce Improved visibility of cast button progress overlay. 2014-02-19 18:04:37 -08:00
Nick Winter
0469c918db Make dead dudes look deader. Eagerly destroy ThangListEntryView popovers, Highlander-style. Announce eternal brunch. 2014-02-19 17:02:39 -08:00
Nick Winter
01374d63c4 Better comment formatting. Manual cast by default on Project DotA. 2014-02-19 14:00:54 -08:00
Scott Erickson
26af051cca Set up indie sprites and their avatars to use the new colorConfig property. 2014-02-19 13:43:44 -08:00
Nick Winter
dcf7a0d1fd Re-enabled Olark. 2014-02-19 12:43:25 -08:00
Scott Erickson
878d1e4098 Fixed the placement of the music note in the playback view. 2014-02-19 12:27:49 -08:00
Scott Erickson
613e7848dc Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams. 2014-02-19 11:45:29 -08:00
Scott Erickson
86f94cb5fd Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading. 2014-02-19 11:42:33 -08:00
Scott Erickson
e85f5c7e6b Fixed modals not being able to be opened after restarting the level when no scripts are running. 2014-02-19 11:15:36 -08:00
Scott Erickson
0bf772d745 Changing the files view to replace files when there are name collisions. 2014-02-19 10:55:15 -08:00
Scott Erickson
bdbebe886c Added a log for figuring out what session is causing NaNs. 2014-02-19 08:19:30 -08:00
Scott Erickson
ece08ba366 Fixed the matches order on the ladder team page. 2014-02-19 08:19:13 -08:00
Yinkan Li
a0acdba619 translate and refine Chinese simplified 
translate:
employers

refine:
coppa_why
 2014-02-19 21:54:47 +08:00
Yinkan Li
786ccf476d translate and refine Chinese simplified 
translate:
send_password
create_account_title

refine:
slogan
no_mobile
play
 2014-02-19 21:49:08 +08:00
Justin Cano
059c50e47d Update names.coffee 2014-02-19 03:03:43 -08:00
EagleTA
40ef21571c first step of translation 
just trying the environment for translation
 2014-02-19 00:22:23 +02:00
Nick Winter
a8794f4e7e Merged 2014-02-18 12:55:18 -08:00
Nick Winter
1c82fc5bb0 Fix for opponent teams not working. 2014-02-18 12:54:47 -08:00
Michael Schmatz
dc70fec977 Merge pull request #385 from codecombat/redis 
Merge redis into master
 2014-02-18 12:53:57 -08:00
Scott Erickson
27fb2ec37d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 12:27:56 -08:00
Scott Erickson
f383e5b9fa Fixes for the ladder team view. 2014-02-18 12:27:10 -08:00
Nick Winter
f54fcfe6c0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 11:49:15 -08:00
Nick Winter
636b1bb30d Fixed home wizard scale. 2014-02-18 11:48:36 -08:00
Michael Schmatz
d02d09ae36 Simulation fixes 2014-02-18 11:46:14 -08:00
Scott Erickson
5a436ce10b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 11:41:29 -08:00
Scott Erickson
d2d2099c4a Fixing a bug with the tome problem view. 2014-02-18 11:39:11 -08:00
Scott Erickson
cacf6539c1 Working on the ladder and team views. 2014-02-18 11:38:49 -08:00
Nick Winter
9cdc07d07c Fixed spell palette doc duplication. 2014-02-18 11:23:01 -08:00
George Saines
c8679c37de Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 10:28:04 -08:00
George Saines
a44f8756ae hour of code trivial fix 2014-02-18 10:28:00 -08:00
Nick Winter
d45f67a8c3 Fixed some popover and modal layout and bugs. 2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9 Working on the ladder and team views. 2014-02-17 17:42:41 -08:00
Nick Winter
6f0ed9040a Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline. 2014-02-17 17:38:49 -08:00
Martin Delille
d7edf84896 translate wizard settings 2014-02-17 22:34:02 +01:00
Nick Winter
3c08f8a5eb Added wizard settings i18n tags. 2014-02-17 13:08:37 -08:00
Nick Winter
cc4c0f0e85 Exported a few new en i18n tags to the other languages. 2014-02-17 12:42:04 -08:00
Nick Winter
9558745216 Saving some uncommented i18n tags. 2014-02-17 12:40:40 -08:00
Nick Winter
6d87b422f6 Merge pull request #372 from QelioX/patch-1 
ru.cofee small changes
 2014-02-17 12:26:19 -08:00
Nick Winter
58028259c4 Merge pull request #381 from alireza68/patch-1 
Update fa.coffee
 2014-02-17 12:25:32 -08:00
Nick Winter
a4f4016c73 Updating i18n tags for new contribute summaries. 2014-02-17 12:23:06 -08:00
Nick Winter
dcb6f0d280 Merge branch 'master' of git://github.com/iamawong/codecombat into iamawong-master 2014-02-17 11:56:03 -08:00
Nick Winter
af510c7cc7 60 FPS and support for independent world/surface frame rates. 2014-02-17 11:53:52 -08:00
Andrew Wong
b1aa65833a Consolidated text on contribute and removed padding to make the 
page not as spread out.

Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
 2014-02-17 10:24:29 -08:00
alireza68
88b4055af3 Update fa.coffee 
I'll translate the rest soon
 2014-02-17 21:17:56 +03:30
Nick Winter
1b0f15b5f3 More LevelLoader defense. 2014-02-17 08:15:53 -08:00
Nick Winter
c19c8f3912 Fix for LevelLoader, selection udpating, and non-documentation tome popovers. 2014-02-16 18:29:24 -08:00
Nick Winter
2c41d403bc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-16 15:30:07 -08:00
Nick Winter
e3824d7698 Many improvements to the spell palette. 2014-02-16 15:30:00 -08:00
Scott Erickson
bbe5399a97 Fixed #370 2014-02-16 12:51:20 -08:00
Nick Winter
1f7cea4e54 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-15 17:38:50 -08:00
Nick Winter
f94456295e God needs no options. 2014-02-15 17:38:45 -08:00
Scott Erickson
5bbe829586 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-15 17:36:40 -08:00
Scott Erickson
be83b5420f Fixed the goals view, which wasn't being properly shown. 2014-02-15 17:36:27 -08:00
Nick Winter
addf4ca245 Improved Simulator memory and performance. 2014-02-15 17:29:54 -08:00
Nick Winter
f3b58a9416 Merged. 2014-02-15 15:45:53 -08:00
Nick Winter
3c7cac8ba9 Trying to do some memory cleanup. 2014-02-15 15:44:45 -08:00
Scott Erickson
8f938bf6fc Scrolling with the mouse now zooms based on mouse position. 2014-02-15 13:45:16 -08:00
Esh2349
185963f999 ru.cofee small changes 2014-02-16 00:20:59 +03:00
Scott Erickson
72712a349c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-15 12:07:28 -08:00
Scott Erickson
ac08490e86 Reworked the multiplayer modal a bit. 2014-02-15 12:06:47 -08:00
Scott Erickson
663a09ed4b Spell list updates based on the existence of thangs now. 2014-02-15 09:22:13 -08:00
Michael Schmatz
c418e282ae Put in pairwise simulation button 2014-02-14 16:53:37 -08:00
Nick Winter
fdf1e21e72 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 16:52:54 -08:00
Nick Winter
50f683534f Support for seeing this.now() in spell palette. 2014-02-14 16:52:50 -08:00
Scott Erickson
597ace25cc Fixed the spell list tab entry view popover to not popover when using the dropdown. 2014-02-14 16:08:01 -08:00
Scott Erickson
a25b1be916 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf Fixed various bugs in simulator and put in home view 2014-02-14 15:50:42 -08:00
Scott Erickson
d55e4cd624 Made sure session objects are loaded from the server fresh, no caching. 2014-02-14 15:35:54 -08:00
Michael Schmatz
643cafc89f Refactored level handler and level session schema 2014-02-14 14:55:30 -08:00
Scott Erickson
13caae2690 Fixed the massive memory leak. 2014-02-14 14:10:55 -08:00
Scott Erickson
a8c483a59f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 14:10:35 -08:00
Scott Erickson
55fcad2cc3 Fixed a couple bugs with the wizard. 2014-02-14 14:10:28 -08:00
Scott Erickson
7faa401177 Trying to improve memory by clearing out all properties of destroyed objects. 2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084 Refactored destroy functions to have super be the last thing. 2014-02-14 10:57:47 -08:00
Michael Schmatz
7cec574e17 Started simulator refactor 2014-02-14 10:49:19 -08:00
Scott Erickson
693fa06afb Fixed a bug in the competitor code session setting when the player has no code yet. 2014-02-14 10:38:20 -08:00
Michael Schmatz
2b1079912a Merge pull request #368 from gintau/master 
Revsing Traditional Chinese translation and adding translation of "about".
 2014-02-13 21:06:57 -08:00
Nick Winter
da866a418c Fixed cast options clicking. 2014-02-13 17:43:42 -08:00
Michael Schmatz
fc76846aa6 Stopped parsing ladder as int 2014-02-13 17:34:31 -08:00
Michael Schmatz
db0695513e Implemented reverse sorting of backbone collection 2014-02-13 17:30:59 -08:00
Michael Schmatz
6011ac0df4 Changed subscription frequency to prevent multiple score registrations 2014-02-13 17:19:43 -08:00
Michael Schmatz
ca7376b794 Worked around mongoose toObject 
Also tried elementary memory leak fix
 2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628 Set up the ladder to be able to compete against other sessions. 2014-02-13 16:42:35 -08:00
Nick Winter
9a835ffc0a Re-enabled spell tab entry docs. 2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e Added continuous simulation and fix for "no team" 2014-02-13 15:59:40 -08:00
Scott Erickson
9bea226677 Fixed the ladder table. 2014-02-13 15:57:07 -08:00
Scott Erickson
8775e86161 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 15:54:01 -08:00
Scott Erickson
97b4e7661d Level loader now loads session based on the team property in the url. 2014-02-13 15:51:41 -08:00
Scott Erickson
9327d420bc Fixed a bug. 2014-02-13 15:51:18 -08:00
Scott Erickson
b8051689b3 Fixed the goal manager from polluting the goals in the level with the isPositive property. 2014-02-13 15:50:53 -08:00
Michael Schmatz
d6e99273bc Quick fix for team not being detected 2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba Merged in Scott's changes manually 2014-02-13 15:14:10 -08:00
Scott Erickson
1d3e013cc6 Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/views/play/ladder_view.coffee
 2014-02-13 15:11:11 -08:00
Scott Erickson
32337df156 Trimmed down the ladder view for now. 2014-02-13 15:09:40 -08:00
Michael Schmatz
480de71eb6 Leaderboard is starting to work 2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395 Scoring queues mostly working 2014-02-13 12:59:24 -08:00
Ting-Kuan
803770a080 Revise the phrasing of exisitng translations. 
Translate "about".
 2014-02-13 14:32:08 -05:00
Nick Winter
aa282c3a35 Updates for formatting palette docs. 2014-02-13 11:18:20 -08:00
Scott Erickson
2b742da9e4 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 10:38:43 -08:00
Michael Schmatz
14530b779a Refactored scoring submissions, added beginnings of spectator view 2014-02-13 10:37:44 -08:00
Scott Erickson
2e280fad6b Set up the multiplayer modal with a submit button for the ladder queue. 2014-02-13 10:16:27 -08:00
Scott Erickson
850942b895 Fixed the chat layout. 2014-02-13 10:10:20 -08:00
Scott Erickson
df2171e921 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level_view.coffee
 2014-02-13 10:04:42 -08:00
Scott Erickson
23964abee9 Set up the goal manager to only use goals from the level.goals property, rather than from scripts. 2014-02-13 09:26:42 -08:00
Nick Winter
9ac0939bb8 Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again. 2014-02-13 09:26:21 -08:00
Ting-Kuan
559e0b7aa0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 09:21:49 -05:00
Ting-Kuan
ba405b8fed Revise zh-tw translations. 2014-02-13 09:21:40 -05:00
Nick Winter
adaedc240c Fixed cast button click bug. 2014-02-12 20:45:29 -08:00
Nick Winter
04abe36837 Don't need that Docs import. 2014-02-12 20:36:17 -08:00
Nick Winter
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Scott Erickson
8176e2258f Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now. 2014-02-12 16:20:25 -08:00
Scott Erickson
f3489a6c2f Added a 'stop' button for viewing end animations on thang types. 2014-02-12 16:18:25 -08:00
Nick Winter
b7be08ac19 Fixed one more leak. 2014-02-12 13:43:17 -08:00
Nick Winter
cdf268ce4f Merged. 2014-02-12 13:10:58 -08:00
Nick Winter
5655084981 Fixed a ton more leaks. 2014-02-12 12:41:41 -08:00
Scott Erickson
abedd07b04 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 12:27:12 -08:00
Scott Erickson
2f48925e86 Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values. 2014-02-12 12:27:02 -08:00
Michael Schmatz
dae788905a Merge pull request #362 from cassiocardoso/patch-1 
Finished pt-BR translation.
 2014-02-12 11:38:14 -08:00
Cassio Cardoso
32db5244b5 Finished pt-BR translation. 2014-02-12 16:15:21 -02:00
Scott Erickson
59f0d8a93e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 09:55:35 -08:00
Scott Erickson
533069dba8 Fixed a bug with the goals. 2014-02-12 09:55:19 -08:00
Michael Schmatz
ad8a8e00e8 Merge pull request #354 from justin-/fix/diplomat-template 
Add indentation to fix template engine output
 2014-02-12 09:09:24 -08:00
Michael Schmatz
a0b02c41fa Merge pull request #351 from liyinkan/master 
Update Chinese (simplified)
 2014-02-12 08:51:08 -08:00
Michael Schmatz
5c7a471667 Merge pull request #349 from cassiocardoso/patch-1 
Update pt-BR.coffee
 2014-02-12 08:47:30 -08:00
Scott Erickson
bdbb1710eb More memory fixes. 2014-02-11 16:09:44 -08:00
Michael Schmatz
1a2fa68473 Merge branch 'feature/task-queue' 
Conflicts:
	app/views/play/level/tome/spell.coffee
 2014-02-11 15:58:38 -08:00
Scott Erickson
71b6ebf8eb More memory fixes. 2014-02-11 15:47:59 -08:00
Michael Schmatz
76b949ac1e Various changes before merge 2014-02-11 15:47:06 -08:00
Scott Erickson
d9f4594c9f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 15:39:02 -08:00
Scott Erickson
ac49e5eec1 More memory fixes. 2014-02-11 15:38:36 -08:00
Michael Schmatz
b29ab56fe2 Fixed simulation goals 2014-02-11 15:26:57 -08:00
Nick Winter
c29e4d6c9c Stupid casting sound effect. 2014-02-11 15:05:54 -08:00
Scott Erickson
2a19da5ba2 More memory fixes. 2014-02-11 14:58:45 -08:00
Nick Winter
6505064fb6 Slightly less aggressively preload workers. 2014-02-11 14:38:47 -08:00
Scott Erickson
b904e1f939 More memory fixes. 2014-02-11 14:24:06 -08:00
Michael Schmatz
a6b15663a4 Merge branch 'master' into feature/task-queue 
Conflicts:
	app/views/play/level/tome/spell.coffee
 2014-02-11 13:10:59 -08:00
Michael Schmatz
cef7e89326 Added goal states listener 2014-02-11 13:09:53 -08:00
Michael Schmatz
58bfddeebf Background simulation is now showing signs of life! 2014-02-11 12:58:23 -08:00
Scott Erickson
47eeda5af4 More memory fixes. 2014-02-11 12:54:08 -08:00
Scott Erickson
7ddb97fa22 More memory fixes. 2014-02-11 12:32:12 -08:00
Scott Erickson
b0a74e5b1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:24:25 -08:00
Nick Winter
2d9606a8eb includeFlow only on the currently selected Thang. 2014-02-11 12:16:53 -08:00
Scott Erickson
166bb6db45 More memory cleanup. 2014-02-11 12:10:21 -08:00
Nick Winter
d22c716dce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:02:53 -08:00
Scott Erickson
aa4cc8d9c4 Added a whole bunch of view teardown. 2014-02-11 12:02:49 -08:00
Nick Winter
d2a7bfd11c Added GoldView. 2014-02-11 12:02:27 -08:00
Scott Erickson
7ad6faa0c0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 11:31:13 -08:00
Scott Erickson
8ff38a724d Fixing some event tearing down. 2014-02-11 11:31:02 -08:00
Scott Erickson
21c93e85ed Fixed a bug with tearing down angels. 2014-02-11 11:30:47 -08:00
Michael Schmatz
612a374b3f Progress on simulator 2014-02-11 11:27:39 -08:00
Nick Winter
f9bb6de3ff Typoooo 2014-02-11 09:33:35 -08:00
Nick Winter
c61e2496d8 Trying a faint gold coin noise when you kill something worth money. 2014-02-11 09:28:26 -08:00
Michael Schmatz
c0d43ea32b Merge branch 'master' into feature/task-queue 2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3 Simulation button 2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d God prepares Workers for Angelic consumption ahead of time. 2014-02-10 17:09:19 -08:00
Michael Schmatz
0cbf669474 Added teamSpells persistence 2014-02-10 16:31:21 -08:00
Michael Schmatz
cc3b93a0f8 Transfer teamSpellMap from tome to levelBus 2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 14:50:35 -08:00
Nick Winter
9507be4c9a Turned off includeFlow for horrific performance reasons on project-dota for now. 2014-02-10 14:19:54 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Scott Erickson
9f5b51da19 Made goals for other teams invisible. 2014-02-10 12:49:38 -08:00
Scott Erickson
d95b66df0a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 12:12:49 -08:00
Scott Erickson
97d823cc48 Made the LatestVersionReferenceNode use projection results. 2014-02-10 12:12:22 -08:00
Nick Winter
26016f48e2 Skip protectAPI for now. Defer worker termination until after it reports stats. 2014-02-09 18:44:31 -08:00
justin
719dbea3bf Add indentation to fix template engine output 2014-02-09 12:31:15 -05:00
Yinkan Li
6ced32a1de update Chinese (simplified) 
update ‘…’ to ‘……’
add ‘ ’ before and after for each english in Chinese
add ‘。’ for some value
add translation value for ‘email_notifications_description’
update ‘customize_wizard’
update ‘:’ to ‘：’
update ‘!’ to ‘！’
 2014-02-09 16:43:13 +08:00
Cassio Cardoso
8d383bc7ea Update pt-BR.coffee 
Work in progress.
 2014-02-08 23:25:46 -02:00
Nick Winter
eb3f57ce34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-08 15:32:23 -08:00
Nick Winter
f2bcf019fa Should update code when other player changes it again. 2014-02-08 15:32:14 -08:00
Kushal
40eead0341 use https when linking to wikipedia 
Wikipedia supports (but does not yet require) https. This will change in the future but it will not hurt to switch to https ourselves :) 

https://blog.wikimedia.org/2013/08/01/future-https-wikimedia-projects/
 2014-02-08 16:31:52 -06:00
Scott Erickson
74ddb1135a Tweaked collision to make missiles not collide with one another. 2014-02-08 12:27:56 -08:00
Nick Winter
22433b14ae Tweaked about avatar formatting. 2014-02-08 10:30:28 -08:00
Nick Winter
2e7a1fd0ef Working on the contribute pages -- #314. 2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e Starting to add contributor avatars. 2014-02-07 18:38:17 -08:00
Nick Winter
b2bf4db222 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-07 16:47:38 -08:00
Scott Erickson
0365998658 Began work on a ladder view. 2014-02-07 15:51:05 -08:00
Michael Schmatz
73b0d98538 Merge branch 'master' into feature/task-queue 
Conflicts:
	server/commons/mapping.coffee
 2014-02-07 14:31:34 -08:00
Nick Winter
11c63d262d Merge pull request #347 from monetita/patch-1 
Update he.coffee
 2014-02-07 13:59:27 -08:00
Scott Erickson
72b1b989d8 Tweaked the world to return points that are not 0,0, as that's what the world reports non-existent thangs at. 2014-02-07 11:49:16 -08:00
Scott Erickson
c3bd9cef80 Merge remote-tracking branch 'origin/master' 2014-02-07 11:05:43 -08:00
Nick Winter
2efb9a0ea1 Simple team switch links in multiplayer menu. 2014-02-07 10:51:21 -08:00
monetita
89f6282d50 Update he.coffee 2014-02-07 19:12:46 +02:00
Nick Winter
86de427204 Messing with team setting. 2014-02-06 17:31:08 -08:00
Scott Erickson
ee24263232 Added handling for thang type goesTo animation properties. 2014-02-06 17:00:02 -08:00
Nick Winter
2a3e47b08f Using playable team config from Alliance system. 2014-02-06 16:05:41 -08:00
Michael Schmatz
b93b5d3062 Added xavismeh to french translators 2014-02-06 14:42:56 -08:00
Michael Schmatz
7dcc351e75 Merge pull request #346 from xavismeh/i18n-fr 
Improved FR translation
 2014-02-06 14:39:42 -08:00
Nick Winter
642d88fe93 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 14:00:31 -08:00
Nick Winter
6af2d34f59 Fixed a ton of memory leaks, but not all of them. 2014-02-06 14:00:27 -08:00
Scott Erickson
1e184c9590 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 13:23:04 -08:00
Scott Erickson
6484f787c5 Tweaked layer order updating to fallback to sorting by x if y and z are the same. 2014-02-06 13:22:47 -08:00
Michael Schmatz
721ca5f9ca Credits for FR translation 
Merged in xavismeh's translation changes

Dummy credits commit
 2014-02-06 20:57:30 +01:00
Michael Schmatz
f2b4ffb123 Merged in xavismeh's translation changes 2014-02-06 11:20:59 -08:00
Nick Winter
b696a3f188 Don't count on Olark being there. 2014-02-06 11:16:57 -08:00
Scott Erickson
332ea0df2c Fixed the level editor save view knowing if the level has changes to save. 2014-02-06 10:30:49 -08:00
Scott Erickson
f3d1a43bbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 10:19:01 -08:00
Nick Winter
ea99a7b139 Turned off Olark for now. 2014-02-06 10:17:54 -08:00
Scott Erickson
9fd12b15bf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 09:29:13 -08:00
Nick Winter
847faf4d10 Possibly hooked up scaleFactorX and scaleFactorY. 2014-02-06 08:27:49 -08:00
Nick Winter
2a8d0eb694 Updates for ThangsList refreshing its Thangs. 2014-02-05 20:08:28 -08:00
Nick Winter
cc3465fd6f Improvement for errors updating action of non-existent Thangs in HUD. 2014-02-05 15:54:34 -08:00
Scott Erickson
6728712064 Fixed the thang components edit view in both locations now. 2014-02-05 15:39:08 -08:00
Scott Erickson
25e2895b64 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-05 15:18:23 -08:00
Nick Winter
cec52d70f3 Improvements to how Tome subviews manage Thang updates. 2014-02-05 15:16:59 -08:00
Scott Erickson
7041a12244 Fixed display of actions using container in the thang editor. 2014-02-05 15:16:07 -08:00
Scott Erickson
f900009770 Actions without a container or animation to show don't show anything. 2014-02-05 14:57:05 -08:00
Scott Erickson
88beb4db5f Fixed the positioning of the thang components view in the thang editor. 2014-02-05 14:39:56 -08:00
Scott Erickson
323d3570ec Fix for the dynamic programming level of project dota. 2014-02-05 13:39:41 -08:00
Scott Erickson
966155593c Various fixes. 2014-02-05 11:03:32 -08:00
Michael Schmatz
5c328d09f5 Added scoring and queue modules 2014-02-05 09:39:14 -08:00
Michael Schmatz
a3b17c7d86 Put in basic client-side routes and created server side scoring routing file 2014-02-04 10:07:14 -08:00
Scott Erickson
6533196bc7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-03 14:01:30 -08:00
Scott Erickson
81912d25d1 Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard. 2014-02-03 14:01:20 -08:00
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Glen De Cauwsemaecker
e920054695 Resolved category-issues for the da.coffee language file. 2014-02-03 13:04:45 +01:00
Glen De Cauwsemaecker
0ead214584 Merge https://github.com/Einar-Rasmussen/codecombat 2014-02-03 12:59:00 +01:00
Einar Rasmussen
5d0084e95d Update da.coffee 
Rådmand -> rådgiver since counselor != chancellor
 2014-02-03 11:35:34 +00:00
Scott Erickson
09bb669439 Fixed #300 2014-02-02 16:51:22 -08:00
Einar Rasmussen
666a85e986 Update da.coffee 
Finished 'classes' + other minor edits.
 2014-02-02 20:33:54 +00:00
Nick Winter
a5065d273d More for #133. 2014-02-02 10:42:18 -08:00
Nick Winter
068f798d58 Fixed bugs in Tome spell views swapping. 2014-02-02 10:26:42 -08:00
Nick Winter
a28ce55793 Localization quote escape typo. 2014-02-02 10:17:23 -08:00
Einar Rasmussen
415b49b661 Update da.coffee 2014-02-02 12:49:24 +00:00
Daniel
517adc9314 Update es-ES.coffee 
Hi!
I have translated the remaining lines and I also have modified a few lines that had some minor grammar mistakes. All the text is translated.
Cheers!
 2014-02-02 00:31:09 +01:00
Nick Winter
f8f3bdd1e3 Improved error alert space usage. 2014-02-01 13:56:55 -08:00
Einar Rasmussen
b602691748 Merged mine and sorsjens versions. 2014-02-01 22:21:15 +01:00
Nick Winter
546914052d A few tweaks to wizard floating. 2014-02-01 11:02:20 -08:00
Nick Winter
9a1afd6772 Merge pull request #320 from vanous/cz-translation 
raw translation to czech finished
 2014-02-01 10:57:10 -08:00
vanous
d2fb1cfa11 raw translation to czech finished 
it will need fine tuning, checking within context and more
 2014-02-01 19:38:47 +01:00
Nick Winter
663c48c814 Merge pull request #319 from sorsjen/patch-1 
Update da.coffee
 2014-02-01 08:41:44 -08:00
Nick Winter
33bdce8a63 Merge branch 'locale' of git://github.com/HiroP0/codecombat into HiroP0-locale 2014-02-01 08:35:52 -08:00
Einar Rasmussen
582bb15862 Update da.coffee 
Line 173-181
 2014-02-01 16:25:50 +00:00
Nick Winter
b502c24ece A few updates to the contributors lists. 2014-02-01 08:22:26 -08:00
sorsjen
a2e64860dd Update da.coffee 
Added translated strings
 2014-02-01 16:32:55 +01:00
Nick Winter
7ba6e5d0f2 Fixed #316. 2014-01-31 16:32:46 -08:00
Nick Winter
ee7d8a06fe A few SpellView / debugger fixes. 2014-01-31 16:16:59 -08:00
Nick Winter
632316314e Don't include flow for invisible methods, don't include protectAPI for non-writable methods. 2014-01-31 14:51:06 -08:00
Nick Winter
4d891ee7fa Fixed sprite offset positioning bug. 2014-01-31 13:28:42 -08:00
Michael Glass
1df1a2499d Extended German translation (about, minor fixes) 2014-01-31 13:16:58 -08:00
Nick Winter
8d81d75d2b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-31 10:50:22 -08:00
Nick Winter
2e9386ab70 Fix for fix for #133. 2014-01-31 10:50:15 -08:00
Michael Schmatz
ce48411ddb Added worker_world.coffee 2014-01-31 10:40:01 -08:00
Nick Winter
cba7807053 Possibly handling #133. 2014-01-31 10:26:24 -08:00
Nick Winter
72a3e82404 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-31 10:21:35 -08:00
Nick Winter
6303d28554 Refactored bobbing. 2014-01-31 10:21:32 -08:00
Nick Winter
d46716eec4 Merge pull request #299 from p-buse/eventcheck-regexp 
Added Regular Expression Event Checker
 2014-01-31 07:58:13 -08:00
vanous
1758246b7b small changes 2014-01-31 09:02:18 +01:00
vanous
c88ad87332 some typo corrections 2014-01-31 09:01:03 +01:00
Nick Winter
d79d66c175 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 16:36:40 -08:00
Nick Winter
6e40fa09a6 Updated some Bootstrap event names. 2014-01-30 16:36:36 -08:00
Scott Erickson
3093b59588 Fixed #296 2014-01-30 16:25:06 -08:00
Scott Erickson
46d1d10abe Removed an unnecessary fat arrow. 2014-01-30 16:20:58 -08:00
Scott Erickson
c376ba6841 Fixed #303 2014-01-30 16:19:55 -08:00
Scott Erickson
1b75ab15db Added some error handlers for messed up thang type configs. 2014-01-30 16:17:41 -08:00
Scott Erickson
591a8e9ab5 Made the revert modal reload the page if anything was reverted. 2014-01-30 15:38:49 -08:00
Scott Erickson
6d5e9d13c9 Changed the links for artisan documentation to the new wiki pages. 2014-01-30 15:29:20 -08:00
Scott Erickson
0415e8ea4c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 15:27:24 -08:00
Scott Erickson
3ca6a5709b Fixed a bug where systems tabs would change components tabs. 2014-01-30 15:27:10 -08:00
Scott Erickson
371bd9f41c Tweaked tab styling on level editor. 2014-01-30 15:22:01 -08:00
Michael Schmatz
fe89c9fbad Fix for #290 2014-01-30 15:03:55 -08:00
Scott Erickson
5f81eb670b Some styling fixes, removed commented out stuff. 2014-01-30 14:37:33 -08:00
Nick Winter
bd45930071 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 14:22:06 -08:00
Nick Winter
7dcbbb983f Added missing mixins and indoor wall handling. 2014-01-30 14:21:58 -08:00
Glen De Cauwsemaecker
eea541aa1c Merge branch 'cz-translation' of https://github.com/vanous/codecombat 2014-01-30 22:22:28 +01:00
Scott Erickson
210235553e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:19:44 -08:00
Scott Erickson
5429e8ad2a Cleaning up editors in the systems and components tabs. 2014-01-30 12:19:25 -08:00
Scott Erickson
231e8582fa Added some basic control tips to the thang components edit view. 2014-01-30 12:07:01 -08:00
Nick Winter
b09d1b1c74 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:03:35 -08:00
Nick Winter
a6bfb6770c Matched gradient background colors in HUD to ThangAvatarView. 2014-01-30 12:03:33 -08:00
Scott Erickson
56576dd1a5 Fixed the styling for editing components in the level editor. 2014-01-30 12:01:43 -08:00
Scott Erickson
827b5a3756 Fixed the world select modal. 2014-01-30 11:55:46 -08:00
vanous
0d453f2860 translated about and classes to cz 2014-01-30 20:52:24 +01:00
Scott Erickson
ed1b5c6560 Fixed slowness to editing settings for large levels. 2014-01-30 11:40:24 -08:00
Scott Erickson
65f74e9587 Improved the navbars in the level editor. 2014-01-30 11:37:40 -08:00
Paul Buser
8881a880ea Merge branch 'master' of https://github.com/codecombat/codecombat into eventcheck-regexp 2014-01-29 23:57:47 -05:00
Nick Winter
067d3abd75 Improved handling of spawning Programmables in Tome after the fact. 2014-01-29 16:26:08 -08:00
Glen De Cauwsemaecker
67e575065b quick-fix for the de.coffee locale file 2014-01-29 22:54:23 +01:00
Glen De Cauwsemaecker
94328f202e Merge branch 'locale' of https://github.com/HiroP0/codecombat 2014-01-29 22:52:33 +01:00
Glen De Cauwsemaecker
ca1bb6a1ec Merge branch 'cz-translation' of https://github.com/vanous/codecombat 2014-01-29 22:36:55 +01:00
vanous
35397a356c fixing typo, caused by web editor 2014-01-29 22:28:04 +01:00
vanous
ea458a0edc fixing typo, caused by web editor 2014-01-29 22:27:22 +01:00
vanous
bfcf5b7e39 Halfway through czech translation 2014-01-29 22:25:33 +01:00
Nick Winter
e0108a3166 A few fixes for the Bootstrap 3 migration. Fixed #280. 2014-01-29 12:18:37 -08:00
Scott Erickson
f065406cf5 Merge branch 'feature/bootstrap3' 2014-01-29 10:40:34 -08:00
Scott Erickson
bac4fbcd7d Fixed naming. 
Improved tome updating of programmable spell thangs.
 2014-01-29 10:14:12 -08:00
Nick Winter
01efb2f92b Improvements to SpellDebugView hover. 2014-01-29 08:38:37 -08:00
Michael Glass
04f0aa9473 Fixed some German langues issues. Translated good deal of legals page. 2014-01-28 21:20:25 -08:00
Nick Winter
c3f5c1c334 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-28 15:24:12 -08:00
Nick Winter
fb7739727c Updates for Aether's protectAPI stuff. 2014-01-28 15:24:08 -08:00
vanous
58569cdd2c Misunderstood the first translation line. Fixed. 2014-01-28 22:53:55 +01:00
vanous
c8260e97ae Correcting typo 
Correcting typo causing The Travis CI build could not complete due to an error
 2014-01-28 22:48:12 +01:00
vanous
470b06d888 Initial work at czech translation 2014-01-28 22:25:58 +01:00
Scott Erickson
065a1c4c27 New editor layout. 2014-01-28 13:16:50 -08:00
Scott Erickson
407d2c7768 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:33 -08:00
Scott Erickson
6e9f93d299 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:17 -08:00
Scott Erickson
55ea4d86e4 Made the level editor layout more stretchy. 2014-01-28 12:27:11 -08:00
Scott Erickson
00872f80f9 Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang. 2014-01-28 11:54:16 -08:00
Scott Erickson
e2db421d1c Fixed cloning. 2014-01-28 09:22:23 -08:00
Scott Erickson
9336a637ce Merge branch 'master' into feature/bootstrap3 2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188 Systems part of #266. 2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1 Component part of #266. 2014-01-27 21:06:27 -08:00
Scott Erickson
0b7224e2f4 Tweaked the home page button. #279 2014-01-27 19:11:39 -08:00
Scott Erickson
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
43193aab4a Removed a buggy transition. 2014-01-27 18:58:27 -08:00
Scott Erickson
fa8928c187 Fixed the wizard sprite on the home page again. 2014-01-27 18:55:25 -08:00
Scott Erickson
a239ba3465 Removed some more .controls from forms. 2014-01-27 18:50:03 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Scott Erickson
096d318e96 Fixed #283 2014-01-27 18:05:39 -08:00
Scott Erickson
d6e21192f5 Fixed #278 2014-01-27 16:59:34 -08:00
Scott Erickson
9c7ac3dfdc Fixed the top nav height. 2014-01-27 16:20:13 -08:00
Scott Erickson
22e6942165 Fixed account settings page. 2014-01-27 16:07:17 -08:00
Scott Erickson
056b81115d Fixed profile page. 2014-01-27 11:45:24 -08:00
Scott Erickson
26d6c2dc5b Fixed the new model modal in search. 2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e Fixed the progress bar for loading pages. 2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b Merge branch 'master' into feature/bootstrap3 2014-01-27 11:03:04 -08:00
Scott Erickson
fa3ab69dab Level preview now loads from backups so that brunch reloads don't cause the preview to break. 2014-01-27 11:00:36 -08:00
Scott Erickson
36a46a07f2 Updated the names file. 2014-01-27 10:50:58 -08:00
Scott Erickson
9206dda3ba Systems now autosave too in the level editor. 2014-01-27 10:39:16 -08:00
Scott Erickson
8768d710ba Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-27 10:06:45 -08:00
Scott Erickson
f1518a28e2 Fixed the camera when locked to never go to a new target. 2014-01-27 10:06:34 -08:00
Michael Schmatz
bf6e91883e Fixed es-ES.coffee compilation errror 2014-01-27 09:00:03 -08:00
Michael Schmatz
668ba81e78 Merge pull request #285 from DanielRodriguezRivero/patch-2 
Update es-ES.coffee
 2014-01-27 08:59:28 -08:00
Michael Schmatz
298057ae58 Merge pull request #288 from atlantisguru/patch-1 
Updated hu.coffee
 2014-01-27 08:30:22 -08:00
Scott Erickson
692b24dde0 #267 2014-01-26 15:59:33 -08:00
Scott Erickson
26e9dc3b09 Fixed system order in the level view. 2014-01-26 15:37:32 -08:00
Scott Erickson
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Scott Erickson
ae2bb625c8 Refactored storage module. 2014-01-26 14:44:08 -08:00
Nick Winter
47c78d1758 Revamped SpellToolbarView. 2014-01-25 15:11:29 -08:00
Bubori Attila
e8c42b8d2b Updated hu.coffe 
Editor section translated to hungarian.
 2014-01-25 23:27:44 +01:00
Nick Winter
d262dfaca7 A few visual tweaks to the spell view flow. 2014-01-24 17:48:11 -08:00
Nick Winter
45329df4cd Temp fix for debugger bug on a relevant session. 2014-01-24 13:46:51 -08:00
Nick Winter
6fa38bd889 Several improvements to hover debugging. 2014-01-24 13:03:04 -08:00
Nick Winter
9b9df12ea0 Huge Aether performance fix; spells now scroll while debugging. 2014-01-24 08:01:00 -08:00
DanielRodriguezRivero
2acd67f658 Update es-ES.coffee 2014-01-24 13:15:17 +01:00
Scott Erickson
0727e11669 Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3 
Conflicts:
	app/templates/play/level/playback.jade
 2014-01-23 20:15:36 -08:00
Scott Erickson
9740fe0700 Reworked how sprites flip when rotated. 2014-01-23 20:08:35 -08:00
Paul Buser
e958c1293d Fixing my actual regexp checker 2014-01-23 21:57:12 -05:00
Paul Buser
30d8eb8256 Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-23 21:56:23 -05:00
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
Scott Erickson
70d301d1b6 How did this bug not break everything always? 2014-01-23 18:14:25 -08:00
Scott Erickson
0a34bfc7a8 Fixed a couple things with the component versions view. 2014-01-22 18:54:20 -08:00
Scott Erickson
dcaa24ffa9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 17:38:31 -08:00
Scott Erickson
4ff2abc4b0 Refactored a collection into its own file. 2014-01-22 17:38:22 -08:00
Nick Winter
af6abda7cd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 10:56:54 -08:00
Nick Winter
3b7a908dcd Handled a couple errors. 2014-01-22 10:56:49 -08:00
Paul Buser
2b7d18bbfa Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-21 21:32:17 -05:00
Scott Erickson
00a7de12c9 Fixed a selection bug. 2014-01-21 10:54:59 -08:00
Scott Erickson
01a43bb3d7 Added filters to the extant thangs column. 2014-01-21 10:42:09 -08:00
GlenDC
c771936f45 Merge branch 'master' of https://github.com/ReiDuKuduro/codecombat 2014-01-21 18:07:02 +01:00
GlenDC
b2ddde96cd Merge https://github.com/codecombat/codecombat 2014-01-21 18:05:14 +01:00
Nick Winter
24c4051442 Merge branch 'feature/time-travel-debugger' 2014-01-21 09:04:09 -08:00
Nick Winter
6ea4f645f8 Added spell toolbar view. Made many time-travel debugger improvements. 2014-01-21 09:03:04 -08:00
GlenDC
c12e232ec1 Merge https://github.com/codecombat/codecombat 2014-01-21 18:01:58 +01:00
André Filipe
da94673fa5 Added some translations 2014-01-21 12:02:54 +00:00
Scott Erickson
956243818a Fixed updating the sprite sheets in the thang type editor. 2014-01-20 23:45:27 -08:00
Scott Erickson
cf0e1d305b Tweaked updateZoom. 2014-01-20 23:23:49 -08:00
Scott Erickson
68567c1366 Fixed level editor preview. 2014-01-20 23:14:34 -08:00
Scott Erickson
e61d31f48c Level editor displays thangs in a more orderly fashion. 2014-01-20 23:02:23 -08:00
Scott Erickson
4b1b72627c Reenabled projecting on the search views. 2014-01-20 22:38:36 -08:00
Scott Erickson
cc8bd156ec Put back the portraits in the thang type search view. 2014-01-20 22:38:14 -08:00
Scott Erickson
2cf19a4781 Renamed canvases to spritesheets in the edit thang view. 2014-01-20 22:37:47 -08:00
Scott Erickson
514adb2159 Improved the speed of placing down thangs in levels with lots of extant thangs. 2014-01-20 21:19:54 -08:00
Scott Erickson
222fa6100b Set up the level editor to lazily load thang types. 2014-01-20 17:20:04 -08:00
Scott Erickson
5a78d92173 New graph structure for viewing path finding data. 2014-01-20 16:50:53 -08:00
Scott Erickson
c780863545 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-20 15:27:18 -08:00
Scott Erickson
7c8c2e9381 Fixed distanceSquaredToPoint 2014-01-20 15:27:03 -08:00
GlenDC
262a523458 Merge branch 'FixThangScroll' of https://github.com/phansch/codecombat 2014-01-20 23:50:19 +01:00
GlenDC
b045426740 Fixed some alignment issues caused by the update on the it.coffee file. 2014-01-20 23:48:08 +01:00
GlenDC
fad096047a Merge https://github.com/codecombat/codecombat 2014-01-20 23:35:54 +01:00
Scott Erickson
f0fbfa6cbc Added a system for viewing pathfinding. 2014-01-20 12:57:45 -08:00
Scott Erickson
7f4f268ff8 Improved the refresh rate for the color tab, and made it work with containers. 2014-01-20 12:57:29 -08:00
Scott Erickson
3dfe99045b Fixed a small bug with building sprite sheets. 2014-01-20 12:55:44 -08:00
Michael Schmatz
480b55ded9 Fixed errors in locale file 
Please compile before you commit.
 2014-01-20 07:42:32 -08:00
flauta
9f23d3c989 Update it.coffee 2014-01-20 16:10:49 +01:00
Philipp Hansch
2c6c60307b Disable body scrolling in Thang List 
This overwrites the native scrolling behavior for the
thangs-list div by manually setting the value of
@scrollTop
 2014-01-20 12:15:20 +01:00
GlenDC
34846849aa Applied locale changes to es, fa, hu 2014-01-19 23:30:22 +01:00
GlenDC
8073bb77f8 Applied locale changes to it, ms-BA, nb, no, pl, pt-BR, pt-PT 2014-01-19 23:19:09 +01:00
GlenDC
306e26d7a2 Applied locale changes to es-419, es-ES, ja, pt, ru, sk, sr, sv, th, tr, vi, zh-HANS, zh-HANT, zh 2014-01-19 23:00:21 +01:00
GlenDC
7d6548ec6c Applied locale changes to the fr.coffee file (French Language) 2014-01-19 22:03:58 +01:00
GlenDC
23ccaad916 Applied locale update to el, en-AU, en-GB, fi, he, hi, id, ko, lt, nn, ro, sl, ur 2014-01-19 21:32:31 +01:00
GlenDC
7665b043d8 Merge branch 'patch-1' of https://github.com/ferpeter/codecombat 2014-01-19 20:58:03 +01:00
GlenDC
9f98fdd98d Hotfix for cs.coffee, and did part of el.coffee 2014-01-19 20:57:53 +01:00
GlenDC
831ab1cb7a Applied big i18n tag update to ar, bg, cs, da, de, en, nl. 2014-01-19 20:49:37 +01:00
ferpeter
4ff1044169 Update hu.coffee 2014-01-19 18:56:01 +01:00
GlenDC
4186333cce Merge branch 'translation_fr2' of https://github.com/MartinDelille/codecombat 2014-01-19 18:44:25 +01:00
GlenDC
9313e5cc70 Found more tags. ar, bg and nl should have now the correct versions with the (re)moved i18n tags. 2014-01-19 18:43:55 +01:00
MartinDelille
594cbee1c8 french grammar and orthograph fix. 2014-01-19 18:25:50 +01:00
MartinDelille
5caa6870cc fix i18n tag in editor and setting template 2014-01-19 18:20:41 +01:00
Nick Winter
f87c3a37e8 More progress on debugger. 2014-01-19 09:14:42 -08:00
GlenDC
95c81e4672 Found more duplicate i18n tags and applied it both to the ar.coffee and nl.coffee file 2014-01-19 17:19:19 +01:00
GlenDC
6c46dc3fda Tracked down common used i18n tags and applied it already on the nl.coffee file 2014-01-19 17:00:41 +01:00
Nick Winter
0a8d64046a Starting work on time-travel debugging interface. 2014-01-19 07:08:28 -08:00
GlenDC
882302d66e Resolved issue #149 2014-01-19 15:59:33 +01:00
GlenDC
07c80f6354 Added missing i18n tags for issue #198 (now resolved) in all locale files. 2014-01-19 15:10:14 +01:00
GlenDC
464208443b Translated some more words in Dutch and also translated the newly added/shuffled words. 2014-01-19 14:59:59 +01:00
GlenDC
05d43fb63f Added/shuffled (missing) words in locale files. 2014-01-19 14:36:49 +01:00
GlenDC
abbd576b4d Added the else statement. This can be used to make pull request #253 more advanced. 2014-01-19 14:08:32 +01:00
GlenDC
1f486c3cb6 Merge branch 'feature/play-button' of https://github.com/dristic/codecombat into test 2014-01-19 14:04:26 +01:00
GlenDC
364179e140 Merge https://github.com/codecombat/codecombat 2014-01-19 14:02:38 +01:00
GlenDC
9a16f450a4 Added some missing words to the translation lists. Important for pull request #248 2014-01-19 14:02:01 +01:00
GlenDC
e082b0bd87 Merge branch 'master' of https://github.com/faabsen/codecombat 2014-01-19 13:51:28 +01:00
Fab
59b41fc042 Update de.coffee - Space fix 2014-01-19 13:07:36 +01:00
dristic
7f39693d70 Save latest level played to local storage. Change play link when latest level is available on home page. 2014-01-18 23:15:59 -08:00
Michael Schmatz
3ecaee5bce Fixed russian translations 2014-01-18 22:46:57 -08:00
GlenDC
ad7ae2236f Merge branch 'patch-2' of https://github.com/ser-storchak/codecombat 2014-01-19 04:03:36 +01:00
GlenDC
ab4e7204ad Merge branch 'master' of https://github.com/rezahb/codecombat 2014-01-19 03:59:01 +01:00
Rehb
65c734be76 Update fa.coffee 2014-01-19 01:49:15 +03:30
Fab
ea4cc848f2 German translation 
Partly translate some parts of the game
 2014-01-18 22:47:17 +01:00
ser-storchak
c9ea0540ef Update ru.coffee 2014-01-18 12:08:35 -08:00
Nick Winter
b06426c85b Merge pull request #245 from MartinDelille/translation2 
Adding more translation fixes
 2014-01-18 11:45:44 -08:00
guricchi
f0f871d8a5 Updated sr.coffee 2014-01-18 11:27:31 -08:00
Martin Delille
54234f0c9e better description for nick 2014-01-18 19:31:27 +01:00
Martin Delille
0efd7f4066 dix conjugaison 2014-01-18 19:30:54 +01:00
Martin Delille
90edce1db4 fix accent 2014-01-18 19:30:41 +01:00
Nick Winter
ea44047c04 Merge pull request #225 from ser-storchak/patch-2 
Update ru.coffee
 2014-01-18 10:14:08 -08:00
Nick Winter
15717847cd Merge pull request #243 from MartinDelille/mdTranslation 
fix french translation
 2014-01-18 10:13:38 -08:00
Nick Winter
b9ff09b709 Merged meself up some hu and tr. 2014-01-18 10:09:59 -08:00
Martin Delille
8a9859c3f5 more translation 2014-01-18 18:45:29 +01:00
Nick Winter
99a43b97e8 Merge pull request #242 from flauta/patch-1 
Update it.coffee
 2014-01-18 09:39:01 -08:00
Nick Winter
19267505e1 Merge pull request #240 from guricchi/patch-13 
Updated el.coffee
 2014-01-18 09:38:17 -08:00
Nick Winter
11c80f36f4 Merge pull request #239 from guricchi/patch-12 
Updated da.coffee
 2014-01-18 09:38:05 -08:00
Nick Winter
cd605b857b Merge pull request #238 from guricchi/patch-11 
Updated hu.coffee
 2014-01-18 09:37:41 -08:00
Nick Winter
f30340cfda Merge pull request #237 from guricchi/patch-10 
updated pl.coffee
 2014-01-18 09:37:11 -08:00
Nick Winter
1fca0322f3 Merge pull request #236 from cobaimelan/master 
new translate
 2014-01-18 09:36:54 -08:00
Nick Winter
b23609a97b Merge pull request #235 from guricchi/patch-9 
Updated tr.coffee
 2014-01-18 09:36:25 -08:00
Martin Delille
f267971207 fix french translation 2014-01-18 18:35:53 +01:00
Nick Winter
c83708526a Merge pull request #233 from guricchi/patch-7 
Updated zh-HANT.coffee
 2014-01-18 09:35:27 -08:00
Nick Winter
6b6c51ce06 Merge pull request #232 from guricchi/patch-6 
Updated zh-HANS.coffee
 2014-01-18 09:35:08 -08:00
Nick Winter
4654bd5a27 Merge pull request #231 from guricchi/patch-5 
Updated ja.coffee
 2014-01-18 09:34:17 -08:00
flauta
63f712aa8c Update it.coffee 2014-01-18 10:48:26 +01:00
csuvsaregal
c89a88848b Update hu.coffee 
I've made some corrections. Later I'll do some new translations. 

csuvasregal - Sárosi Gergely
 2014-01-18 01:07:19 +01:00
guricchi
c6629e4e48 Updated el.coffee 2014-01-17 12:32:22 -08:00
guricchi
b71c5cd1ef Updated da.coffee 2014-01-17 12:09:23 -08:00
guricchi
7d8d6ed24f Updated hu.coffee 2014-01-17 11:55:14 -08:00
guricchi
c97d67515b updated pl.coffee 2014-01-17 11:45:40 -08:00
cobaimelan
93fc7be44d new translate 2014-01-17 21:42:51 +02:00
guricchi
9bf08b9d20 Updated tr.coffee 2014-01-17 11:08:35 -08:00
guricchi
1c018b0cac Updated zh-HANT.coffee 2014-01-17 11:01:17 -08:00
guricchi
70a3503097 Updated zh-HANS.coffee 2014-01-17 10:51:18 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
guricchi
4cbfd846f4 Updated ja.coffee 2014-01-17 10:37:04 -08:00
Michael Schmatz
91c1b62375 Merge pull request #229 from guricchi/patch-3 
Updated es-ES.coffee
 2014-01-17 10:28:12 -08:00
Michael Schmatz
db96bbaf9a Merge pull request #228 from guricchi/patch-2 
Updated es-419.coffee
 2014-01-17 10:27:57 -08:00
guricchi
3e040d9d30 Updated es-ES.coffee 2014-01-17 10:21:33 -08:00
guricchi
d4fec100de Updated es-419.coffee 2014-01-17 10:17:23 -08:00
guricchi
f898c8d57c Updated pt-PT.coffee 2014-01-17 10:07:38 -08:00
Scott Erickson
6e47a6b8fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus. 
Created a 'notification' email subscription.
 2014-01-17 09:53:17 -08:00
Volkan Gezer
f072030198 Updated Turkish translation 
Updated Turkish translation
 2014-01-17 17:23:27 +01:00
ser-storchak
bace74d6ad Update ru.coffee 2014-01-17 00:45:17 -08:00
Nick Winter
053927eaec Fixed home page wizard scale. 2014-01-16 16:27:34 -08:00
Nick Winter
5267febd8f Couple fixes for small errors when running with no Programmables. 2014-01-16 14:29:57 -08:00
Michael Schmatz
389fa9a30b Merge pull request #220 from Elfisen/patch-2 
spelling and grammar mistakes - fr.coffee
 2014-01-16 14:26:10 -08:00
GlenDC
553ad833ed Merge https://github.com/codecombat/codecombat 2014-01-16 22:27:09 +01:00
GlenDC
5cc24ea1b2 Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable. 2014-01-16 22:26:34 +01:00
GlenDC
b557c43f60 Hotfix for previous commit, forgot to uncommit some stuff 2014-01-16 22:22:42 +01:00
GlenDC
926b31f62f Resolved issue #160 2014-01-16 22:18:38 +01:00
Allisson
580a439fab spelling and grammar mistakes - fr.coffee 
Just a correction of what really hurt the eye
 2014-01-16 21:15:39 +01:00
Nick Winter
1fb68ae717 Fixed bug with team assignments and spell permissions. 2014-01-16 11:37:04 -08:00
Michael Schmatz
d0f1510623 Merge branch 'pr/197' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:46:56 -08:00
Michael Schmatz
6e43daa98a Revert "Merge branch 'pr/190'" 
This reverts commit 457accf729, reversing
changes made to 9df9f75f64.
 2014-01-16 10:40:05 -08:00
Michael Schmatz
457accf729 Merge branch 'pr/190' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:33:00 -08:00
Michael Schmatz
9df9f75f64 Merge branch 'pr/200' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:24:55 -08:00
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors' 
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
 2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Scott Erickson
ba01101ae0 Cleanup from the system tracked properties refactoring. 2014-01-16 10:04:52 -08:00
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c Add jquery fading 
Also using the level:session-will-save callback
 2014-01-16 17:13:14 +01:00
Philipp Hansch
ff5807adb8 New i18n tag 2014-01-16 13:37:52 +01:00
Nick Winter
84e268a88c Removed some logs. 2014-01-15 19:03:10 -08:00
Scott Erickson
f230e8983c Fixed the level preview view. 2014-01-15 18:37:47 -08:00
Michael Schmatz
6bc3924af0 Merge pull request #208 from kengos/update_ja_coffee 
Update ja.coffee
 2014-01-15 15:58:53 -08:00
Michael Schmatz
74d5b1a845 Merge pull request #199 from GlenDC/master 
Issue #30 is resolved + Added Dutch Translations + Hotfixes
 2014-01-15 15:54:04 -08:00
GlenDC
a7368fb51e Converted line endings to unix endings for 3 files 2014-01-16 00:35:17 +01:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
GlenDC
556149f756 Resolved issue #162 2014-01-16 00:08:35 +01:00
Nick Winter
172d97ed83 Fixed #87 I hope; at least, dramatically reduced memory leakage. 2014-01-15 13:04:48 -08:00
Michael Schmatz
236c323b43 Merge pull request #194 from brunoporto/patch-1 
Update pt-BR.coffee
 2014-01-15 12:53:15 -08:00
Michael Schmatz
f9970f0ddb Merge pull request #203 from jaybi/patch-1 
Update fr.coffee
 2014-01-15 12:03:22 -08:00
Michael Schmatz
6d20d34048 Merge pull request #204 from rezahb/patch-3 
Update fa.coffee
 2014-01-15 12:00:50 -08:00
Michael Schmatz
0e40c8b20a Removed comma from diplomats template 2014-01-15 11:59:34 -08:00
Michael Schmatz
5c3ce7459c Merge pull request #192 from rezahb/patch-2 
Update diplomat.jade
 2014-01-15 11:59:00 -08:00
Philipp Hansch
17afb62dc9 Add basic code-saved indicator 
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
 2014-01-15 20:58:39 +01:00
kengos
8e6271854d Update ja.coffee 2014-01-16 00:06:38 +09:00
Rehb
ac86e08902 Update fa.coffee 2014-01-15 18:19:43 +03:30
GlenDC
6e5cf30c29 Hotfix for 2 url i18n tags. The Category wasn't prefixed. 2014-01-15 14:49:17 +01:00
GlenDC
8acc4d7071 Translated 1/3 of the Contribute web page as well. + Added a missing tag to the nl.coffee document. 2014-01-15 14:45:18 +01:00
GlenDC
72cb62f607 Translated the Legal page completly in Dutch. (nl.coffee) 2014-01-15 13:48:24 +01:00
jaybi
99f8343df4 Update fr.coffee 
edited by jaybi
 2014-01-15 12:32:09 +01:00
GlenDC
8f5e80d101 Translated most of the Dutch version. (It's my native language) 2014-01-15 03:39:20 +01:00
GlenDC
eba0665616 Hotfix for issue #30 2014-01-15 03:38:33 +01:00
Thomas Triboult
e713fe828f Translation of new elements 2014-01-15 02:36:39 +01:00
GlenDC
c14c55e382 Applied fix for issue #198 on vi.coffee + added a couple of translations done by An as a test (succesful) 2014-01-15 02:17:04 +01:00
GlenDC
d5907059ed Resolved issue #30 2014-01-15 01:58:37 +01:00
GlenDC
92416dc4f2 Created view versions for components, systems and thangs (fix #30) 2014-01-15 01:33:24 +01:00
Alliss
4ce5a95e22 Update fr.coffee 
Here's a little contribution, everything I changed I'm 100% sure of. Hope it'll help !
 2014-01-15 01:32:16 +01:00
GlenDC
4633ced78d Created superclass & common templates for article & level (fix for #30) 2014-01-15 01:12:21 +01:00
Nick Winter
7f1f0fadff Fixed System deserialization. 2014-01-14 14:03:55 -08:00
brunoporto
fda49c888f Update pt-BR.coffee 2014-01-14 19:59:15 -02:00
Nick Winter
156c6734ac Merge pull request #189 from rezahb/master 
Update fa.coffee
 2014-01-14 13:49:44 -08:00
Rehb
17803d018c Update fa.coffee 
Delet #
 2014-01-15 01:11:54 +03:30
Rehb
8e4c246e5e Update diplomat.jade 
Add name 91-Persian
 2014-01-15 01:05:10 +03:30
Scott Erickson
bf4011044f Initially working on using team colors, but it's not working yet. 2014-01-14 13:16:30 -08:00
Rehb
a63f8afff0 Update fa.coffee 2014-01-15 00:40:59 +03:30
Rehb
e13a68df66 Update fa.coffee 2014-01-15 00:39:58 +03:30
Rehb
415bd36f73 Update fa.coffee 2014-01-15 00:37:55 +03:30
Elio
237b97ac5a Update fr.coffee 2014-01-14 22:05:15 +01:00
Scott Erickson
f4a2209d6f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-14 12:53:18 -08:00
Scott Erickson
83e7a98869 Fixed the versions pages. 2014-01-14 12:53:06 -08:00
Rehb
182548402e Update fa.coffee 2014-01-15 00:15:39 +03:30
Nick Winter
704f9af864 Updated language progress; added Slovene placeholder. 2014-01-14 12:18:05 -08:00
Nick Winter
a291dd9364 Added new i18n tags to all locales. 2014-01-14 10:30:18 -08:00
Nick Winter
60850d5c48 Updated some tags. Added a script to copy tags from en.coffee. 2014-01-14 10:29:23 -08:00
Nick Winter
6a40e27bdd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-14 09:15:32 -08:00
armaldio
a0f5eece96 Update fr.coffee 
just stay few english words that I can't translate
 2014-01-14 12:37:40 +01:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Scott Erickson
37f1ccdb51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 20:32:41 -08:00
Scott Erickson
810eabef46 Tweaked some copy in prep for the new translations to be sent out. 2014-01-13 20:32:21 -08:00
Nick Winter
1041ce4b17 Added GitHub stars button. 2014-01-13 18:19:28 -08:00
Nick Winter
5405423510 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 17:17:48 -08:00
Nick Winter
40bd91f415 Working on adding i18n tags from #23. 2014-01-13 17:17:41 -08:00
Scott Erickson
0fda326858 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 16:59:13 -08:00
Scott Erickson
05f4840369 Added tracking properties to systems. 2014-01-13 16:58:56 -08:00
Michael Schmatz
eb04575294 Merge pull request #157 from shiyingzheng/master 
Randomized Thang Names #128
 2014-01-13 16:50:55 -08:00
Paul Buser
f6ada477ef Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-13 16:59:36 -05:00
Nick Winter
69a6070e02 Merge branch 'master' of git://github.com/p-buse/codecombat into p-buse-master 2014-01-13 13:18:52 -08:00
Philipp Hansch
ee06d40974 Update de.coffee 
Updated missing translations with the translations from the
Google Doc.

Ref #123
 2014-01-13 14:54:55 +01:00
Paul Buser
bfe2ab0f1e Add regexp event checking 2014-01-12 21:26:07 -05:00
Paul Buser
485bc4d6cf Remove common scripts from user-created levels 2014-01-12 21:15:31 -05:00
Paul Buser
8838903d58 Remove common scripts from user-created level packaging 2014-01-12 21:13:03 -05:00
Michael Schmatz
60abd9f794 Merge pull request #168 from schmatz/master 
Fixed some client-side tests
 2014-01-12 14:04:57 -08:00
Michael Schmatz
718e7ebd22 Fixed failing createPath test 
There was a misnamed variable, incorrect expect, and outdated calling
style
 2014-01-12 12:44:22 -08:00
Scott Erickson
dbbfbcf861 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:27:26 -08:00
Scott Erickson
de258fdf20 Set up wizard sprites to use the color config. 2014-01-12 12:27:10 -08:00
Nick Winter
d6f2f41cf8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:24:24 -08:00
Nick Winter
acc6c2e4e6 Fixed a couple typos. 2014-01-12 12:24:02 -08:00
Scott Erickson
c4028a8036 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:06:48 -08:00
Nick Winter
1572228aa5 Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master 2014-01-12 12:01:56 -08:00
Nick Winter
8ab997680e Turned off A/B test for Break the Prison. 2014-01-12 12:00:38 -08:00
Scott Erickson
6d60221668 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 11:58:24 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
Nick Winter
fbd7d4a0c5 Fixed up some syntax errors in #147. 2014-01-12 11:40:38 -08:00
Nick Winter
34ee6778b9 Merge pull request #147 from mlewisno/master 
Added a file and translations for Bahasa Malaysia
 2014-01-12 11:37:25 -08:00
Mischa Lewis-Norelle
958c3e5bae Made it clear that this is the Bahasa region of the Malay macro language 2014-01-12 14:20:29 -05:00
Mischa Lewis-Norelle
1d7a01fd5c Fixed the language issues 
Still not sure about the language code, as there are several Malay
languages, but since this is the only one we have right now, I suppose
it’ll do. Google has it as .my, but BCP 47 says that is Burmese. I’ll
look into this more later on.
 2014-01-12 14:09:56 -05:00
SHIYING
b6c499db72 Better randomized orders. Better styled code. 2014-01-12 12:59:51 -05:00
GlenDC
1032fdb1d3 Enchangement for issue #23. Removed classes related ids from account_settings to classes category 2014-01-12 11:20:07 +01:00
SHIYING
524b2318f8 Better comment for randArray 2014-01-11 16:15:46 -05:00
SHIYING
08a1668bcc Bug fixed where ordering of thang names becomes undefined sometimes 2014-01-11 16:09:25 -05:00
SHIYING
ae67a9dc23 Added comments and made code more readable 2014-01-11 15:43:34 -05:00
SHIYING
00cdb1e5ad Randomized naming for Thangs 2014-01-11 15:41:13 -05:00
GlenDC
683b72f67a First big fix for issue #23. The issue is as good as fixed besides some details I think. 2014-01-11 17:25:04 +01:00
Adam23
0fc8643133 update zh-HANT.coffee + zh-HANS.coffee 
fix something
 2014-01-11 21:45:08 +08:00
Adam23
016dc1a3f6 Chinese (Traditional) 
zh-HANT.coffee  +  zh-HANS.coffee
 2014-01-11 21:17:47 +08:00
Nick Winter
00f4699ce5 Further fixes for save modals. 2014-01-10 17:32:29 -08:00
Scott Erickson
52eae882e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:14:31 -08:00
Scott Erickson
ecd9ed8fef Fixed the save version modal. 2014-01-10 17:11:13 -08:00
Nick Winter
033e3a6c0b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:04:21 -08:00
Nick Winter
2383d5dd3a An improvement for containingString in #133. 2014-01-10 17:04:12 -08:00
Scott Erickson
1f9c531938 Got rid of a bunch of logs. 2014-01-10 16:57:38 -08:00
Scott Erickson
95900f230f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
Nick Winter
a6f1ce53ba Merged #152, and slightly improved update interval handling. 2014-01-10 16:36:36 -08:00
dristic
21915f358c Add clear timers to not have timer running in the background on home page. 2014-01-10 16:18:39 -08:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
2b6a7cf753 Merge pull request #145 from fess89/master 
Update uk.coffee
 2014-01-10 09:42:16 -08:00
mlewisno
c6e81f909c Added a file and translations for Bahasa Malaysia 2014-01-10 10:09:45 -05:00
mlewisno
9318675447 Merge remote-tracking branch 'upstream/master' 
Updated my local copy to match the public copy
 2014-01-10 10:08:02 -05:00
Oleksii Chyrkov
8902ba91e2 Update uk.coffee 
Copied Ukrainian strings from Google doc to uk.coffee.
 2014-01-10 14:55:56 +02:00
Adam23
29a302aaa9 update zh-HANS.coffee 
make the string blank, and comment out the line
 2014-01-10 14:54:22 +08:00
Adam23
cf6b6c11ce update zh-HANS.coffee 
two places
 2014-01-10 14:19:25 +08:00
Adam23
e01db58608 updating zh-HANS.coffee 
I have finished the  first draft.
 2014-01-10 13:43:59 +08:00
Nick Winter
69df0079af Fixed bug returning to normal selection from talking portrait in HUD. 2014-01-09 18:30:18 -08:00
Nick Winter
25d2f95db9 Not using subreddit any more. 2014-01-09 18:29:57 -08:00
Nick Winter
027cddd151 Increased matching bracket highlighting visibility. 2014-01-09 18:02:16 -08:00
Nick Winter
05d7562c78 Copied Norwegian also Norwegian (Bokmal). 2014-01-09 17:43:13 -08:00
Nick Winter
7cbd1605e4 Merge pull request #139 from rhc2104/dutch 
Add Dutch translations
 2014-01-09 17:28:13 -08:00
Nick Winter
4502492d8a Merge pull request #138 from rhc2104/italian 
Add support for Italian
 2014-01-09 17:27:47 -08:00
Ronald Cheng
014fd0d608 Add Dutch translations 2014-01-09 17:15:44 -08:00
Ronald Cheng
309e2c7467 Add support for Italian 2014-01-09 16:50:59 -08:00
Ronald Cheng
36c8e96450 Add Swedish translations, plus a couple of Polish translations 2014-01-09 16:08:57 -08:00
Oleksii Chyrkov
8931a01ae3 Update ru.coffee 
Added a missing quote at the last line.
 2014-01-10 00:47:14 +02:00
Nick Winter
0c6b1257ff Fixed a couple syntax issues in Russian locale.. 2014-01-09 14:46:00 -08:00
Nick Winter
7cda5dcbc5 Merge pull request #130 from fess89/master 
Update ru.coffee
 2014-01-09 14:43:22 -08:00
Oleksii Chyrkov
96b995ed60 Update ru.coffee 
Updated ru.coffee with the actual Russian translation of all the strings.
 2014-01-10 00:24:35 +02:00
Michael Schmatz
faac70bee9 Merge pull request #125 from p-buse/master 
Fix "Contact" link in footer not properly changing cursor to pointer
 2014-01-09 14:18:15 -08:00
Scott Erickson
2d5ca50e89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 14:04:53 -08:00
Scott Erickson
3c3e38b585 Set up thang avatar views with the new db portraits. 2014-01-09 14:04:46 -08:00
mlewisno
414bb4d07a Added a file for Bahasa Malaysia, will update soon 2014-01-09 16:30:03 -05:00
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