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
Nick Winter
c28d2bb576
Merge pull request #545 from dkundel/master
...
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
2014-03-14 07:35:11 -07:00
Dominik Kundel
190469d794
removed unnecessary comment
2014-03-14 03:28:20 +01:00
Dominik Kundel
0392f630cc
including i18n support for new editor config and minor styling changes
2014-03-14 03:26:53 +01:00
Nick Winter
6e9945040f
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
2014-03-13 19:20:22 -07:00
Michael Schmatz
54cbbd2234
Merge pull request #544 from codecombat/master
...
Master into production
2014-03-13 19:12:13 -07:00
Nick Winter
4f0805ce1e
I changed the semantics of the i18n fallback to not hit 'text' for other properties, so updated a test.
2014-03-13 18:50:52 -07:00
Dominik Kundel
7e955c72b8
apply config to editor
2014-03-14 02:49:58 +01:00
Michael Schmatz
291f5eb02f
Disabled authentication for now
2014-03-13 18:41:58 -07:00
Nick Winter
795bd8f63b
Moved Glen from Archmages to About.
2014-03-13 18:27:08 -07:00
Dominik Kundel
8a5aeb6227
save editor config to database
2014-03-14 02:09:11 +01:00
Dominik Kundel
fca5bbfb1f
added aceConfig to user schema
2014-03-14 02:08:31 +01:00
Nick Winter
42a8862fa9
Merge pull request #541 from dkundel/master
...
Easy use of coordinates as discussed in #10 and minor fixes
2014-03-13 18:05:04 -07:00
Darredevil
88659aa191
Update ro.coffee
...
Check line 234
Also need alternative for the word "ladder" in this context, there is translation that makes sense(will try to see how other games translate it and come back)
2014-03-14 03:00:32 +02:00
Nick Winter
a22c390568
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 17:59:21 -07:00
Nick Winter
8b572f0647
Using isThang instead of instanceof Thang.
2014-03-13 17:59:17 -07:00
Dominik Kundel
6f2a04c5c0
added new editor config modal
2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32
added button to access new modal for editor config
2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b
highlight lines after insertion
2014-03-14 00:52:18 +01:00
Michael Schmatz
68f2679421
Merge pull request #542 from codecombat/master
...
Master into production
2014-03-13 16:12:56 -07:00
Michael Schmatz
edb28f6caf
Changed cron handler IP check
2014-03-13 16:11:44 -07:00
Nick Winter
8ccd12866e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 15:46:53 -07:00
Scott Erickson
8431fd1e57
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 15:45:41 -07:00