Commit graph

3400 commits

Author SHA1 Message Date
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
Nick Winter
c0d67594ce Merge pull request #574 from walkingtospace/master
Added korean locale
2014-03-16 09:02:44 -07:00
IngridMorstrad
8d9a8aaf73 Change victory.jade to use the base template 2014-03-16 21:16:00 +05:30
Mikhail Koltsov
160c99b2b8 whatever 2014-03-16 19:11:55 +04:00
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
Mikhail Koltsov
0474b2ceb5 localhost default user = admin 2014-03-16 16:15:26 +04:00
IngridMorstrad
4db433c062 Fixes #566, admin on localhost by default 2014-03-16 17:25:19 +05:30
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
Nick Winter
d5a4b1f5ef Merge pull request #563 from TigroTigro/patch-2
Update pl.coffee
2014-03-15 14:12:10 -07:00
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
Nick Winter
be8b61fda4 Merge pull request #562 from TigroTigro/patch-1
Update pl.coffee
2014-03-15 12:41:24 -07: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
1fa14e8afd Merge pull request #559 from codecombat/master
Changed response for count API
2014-03-15 09:43:54 -07:00
Michael Schmatz
613439d175 Changed response for count API 2014-03-15 09:40:58 -07:00
Michael Schmatz
32147cc16b Merge pull request #557 from codecombat/master
Master into production
2014-03-15 09:24:30 -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
bang honam
845d4cecef Added a space for coding convention 2014-03-15 08:30:29 -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
801eb0a9f7 Merge branch 'master' into production 2014-03-15 07:51:07 -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
93a7530b37 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-14 15:24:39 -07:00
George Saines
c00c7ed56b adding the new website background images 2014-03-14 15:24:36 -07:00