Commit graph

3945 commits

Author SHA1 Message Date
Nick Winter
8733b1e0b0 Merge branch 'master' into production 2014-01-22 10:57:11 -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
Michael Schmatz
c21f304954 Merge pull request #269 from codecombat/master
Merged progress into production
2014-01-21 19:17:36 -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
Michael Schmatz
8fc6db0eca Merge pull request #263 from codecombat/master
Merging into production
2014-01-21 08:53:48 -08: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
fabb40384c Added 'kind' as a property to thang types. 2014-01-20 22:38:52 -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
3dd143b4e3 Added some missing version numbers. 2014-01-20 19:41:03 -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
Scott Erickson
dad21e0338 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-20 09:13:30 -08:00
Scott Erickson
d1176f7ee6 Fixed getDocumentForIdOrSlug to be better at recognizing slugs. 2014-01-20 09:13:18 -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