Commit graph

5298 commits

Author SHA1 Message Date
Imperadeiro98
d6e1902278 Merge pull request #2055 from StijnBerendse/master
Update nl-NL.coffee
2015-01-05 19:12:01 +00:00
Nick Winter
947811c01b Replayable once-per-day increasing-difficulty level basics. 2015-01-05 10:44:24 -08:00
Matt Lott
61180c640d Add completion % to campaign analytics 2015-01-05 10:28:56 -08:00
StijnBerendse
dc6995059e Update nl-NL.coffee 2015-01-05 18:33:06 +01:00
Apoc-
25b689f678 Update de-DE.coffee
Finished translation, added some remarks to words / phrases who cannot be translated directly
Fixed some translation errors
2015-01-05 14:22:00 +01:00
David Nagy
13f3f5d3af Update hu.coffee 2015-01-05 12:51:57 +00:00
Ivan Milanov
d75c45baa0 Minor correction 2015-01-05 01:49:42 +01:00
Ivan Milanov
b90d08a64d Additions and modifications
Added new translations and made minor modifications to existing ones where the translation didn't make sense in the context required.
2015-01-05 01:45:36 +01:00
RubenDjOn
a88f991a72 Added one translation to Spanish (es-ES). Testing github pull request. 2015-01-04 23:19:43 +01:00
Scott Erickson
15be292573 Added a little focus styling to treemas in editors so it's easier to copy/paste. 2015-01-04 09:26:40 -08:00
Nick Winter
6ec7066309 Using a couple more percentage margins/paddings in spell palette. 2015-01-04 09:08:59 -08:00
Nick Winter
ca4d861bac Merge pull request #2045 from Imperadeiro98/master
Update spell_palette.sass
2015-01-04 09:06:51 -08:00
Omar S.
e117c56f10 Update es-419.coffee
Almost everything is done :D
2015-01-04 11:37:21 -05:00
Imperadeiro98
41deb10a0f Uncommented translations 2015-01-04 16:17:29 +00:00
Imperadeiro98
e4e8b9bccc Merge pull request #2046 from StijnBerendse/master
Update nl-NL.coffee
2015-01-04 16:12:44 +00:00
Scott Erickson
1446f77a17 Refactored away from having the underscore string library added to the String prototype. 2015-01-04 08:05:46 -08:00
Imperadeiro98
94a1b3c06f Fixed an error I made 2015-01-04 15:20:18 +00:00
Kindleme
734b91583b Update zh-HANS.coffee 2015-01-04 22:51:43 +08:00
StijnBerendse
587dfe4c5f Update nl-NL.coffee
Translated the rest of the Home, Login, Signup, and Recover portions.
2015-01-04 14:59:35 +01:00
Imperadeiro98
28744264c5 Update level-component-edit-view.jade 2015-01-04 13:20:43 +00:00
Imperadeiro98
00550adbc7 Update level-system-edit-view.jade 2015-01-04 13:18:52 +00:00
Imperadeiro98
c529c3d874 Update spell_palette.sass 2015-01-04 12:41:16 +00:00
Nick Winter
163cf50528 Fixed processing of default Programmable config. 2015-01-03 13:22:54 -08:00
Nick Winter
c2d74a812d Updates to require/restrict level logic. 2015-01-02 15:44:43 -08:00
Matt Lott
b5969e0abc Update campaign analytics level ordering
Reading campaign levels from database.  Assumes database order is
roughly progression order.
2015-01-02 13:31:50 -08:00
Omar S.
c68cad1556 Update es-419.coffee 2015-01-02 15:49:10 -05:00
Imperadeiro98
434c921cb9 Merge pull request #2040 from SuperPranx/patch-1
Added new translations and corrected existing ones
2015-01-02 20:46:53 +00:00
Nick Winter
f66afa1dc0 Trying latest sass-brunch (which happened to alphabetize our devDependencies.) Fixed bug with required/restricted items not showing up properly. Added quick links to open level editors from campaign editor. 2015-01-02 12:40:17 -08:00
Ivan Milanov
e7b80b0a01 Added new translations and corrected existing ones 2015-01-02 16:03:17 +01:00
Imperadeiro98
42166bf623 Merge pull request #2037 from flauta/patch-4
Update it.coffee
2015-01-02 11:59:59 +00:00
Nick Winter
bf9aa27e73 Added tasks view to Thang editor search. 2015-01-01 14:59:55 -08:00
Nick Winter
dbc42fb7e1 Added task system to Thang Editor. 2015-01-01 14:07:11 -08:00
Matt Lott
2d410fa57f Update editor analytics level completions
We have to grab all the level data at once, so we should cache it all
too.  Only the first level completions call should be uncached/slow.
2015-01-01 12:26:19 -08:00
Matt Lott
e65887ec79 Add campaign drop-offs analytics to editor 2015-01-01 12:01:51 -08:00
flauta
811fd89bfe Update it.coffee 2015-01-01 16:55:29 +01:00
Nick Winter
0e9f1e0370 Fixed #2036 (making it less likely that the mistake will ercur, anyway). 2014-12-31 16:55:14 -08:00
George Saines
b0056127af changing the xp icon in the play view 2014-12-31 15:23:33 -08:00
Matt Lott
56b4346556 Update average playtimes query to match level 2014-12-31 13:19:46 -08:00
Matt Lott
9b6d327c7f Add average playtimes to levels in campaign editor 2014-12-31 12:25:18 -08:00
Matt Lott
fcf5346aa3 Add completion rates to levels in campaign editor 2014-12-31 11:49:29 -08:00
Imperadeiro98
9d55be8ab1 Merge pull request #2033 from osanseviero/patch-19
Update es-419.coffee
2014-12-31 11:41:41 +00:00
Imperadeiro98
ee206f2428 Merge pull request #2032 from Martin005/patch-8
Update cs.coffee
2014-12-31 11:39:35 +00:00
Omar S.
9e8c344208 Update es-419.coffee
More more more
2014-12-30 23:29:14 -05:00
Omar S.
58499392e8 Update es-419.coffee
Upp to line 667
2014-12-30 20:22:00 -05:00
Nick Winter
9e9d69ec9b Removed try_it text (which was accidentally used in the wrong place anyway). 2014-12-30 16:24:31 -08:00
Martin005
cf72abd2a2 Update cs.coffee 2014-12-31 00:21:22 +01:00
Imperadeiro98
72be5c35f0 Fixed link 2014-12-30 21:38:07 +00:00
Ivan Milanov
62e3b6b733 Added and modified translations
- Added new translations
- Made modifications to existing translations after consulting a friend well versed in macedonian linguistics
2014-12-30 10:38:02 +01:00
Ivan Milanov
cac2a5b7fa Added translations in the 'play' segment 2014-12-30 07:36:16 +01:00
Anshuman
287817063b Added more names for #53 2014-12-30 10:39:35 +05:30
Nick Winter
c13922a2d8 Transferring voice range from Hero Placeholder to heroes. 2014-12-29 20:06:27 -08:00
Nick Winter
a5b5bb1085 Ctrl/cmd+click a level in campign editor to open level editor in new tab. 2014-12-29 13:22:35 -08:00
Nick Winter
728f726748 Fixed problem opening GameMenuModal when there are no help videos. 2014-12-29 13:04:03 -08:00
Nick Winter
1440584633 Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting. 2014-12-29 12:47:53 -08:00
Nick Winter
c54fd5ab4b Moved editors from PUT to POST so that version saving behavior is preserved and admins can PUT without saving new versions. 2014-12-29 09:14:43 -08:00
Nick Winter
d85bf8d59a Fixed disabled level logic. 2014-12-29 08:46:02 -08:00
Omar S.
d67a329cb9 Added submitter 2014-12-29 10:51:14 -05:00
Omar S.
a9875fd19d More translations
Up to 591 + some ones that were missing
2014-12-29 10:40:29 -05:00
Imperadeiro98
3b8fdecc18 Fixed a mistake 2014-12-29 15:38:26 +00:00
Ivan Milanov
0c43b21078 Added more translations 2014-12-29 14:33:06 +01:00
Imperadeiro98
6249427103 Added 'mk-MK' to diplomat page 2014-12-29 00:03:09 +00:00
Nick Winter
664003ec4a Propagated i18n. 2014-12-28 15:28:19 -08:00
Nick Winter
913de5dc8c Additional tweak for #2005. 2014-12-28 15:26:04 -08:00
Nick Winter
aba154fad9 Merge pull request #2004 from SuperPranx/master
Initial translation for Macedonian(mk_MK)
2014-12-28 15:25:58 -08:00
Nick Winter
f5678bd536 Merge pull request #2005 from Imperadeiro98/master
Fixed a issue
2014-12-28 15:20:53 -08:00
Nick Winter
448acbb6b5 Fixed a problem choosing heroes from within levels with new level options loading. 2014-12-28 15:18:34 -08:00
Imperadeiro98
9018e41c2c Fixed a issue 2014-12-28 22:43:08 +00:00
Ivan Milanov
b371de9503 Commented out non-translated parts 2014-12-28 23:23:20 +01:00
Nick Winter
588e0266af Fixed ordering problem I introduced with /play/ladder routes. 2014-12-28 13:55:20 -08:00
Nick Winter
fa9f3e2a61 Fixed typo in HeroVictoryModal. 2014-12-28 13:53:50 -08:00
Nick Winter
fb948b19cd Merged it.coffee and uncommented section headers. 2014-12-28 13:28:50 -08:00
Nick Winter
afa9b6c544 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-28 13:25:27 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Imperadeiro98
12b5969fde Merge pull request #1997 from MinecraftWidget/patch-1
Edits and Additions
2014-12-28 20:58:21 +00:00
Imperadeiro98
cef4a09abe Merge pull request #2002 from osanseviero/patch-6
Translated up to 470
2014-12-28 20:54:21 +00:00
Ivan Milanov
03e199c127 Translated lines 19-50
Only exception is the translation for 'nav.code' because I require further clarification on the context in which it is used here
2014-12-28 21:06:54 +01:00
Nick Winter
a9c1846e41 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-28 11:15:17 -08:00
Ivan Milanov
4b59f8e0c8 Initial translate of 'home' section (4-16) 2014-12-28 20:08:47 +01:00
Ivan Milanov
af2795b4e7 Created mk-MK.coffee
The contents were copied from 'en.coffee'.
This is the initial file with no translations, just the description is set to it's proper value.
Once the translation is done the comment "Translation not finished (work in progress)", should be removed.
2014-12-28 19:13:44 +01:00
Ivan Milanov
dbf2790ae9 Added 'mk-MK' description to locale.coffee 2014-12-28 19:05:30 +01:00
Omar S.
d676bc1ea3 Translated up to 470 2014-12-28 12:24:48 -05:00
nixel2007
45fe2ca9a2 Update ru.coffee
More translations after propagination
2014-12-28 01:32:18 +03:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Imperadeiro98
2f1f4d8594 Update pt-PT.coffee 2014-12-27 18:50:58 +00:00
Nick Winter
d9265c6624 Propagated i18n. 2014-12-27 10:39:44 -08:00
Imperadeiro98
b91f8eb927 Fixed last merge issues 2014-12-27 18:27:43 +00:00
MinecraftWidget
eb60d1b186 Minor Additions 2014-12-27 11:12:24 -07:00
Omar S.
1b0ab789ca Checked up to line 340
Checked the translations of the next lines and added one tip translation
2014-12-27 10:35:46 -05:00
Imperadeiro98
598ca7d2ad Merge pull request #1995 from mileshayter/patch-1
Update de-AT.coffee
2014-12-27 11:48:01 +00:00
MinecraftWidget
b4f48764ff More Additions 2014-12-26 23:47:39 -07:00
MinecraftWidget
af7dbfb9ca Edits and Additions 2014-12-26 22:59:28 -07:00
Omar S.
b91f9e8e65 Checked and improved all up to timeunits (line 210)
I will continue tomorrow. I have changed some lines and added somemore
2014-12-26 23:29:24 -05:00
mileshayter
4719818dad Update de-AT.coffee
Some translation done, will try to continue ASAP :)
2014-12-26 22:38:55 +01:00
Imperadeiro98
9fbd1076f9 Fixed a link 2014-12-26 18:02:40 +00:00
Imperadeiro98
4dbdf60f10 Fixed link 2014-12-26 18:01:57 +00:00
flauta
4e93b3628d Update it.coffee 2014-12-26 17:49:04 +01:00
flauta
8edb13b18d Update it.coffee
una piccola parte delle stringhe delle schermate iniziali, come esperimento
2014-12-26 15:29:18 +01:00
Martin005
ca810dd142 Update cs.coffee
Fixed missing space.
2014-12-26 12:17:25 +01:00
Imperadeiro98
f6576d3984 Merge pull request #1989 from nixel2007/master
Update ru.coffee
2014-12-26 10:32:49 +00:00
Martin005
275b66eb07 Update cs.coffee
Finally translate ALL of the strings!!! *celebrate time* :)
2014-12-26 01:21:23 +01:00
Nick Winter
b116321deb Tested and cleaned up comment detection for space disablement sensitivity. 2014-12-24 12:37:25 -08:00
Nick Winter
c7eadb5670 Merge branch 'patch-4' of git://github.com/rishiloyola/codecombat into rishiloyola-patch-4 2014-12-24 12:24:27 -08:00
nixel2007
b3bced93ac Update ru.coffee 2014-12-24 22:57:54 +03:00
nixel2007
917a61b310 Revert "Fixed i18n-coverage bug"
This reverts commit 97cdb76b82.
2014-12-24 22:15:52 +03:00
Nick Winter
1c1f2008a5 Now able to suggest required items for purchase before level start. 2014-12-24 11:01:50 -08:00
nixel2007
d74a86d06a Merge remote-tracking branch 'upstream/master' 2014-12-24 15:19:43 +03:00
Nick Winter
f361674fb4 Enabling new levels for playtesting. 2014-12-23 17:14:59 -08:00
Nick Winter
f0826c865e Preparing new campaign levels for migration to new campaign editor. 2014-12-23 17:14:35 -08:00
Nick Winter
f17b3bd03b Fixed indentation and punctuation for superpower tip. 2014-12-23 07:57:07 -08:00
Nick Winter
48603e5bc8 Merge pull request #1985 from osanseviero/patch-3
New tip
2014-12-23 07:56:19 -08:00
Omar S.
9a30c35a3b New tip
Added superpower tip
2014-12-23 09:54:57 -05:00
Omar S.
f48c2b0def New tip
Added superpower tip
2014-12-23 09:54:31 -05:00
Scott Erickson
96c8e035cf Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema. 2014-12-23 09:42:24 -05:00
Scott Erickson
b567e737cd Tweaked campaign editor styling. 2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443 Tweaked campaign editor styling. 2014-12-23 09:19:08 -05:00
Scott Erickson
1bb76d5902 Fixed shadow placements. 2014-12-23 09:12:41 -05:00
Imperadeiro98
31ed540964 Merge pull request #1983 from tpai/patch-1
Update zh-HANT.coffee
2014-12-23 09:06:33 +00:00
tonypai
30eb96f151 Update zh-HANT.coffee 2014-12-23 16:01:33 +08:00
Nick Winter
5e3ae981d7 Merge pull request #1981 from Lynxbob/master
Added 3 new name lists and 10 new names
2014-12-22 17:40:51 -08:00
Branden Webb
eb3e0621f2 Added Sand Yak name list, Ogre Scout M name list, and Ogre Scout F name list. Also added 10 names, 5 for Sand Yak, 3 for Ogre Scout M, and 2 for Ogre Scout F. 2014-12-22 20:07:22 -05:00
Omar S.
3ed3dd00fa Added two names 2014-12-22 18:19:57 -05:00
Scott Erickson
d18260c20c Merge branch 'master' into feature/campaign-editor 2014-12-22 16:39:07 -05:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
George Saines
116feb5bea turning off realtime playback on the riddling kithmaze 2014-12-22 11:11:43 -08:00
Imperadeiro98
72e426c0e0 Fixed another link 2014-12-22 18:16:06 +00:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Scott Erickson
0d45e4a889 Set up the CampaignEditorView to trigger the CampaignView to re-render when things change. 2014-12-22 12:06:17 -05:00
Scott Erickson
1db8284236 When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView. 2014-12-22 11:09:58 -05:00
Scott Erickson
a31b385a4d Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView. 2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0 Hooked up the CampaignView to show adjacent campaigns based on the data. 2014-12-22 10:29:29 -05:00
Rishi
364f40274d Update SpellView.coffee
hey i made changes. due to some error in downloading your data base i cannot test it. but check it . i think it will work .
2014-12-22 18:06:32 +05:30
Imperadeiro98
2bca94161e Fixed a link 2014-12-22 11:22:06 +00:00
Nick Winter
e153a7ecce Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking. 2014-12-21 21:38:12 -08:00
Matt Lott
e7c626656e No-cache User fetch in hero victory
After earning achievements.  On IE, this call results in a cache hit,
so the User object was never updated with the sweet sweet loot you just
earned.  Like a sword you need for True Names.
2014-12-21 21:14:38 -08:00
Imperadeiro98
8da578e106 Update en.coffee 2014-12-21 21:46:45 +00:00
Imperadeiro98
393860ffa4 Update en.coffee 2014-12-21 21:30:15 +00:00
Imperadeiro98
0c00f9f0c1 Delete contribute_nav.jade 2014-12-21 21:09:52 +00:00
Imperadeiro98
5d9e303fb1 Added Martin005 2014-12-21 20:53:43 +00:00
Imperadeiro98
2b0757810c Merge pull request #1973 from uaMithril/patch-3
Update uk.coffee
2014-12-21 20:11:47 +00:00
Imperadeiro98
0cbf76bc36 Merge pull request #1972 from uaMithril/patch-2
Update uk.coffee
2014-12-21 20:09:58 +00:00
Imperadeiro98
81eb028025 Merge pull request #1971 from tpai/patch-1
Update zh-HANT.coffee
2014-12-21 20:09:14 +00:00
Imperadeiro98
0c01a4ed8c Merge pull request #1964 from Martin005/patch-5
Update cs.coffee
2014-12-21 20:02:27 +00:00
Mithril
837b62ee9d Update uk.coffee 2014-12-21 13:51:18 +02:00
Mithril
7ad505252b Update uk.coffee 2014-12-21 13:03:48 +02:00
tonypai
e815dff1de Update zh-HANT.coffee
Hi, I've already sign the CLA, and this is my PR. :)
2014-12-21 16:13:40 +08:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Nick Winter
f26b43f8a5 Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings. 2014-12-20 16:02:41 -08:00
Nick Winter
8528f5039b Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level. 2014-12-20 14:40:28 -08:00
Nick Winter
e4c6d07a4a Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699. Fixed #57. Colored collision overlays according to collision categories. 2014-12-20 13:39:51 -08:00
Martin005
eed3043a6d Update cs.coffee 2014-12-20 19:00:56 +01:00