Michael Schmatz
|
8440968ea5
|
Merge pull request #528 from codecombat/master
Merge master into production
|
2014-03-12 11:46:27 -07:00 |
|
Nick Winter
|
77c9217357
|
Better handling of refreshing ladder and matches views depending on idle state.
|
2014-03-12 11:39:09 -07:00 |
|
Scott Erickson
|
7e8f74f385
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 10:09:06 -07:00 |
|
Scott Erickson
|
fe93d31929
|
Fixed loading marks so they are positioned correctly when they load and the world is paused.
|
2014-03-12 10:08:57 -07:00 |
|
Michael Schmatz
|
6563f43511
|
Edited fallback route to use all methods in fallback
|
2014-03-12 10:07:21 -07:00 |
|
Nick Winter
|
49ab47e3fe
|
Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script.
|
2014-03-12 10:01:31 -07:00 |
|
Nick Winter
|
f83fe6ce14
|
Fixed bugs with sprite rotation updating.
|
2014-03-12 09:31:45 -07:00 |
|
Nick Winter
|
d9b8375744
|
Merge pull request #513 from rubenvereecken/treema_fix
Treema fix
|
2014-03-12 09:21:52 -07:00 |
|
Ruben Vereecken
|
bd129f5824
|
No dropdown for sound in readOnly Treemas.
|
2014-03-12 17:19:47 +01:00 |
|
Scott Erickson
|
52733d5a1e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 09:15:48 -07:00 |
|
Scott Erickson
|
939c5faa1a
|
Fixed a bug when a thang has multiple effects.
|
2014-03-12 09:15:37 -07:00 |
|
Nick Winter
|
2e354a7f11
|
Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.
|
2014-03-12 09:10:36 -07:00 |
|
Nick Winter
|
da762fbc4f
|
Merge branch 'rubenvereecken-versions_modal'
|
2014-03-12 08:30:02 -07:00 |
|
Nick Winter
|
0125c46dc2
|
Resolved merge conflict.
|
2014-03-12 08:29:42 -07:00 |
|
Michael Schmatz
|
23f62e5598
|
Added ip checks on cron mail route
|
2014-03-12 08:11:48 -07:00 |
|
Ruben Vereecken
|
27fd580324
|
Got rid of CRLF line endings
|
2014-03-12 16:03:36 +01:00 |
|
Ruben Vereecken
|
4b72ee1d04
|
Clean up
|
2014-03-12 15:43:49 +01:00 |
|
Ruben Vereecken
|
8acf35b290
|
Added i18n for components
|
2014-03-12 15:42:57 +01:00 |
|
Ruben Vereecken
|
ddae5d0763
|
Added Version History to Level Components
|
2014-03-12 15:32:55 +01:00 |
|
Michael Schmatz
|
a6fb2a3994
|
Various changes to spectate view
|
2014-03-12 07:32:30 -07:00 |
|
Ruben Vereecken
|
2a86daaa2a
|
Added Version History to Thang Types
|
2014-03-12 15:22:15 +01:00 |
|
Nick Winter
|
b7761c5ffc
|
Merge pull request #525 from prabh27/patch-3
Update play_view.coffee
|
2014-03-12 07:00:12 -07:00 |
|
TigroTigro
|
a8eff71438
|
Update pl.coffee
|
2014-03-12 14:01:35 +01:00 |
|
TigroTigro
|
85b1b81149
|
Update pl.coffee
|
2014-03-12 13:47:58 +01:00 |
|
TigroTigro
|
b1ab6225ee
|
Update pl.coffee
|
2014-03-12 13:16:09 +01:00 |
|
Prabh Simran Singh Baweja
|
5e964cd6cf
|
Update play_view.coffee
New Level Added : Sword Loop
|
2014-03-12 15:58:33 +05:30 |
|
Dominik Kundel
|
dd87215012
|
Avoid overwriting gutter symbols of error, warning, info
|
2014-03-12 11:26:56 +01:00 |
|
Scott Erickson
|
9cb80783ff
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-11 22:01:47 -07:00 |
|
Scott Erickson
|
8ddbb49845
|
Trying out promises to simplify view loading.
|
2014-03-11 22:01:38 -07:00 |
|
Nick Winter
|
3b536eb673
|
Merge branch 'master' into production
|
2014-03-11 21:48:25 -07:00 |
|
Nick Winter
|
d44e1aad6a
|
That's not how Mongoose select strings work, now, is it?
|
2014-03-11 21:48:11 -07:00 |
|
Nick Winter
|
e1db304d92
|
Merge branch 'master' into production
|
2014-03-11 21:17:10 -07:00 |
|
Nick Winter
|
218c542a5a
|
Realized why scoring chains were ending early.
|
2014-03-11 21:16:53 -07:00 |
|
Nick Winter
|
e2e7b876a4
|
Merge branch 'master' into production
|
2014-03-11 19:41:31 -07:00 |
|
Nick Winter
|
b7ae1f7e25
|
The sessions should set isRanking false when they win.
|
2014-03-11 19:40:22 -07:00 |
|
Nick Winter
|
b560827e32
|
Working on cleaning up some server errors.
|
2014-03-11 19:17:58 -07:00 |
|
Darredevil
|
cd4fa9b8c2
|
Merge pull request #1 from codecombat/master
test request
|
2014-03-12 03:53:44 +02:00 |
|
Nick Winter
|
2b487eeed8
|
Using /db/thang.type instead of /db/thang_type in URLs, for consistency.
|
2014-03-11 18:30:25 -07:00 |
|
Nick Winter
|
3f9de34ec7
|
Merge branch 'master' into production
|
2014-03-11 18:16:47 -07:00 |
|
Nick Winter
|
4f9db0a7f7
|
Merged in all names.
|
2014-03-11 18:11:48 -07:00 |
|
Nick Winter
|
ce895ffd75
|
Merge pull request #524 from Darredevil/master
Added GetALLToLocations and KeepALLFromLocations
|
2014-03-11 18:09:50 -07:00 |
|
Nick Winter
|
40ea643f67
|
Merge pull request #523 from dkundel/master
Avoid flickering of editor when executing the script.
|
2014-03-11 18:07:17 -07:00 |
|
Nick Winter
|
8d718a4b16
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-11 18:06:52 -07:00 |
|
Nick Winter
|
8c57b31c54
|
Fixed a couple bugs with the matches tab.
|
2014-03-11 18:06:48 -07:00 |
|
Darredevil
|
07ab1a5b32
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-12 02:52:26 +02:00 |
|
Dominik Kundel
|
c7ca878c69
|
added class property that got missing
|
2014-03-12 01:26:11 +01:00 |
|
Michael Schmatz
|
8eb5f1b830
|
Merge pull request #517 from Darredevil/patch-10
Update ro.coffee
|
2014-03-11 17:26:05 -07:00 |
|
Darredevil
|
fb1e653d17
|
Merge pull request #2 from Darredevil/patch-8
Added descripton
|
2014-03-12 02:20:42 +02:00 |
|
Darredevil
|
a6c508a442
|
Added descripton
|
2014-03-12 02:20:28 +02:00 |
|
Darredevil
|
b1d61d3681
|
Added GetALLToLocations and KeepALLFromLocations schemas
|
2014-03-12 02:11:22 +02:00 |
|