4620 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Imperadeiro98	caa372628b	Fixed errors	2014-08-30 13:48:19 +01:00
Tore Haugland	635f0224e4	Updated locale\no with a more common norwegian than a direct translation from English to make it easier to read for all ages	2014-08-30 11:06:10 +02:00
Tore Haugland	41e9778b3c	Updated locale\no with correct letter case on several translations	2014-08-30 10:54:30 +02:00
99133799	ece96bce2a	Update ro.coffee	2014-08-30 10:31:24 +03:00
Nick Winter	e5cf6c340b	Fixed #1140. I just put it on the home page for now, but later we can put it somewhere where it makes sense.	2014-08-29 23:09:38 -07:00
Nick Winter	40aa95ba16	Fixed #1297.	2014-08-29 18:07:32 -07:00
Scott Erickson	7a9c53e424	All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.	2014-08-29 18:04:50 -07:00
Scott Erickson	21e0889a86	All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.	2014-08-29 18:02:29 -07:00
Nick Winter	cb14149816	Fixed #1286. Sort of.	2014-08-29 17:52:47 -07:00
Nick Winter	63f2c5db4f	Fixed #1268.	2014-08-29 17:33:25 -07:00
Nick Winter	b918f5adfb	Fixed #1262.	2014-08-29 17:18:38 -07:00
Scott Erickson	3f6c9c4f02	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-08-29 17:12:44 -07:00
Nick Winter	5503b3a2bc	Fixed #1147.	2014-08-29 17:03:02 -07:00
Scott Erickson	b4d9a787f0	Fixed the rest of the server tests.	2014-08-29 16:28:07 -07:00
Nick Winter	68dcdaf223	A couple achievment/item editor error fixes.	2014-08-29 13:00:11 -07:00
Scott Erickson	0ba9db6c14	Fixed some server tests.	2014-08-29 12:58:23 -07:00
Scott Erickson	f54c3236ab	Refactored Achievement's getExpFunction to use the new defaults system, now on the server side.	2014-08-29 12:41:25 -07:00
Scott Erickson	434a0c071b	Few more bugs fixed for defaults.	2014-08-29 12:29:42 -07:00
Scott Erickson	ba238137c3	Went back to pointing to the latest version of treema cause there are still changes to quickly grab.	2014-08-29 12:29:11 -07:00
Scott Erickson	2dfe39aafd	Migrated Achievement model's getExpFunction to use the new defaults system.	2014-08-29 12:28:45 -07:00
Scott Erickson	f93ef2005e	Level editor only folds in ThangType components into Thang component configs if the level is type 'hero'.	2014-08-29 11:34:32 -07:00
Scott Erickson	0236ca6fa9	Apparently comments in json don't fly.	2014-08-29 09:17:06 -07:00
Scott Erickson	8b7f3c8cbe	Set treema back to an actual version.	2014-08-29 09:16:17 -07:00
Scott Erickson	570380c2a4	Merge branch 'master' into feature/defaults	2014-08-29 08:14:43 -07:00
Nick Winter	a4b2333fd3	Added Systems documentation. Fixed #1115.	2014-08-28 22:32:55 -07:00
Nick Winter	124f999bc8	Fixed #1105. Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.	2014-08-28 19:39:46 -07:00
Nick Winter	f74a152942	Fixed #1104.	2014-08-28 18:55:33 -07:00
Scott Erickson	9406a8c920	Merge branch 'master' into feature/defaults	2014-08-28 17:58:58 -07:00
Scott Erickson	5fd154ca8b	Tweaked the level serialization, leaving in walkDefaults for now because there may still be some components that don't have defaults properly set up. Added a warn log for when this happens so it can be fixed.	2014-08-28 17:57:39 -07:00
Nick Winter	e67b4ae064	Fixed #1090.	2014-08-28 17:08:05 -07:00
Scott Erickson	74ca7fe0cc	Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema.	2014-08-28 17:05:46 -07:00
Scott Erickson	608d114c5c	Fixed metaschemas not being found.	2014-08-28 15:54:05 -07:00
Scott Erickson	8f95ad2787	Fixed a few bugs.	2014-08-28 15:42:46 -07:00
Scott Erickson	2dde77f8b0	Merge branch 'master' into feature/defaults	2014-08-28 15:26:04 -07:00
Scott Erickson	154b91c753	Changed LevelLoader to always deeply load components and thang types, not just for hero levels.	2014-08-28 15:19:04 -07:00
Nick Winter	0fa5d264f4	Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle.	2014-08-28 14:25:37 -07:00
Nick Winter	107a727d02	Fixed a bug in the WizardSettingsModal being destroyed and still trying to do things.	2014-08-28 14:06:53 -07:00
Nick Winter	f79a2848fd	Fixed #1038. Focus should now remain on code editor when after clicking on Surface.	2014-08-28 14:00:54 -07:00
Scott Erickson	e3bc9045d1	Couple tweaks.	2014-08-28 13:53:00 -07:00
Scott Erickson	8b056cfb8f	Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.	2014-08-28 11:24:45 -07:00
Nick Winter	1094d09aa5	Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode.	2014-08-28 11:23:52 -07:00
Nick Winter	d7ae07c012	Fixed Facebook login bug.	2014-08-28 11:16:55 -07:00
Nick Winter	a471462279	Merge pull request #1497 from Imperadeiro98/master ... Update pt-PT.coffee	2014-08-28 10:51:30 -07:00
Nick Winter	54207f0f7d	Fixed #1000.	2014-08-28 10:50:20 -07:00
Imperadeiro98	92055aaa21	Update pt-PT.coffee	2014-08-28 18:20:52 +01:00
Scott Erickson	94065a0c4c	Merged conflicts.	2014-08-28 09:59:07 -07:00
Scott Erickson	8b943d1c2c	Merged conflicts.	2014-08-28 09:59:03 -07:00
Nick Winter	a0e1806239	Fixed a bug with old, un-migrated level-set-playing events in button handlers.	2014-08-28 09:52:51 -07:00
Scott Erickson	f8f67833d1	Refactored the config defaults script to work on systems, too, and save results.	2014-08-28 09:52:46 -07:00
Nick Winter	a50f6b9224	Fixed a bug with reloading non-writable code.	2014-08-28 09:41:47 -07:00