5695 commits

Author	SHA1	Message	Date
Matt Lott	9bda187f90	Add terrain to loaded world map event	2015-02-10 14:20:18 -08:00
Nick Winter	76f03790fd	Propagated i18n.	2015-02-10 14:14:14 -08:00
Nick Winter	413edb3b4c	Deleted no.coffee in favor of nb.coffee and nn.coffee as discussed in #2284.	2015-02-10 14:13:15 -08:00
Erik Mogensen (@mogsie)	36d5f132cc	Norwegian translation: Some typos and punctuation.	2015-02-10 22:44:12 +01:00
Erik Mogensen (@mogsie)	ab8346c6b2	Better tanslation from @matifol.	2015-02-10 22:31:02 +01:00
Erik Mogensen (@mogsie)	427aea9457	Fix speling.	2015-02-10 22:29:14 +01:00
Popey456963	da64bea348	Revert "Remove Hour of Code References from teachers.jade" ... This reverts commit b30c0d059a.	2015-02-10 21:14:34 +00:00
Popey456963	b30c0d059a	Remove Hour of Code References from teachers.jade	2015-02-10 21:13:06 +00:00
Nick Winter	b03d6fb3d4	Merged nb.coffee.	2015-02-10 12:54:25 -08:00
Nick Winter	a610bac948	Merge pull request #2261 from mogsie/master ... More norwegian translations.	2015-02-10 12:50:18 -08:00
Nick Winter	106ba5acda	Fixed #2280.	2015-02-10 12:49:28 -08:00
Nick Winter	afe94afd08	Merge pull request #2278 from laituan245/master ... Added more names for #53	2015-02-10 12:47:11 -08:00
Nick Winter	86fa8dd59d	Merge pull request #2281 from divyanshu013/master ... Fixed the issue with the Leaderboard view to fit properly for #2254	2015-02-10 12:45:54 -08:00
Erik Mogensen (@mogsie)	62baa53ec0	Fix missing "	2015-02-10 21:45:17 +01:00
Nick Winter	00c8c9016c	Merge pull request #2277 from AnirudhGP/patch-3 ... Added some quotes for #710	2015-02-10 12:43:57 -08:00
Nick Winter	4c716eb12a	Merge pull request #2276 from AnirudhGP/patch-2 ... Added some quotes for #710	2015-02-10 12:43:44 -08:00
Nick Winter	3a80fffa15	Merge pull request #2275 from AnirudhGP/patch-1 ... Added more names for #53	2015-02-10 12:43:04 -08:00
Martin Folkeseth	1fb2771d24	Edited nb.coffee	2015-02-10 21:39:04 +01:00
Imperadeiro98	c37398b2c1	Small fix to last merge	2015-02-10 19:57:34 +00:00
Nick Winter	db2b0c29fe	Merginated.	2015-02-10 11:54:57 -08:00
Barney	201ef800bc	Merge remote-tracking branch 'upstream/master'	2015-02-11 03:38:47 +08:00
Barney	31c5ce30cd	Update zh-HANT.coffee	2015-02-11 03:38:43 +08:00
Imperadeiro98	92b8e2354e	Small fix to last merge	2015-02-10 19:27:27 +00:00
Imperadeiro98	94cfe2011c	Merge pull request #2282 from matifol/patch-1 ... Translated share_progress_modal	2015-02-10 19:25:56 +00:00
Imperadeiro98	d8eea3923f	Small fix to last commit	2015-02-10 19:09:11 +00:00
Imperadeiro98	92b80b591d	Merge pull request #2283 from ArthurLu/master ... Update zh-HANT.coffee	2015-02-10 19:07:26 +00:00
Imperadeiro98	8264048f31	Merge pull request #2271 from jhoon/translations-es-419 ... Translating share_progress_modal section	2015-02-10 18:58:32 +00:00
Barney	2e4c261ada	Update zh-HANT.coffee	2015-02-11 02:27:54 +08:00
Martin Folkeseth	28f6c5dc38	Translated share_progress_modal ... Kept all the old strings for future reference.	2015-02-10 19:06:51 +01:00
divyanshu013	2b090a9841	Fixed the issue with the Leaderboard view to fit properly for #2254 ... The leaderboard view fits properly while scrolling down.	2015-02-10 23:27:23 +05:30
Barney	2546082eaf	Update zh-HANT.coffee	2015-02-11 01:02:37 +08:00
laituan245	70ec7996c2	Added more names for #53	2015-02-10 23:26:02 +09:00
Anirudh GP	b422508f2d	Added some quotes for #710	2015-02-10 14:41:04 +05:30
Anirudh GP	ada239b50d	Added some quotes for #710	2015-02-10 14:41:03 +05:30
Anirudh GP	9184588969	Added more names for #53	2015-02-10 14:32:02 +05:30
Barney	6b8e9ad808	Update zh-HANT.coffee	2015-02-10 14:04:43 +08:00
Barney	60ff41ccf4	Merge remote-tracking branch 'upstream/master'	2015-02-10 13:12:11 +08:00
Barney	16708aacc8	Update zh-HANT.coffee	2015-02-10 13:12:09 +08:00
FedericoTomas	fa5134d09b	Actualizando(Update) ... Actualice un poco.	2015-02-10 01:18:25 -03:00
Jhoon Saravia	f2534e2098	Translating leaderboard section and some tips	2015-02-09 18:22:52 -05:00
Jhoon Saravia	c9c8c3e755	Translating share_progress_modal	2015-02-09 18:08:59 -05:00
Matt Lott	c4620a7b2d	Refactor analytics event logging ... Clean up property slimming. Save explicit identity traits in properties.	2015-02-09 15:03:04 -08:00
Martin005	44fb8281bf	Update cs.coffee ... Finally done all translations :)	2015-02-09 23:22:04 +01:00
Nick Winter	abbab26d80	Using i18n for achievement descriptions in HeroVictoryModal.	2015-02-09 13:06:00 -08:00
Imperadeiro98	92531e366b	Update en.coffee	2015-02-09 20:01:51 +00:00
Imperadeiro98	8718cd280f	Added i18n	2015-02-09 20:00:52 +00:00
Imperadeiro98	f062f446d3	Fixed i18n	2015-02-09 19:57:28 +00:00
Imperadeiro98	bebada7f43	Update pt-PT.coffee	2015-02-09 19:50:18 +00:00
Imperadeiro98	8fb8e139b7	Small indentation fix	2015-02-09 19:47:09 +00:00
Nick Winter	19a9d8c9aa	Propagated i18n.	2015-02-09 11:31:42 -08:00
Nick Winter	16a8478f97	Merginated.	2015-02-09 11:30:52 -08:00
Nick Winter	5decf7ae36	Workaround for #2259, although I haven't been able to reproduce when it happens.	2015-02-09 11:11:52 -08:00
Nick Winter	7b34f90230	Added rough draft of subscribe button in gem shop.	2015-02-09 09:22:18 -08:00
Nick Winter	c2a4700aa2	Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well.	2015-02-09 08:42:24 -08:00
Nick Winter	61896083a9	Missed my save on that last one.	2015-02-09 08:39:40 -08:00
Nick Winter	1c41c1df91	Merged more tips in en.coffee.	2015-02-09 08:38:29 -08:00
Nick Winter	65c0abd3ab	Merged those tips in en.coffee.	2015-02-09 08:35:38 -08:00
Nick Winter	b2dc80b467	Merged those loading tips.	2015-02-09 08:34:13 -08:00
Nick Winter	7ee7269d39	Merge pull request #2191 from JKniager/patch-1 ... Added More Names	2015-02-09 08:32:32 -08:00
Nick Winter	0cee873157	Moved new buy gems background from compiled output to input dir.	2015-02-09 08:31:06 -08:00
Nick Winter	22c2c7df63	Fixed bug with incompletely added levels jamming the campaign editor.	2015-02-09 08:19:59 -08:00
TJ Ledwith	292e679cc6	Update level_loading.jade	2015-02-09 07:08:33 -05:00
Nick Winter	38c6d6f531	Merge pull request #2263 from divyanshu013/master ... Improved upon the Buy Gems Window for #2238	2015-02-08 21:44:57 -08:00
divyanshu013	4269f6a652	Improved upon the Buy Gems Window for #2238 ... Added the header and close button for the Buy Gems Window.	2015-02-09 02:31:03 +05:30
Imperadeiro98	983d8c761a	Merge pull request #2262 from ArthurLu/master ... Update zh-HANT.coffee	2015-02-08 19:55:00 +00:00
Imperadeiro98	2bca3e1733	Merge pull request #2255 from tutosfaciles48/patch-1 ... Update fr.coffee	2015-02-08 19:47:43 +00:00
TJ Ledwith	a7b7d61c08	Update en.coffee	2015-02-08 14:06:25 -05:00
Barney	245de23aff	Update zh-HANT.coffee	2015-02-08 21:21:32 +08:00
Barney	5f0adfae0c	Update zh-HANT.coffee	2015-02-08 20:56:23 +08:00
Barney	c88ccd7d8f	Update zh-HANT.coffee	2015-02-08 20:41:20 +08:00
Erik Mogensen (@mogsie)	00f4e1e894	lint complained	2015-02-08 12:47:49 +01:00
Erik Mogensen (@mogsie)	eab4174f78	More norwegian translations.	2015-02-08 12:38:17 +01:00
Imperadeiro98	d876c81c97	Made #back-button a button	2015-02-07 22:33:48 +00:00
tutosfaciles48	6ccba1b1a9	Update fr.coffee ... changement d'une phrase encore en anglais.	2015-02-07 22:23:09 +01:00
Imperadeiro98	8b721a7c47	Better indentation	2015-02-07 10:47:31 +00:00
Matt Lott	d5ac001a55	Restrict share progress prompt to named players	2015-02-06 19:49:13 -08:00
Nick Winter	3e07e45766	Merge pull request #2246 from h3yduck/master ... Fix bug: cannot upload profile picture	2015-02-06 18:15:15 -08:00
Nick Winter	cf09f01b03	Some style fixes to prettify the new background image avatars in user dropdown for #2247.	2015-02-06 18:10:12 -08:00
Nick Winter	9a29f898a9	Merge branch 'fix-profile-pic-bug' of git://github.com/h3yduck/codecombat into h3yduck-fix-profile-pic-bug	2015-02-06 18:01:25 -08:00
Nick Winter	8ab6f36364	Crude initial version of ASCII representation for blind players.	2015-02-06 16:54:55 -08:00
Matt Lott	972c3d0d6f	Share progress modal ... Shown after forgetful-gemsmith	2015-02-06 14:49:50 -08:00
Nick Winter	e311eb2700	Fixed preloading of level sessions before starting a level.	2015-02-06 13:04:15 -08:00
Imperadeiro98	d2f0f3d1fc	Update pt-PT.coffee	2015-02-06 20:49:51 +00:00
Nick Winter	0f7b7c7a9c	Propagated i18n. Fixed #2253.	2015-02-06 12:08:31 -08:00
Imperadeiro98	b30de2bfa8	Small fix to last commit	2015-02-06 20:04:44 +00:00
Imperadeiro98	5b04bdcaba	Merge pull request #2252 from JulR43/patch-3 ... Update fr.coffee	2015-02-06 20:04:14 +00:00
Nick Winter	2bd7c86638	Added bottom footer background texture.	2015-02-06 11:17:48 -08:00
Nick Winter	3da36ccc5d	Added new level loading bar art. Using illustrated Start Level button.	2015-02-06 10:26:38 -08:00
JulR43	ef2f610ba2	Update fr.coffee ... Translations	2015-02-06 19:06:10 +01:00
Matt Lott	f6bcc94bf8	Fix oneTimes email schema ... Changing ‘targetEmail’ field to ‘email’.	2015-02-06 09:47:06 -08:00
Imperadeiro98	b3d432d3ae	Some fixes to last commit	2015-02-06 15:19:05 +00:00
newmilktea	5e0c266094	Update zh-HANT.coffee	2015-02-06 22:14:15 +08:00
newmilktea	5e4a1ba4c8	Update zh-HANT.coffee	2015-02-06 22:08:26 +08:00
newmilktea	cf5b14e2c5	Update zh-HANT.coffee	2015-02-06 21:13:06 +08:00
newmilktea	6f4897da4d	Update zh-HANT.coffee	2015-02-06 21:08:39 +08:00
newmilktea	1752f12b32	Merge remote-tracking branch 'upstream/master' ... Conflicts: app/locale/zh-HANT.coffee	2015-02-06 20:52:02 +08:00
newmilktea	cee95397fa	Update zh-HANT.coffee	2015-02-06 20:49:09 +08:00
Nick Winter	860868c285	Stopped preloading sessions for now, since it's buggy.	2015-02-05 16:14:32 -08:00
Nick Winter	3cbf11d404	Added a back button to hit campaign selector view.	2015-02-05 15:40:45 -08:00
Nick Winter	1d8f91c42f	Added campaign world selector portal screen for half of players.	2015-02-05 15:05:33 -08:00