codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-14 17:51:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9885 commits 27 branches 0 tags 134 MiB
Commit graph

9885 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Schmatz
734ef06c25 Merge pull request #552 from codecombat/master 
Another hot fix for #550
 2014-03-14 14:41:58 -07:00
Michael Schmatz
6e9e3ccc3c Another hot fix for #550 2014-03-14 14:41:39 -07:00
Michael Schmatz
242ca0c475 Merge pull request #551 from codecombat/master 
Hotfix for #550
 2014-03-14 14:28:52 -07:00
Michael Schmatz
7d150d96e8 Hotfix for #550 2014-03-14 14:27:43 -07:00
Michael Schmatz
c43d7b1ebc Merge pull request #549 from codecombat/master 
Master into production
 2014-03-14 13:30:38 -07:00
Michael Schmatz
07a0057e72 Removed defaults on schema for ladder-related things 2014-03-14 13:20:42 -07:00
Michael Schmatz
075ea23be9 Fixed random sessions fetching 2014-03-14 12:54:54 -07:00
Scott Erickson
39ed6c3a43 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-14 11:58:42 -07:00
Scott Erickson
af8008596a Made editing thangs in the level editor not so slow by avoiding calling level.serialize. 2014-03-14 11:58:29 -07:00
Scott Erickson
eee4934d1b Put back the sort for the leaderboard handler. 2014-03-14 11:57:17 -07:00
Michael Schmatz
71aa6cc2c6 Added random session pair choosing 
Due to a bug I cannot test this immediately
 2014-03-14 11:30:06 -07:00
Jayant Jain
ece932595c Enables drag-panning for editor and region chooser 2014-03-14 23:57:00 +05:30
Jayant Jain
d8418f7bb2 Fixes issue where panning occurs upon mouse scroll at max/min zoom 2014-03-14 23:57:00 +05:30
Nick Winter
c0e966a08c Propagated new editor i18n tags. 2014-03-14 10:24:07 -07:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
3c0b496033 Fix for if aceConfig doesn't exist yet. 2014-03-14 07:46:36 -07:00