kgy01
|
a420064bc1
|
hide spear's shadow if buried
|
2014-03-25 08:31:38 -04:00 |
|
kgy01
|
3cc422a281
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-25 08:10:30 -04:00 |
|
kgy01
|
c48863fae6
|
Hide arrow's shadow if buried
|
2014-03-25 08:06:37 -04:00 |
|
Glen De Cauwsemaecker
|
0e7530e96d
|
Merge pull request #682 from Darredevil/patch-3
Update ro.coffee
|
2014-03-25 03:02:23 +01:00 |
|
Darredevil
|
4bb1ee5c74
|
Update ro.coffee
|
2014-03-25 02:55:07 +02:00 |
|
Glen De Cauwsemaecker
|
3382750c7e
|
Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat
|
2014-03-25 01:13:30 +01:00 |
|
Scott Erickson
|
bda499b561
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 14:43:08 -07:00 |
|
Scott Erickson
|
2c329a256f
|
Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.
|
2014-03-24 14:42:56 -07:00 |
|
Nick Winter
|
97613f12b4
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 14:38:35 -07:00 |
|
Nick Winter
|
a42e33764e
|
Merged, fixed.
|
2014-03-24 14:38:18 -07:00 |
|
Scott Erickson
|
53118984ff
|
Undid a listenTo on a jQuery elem.
|
2014-03-24 14:29:53 -07:00 |
|
Scott Erickson
|
57f6f4d244
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 14:27:28 -07:00 |
|
Scott Erickson
|
e9b3db2eb9
|
Fixed destroy to not break stopListening, which uses off.
|
2014-03-24 14:27:10 -07:00 |
|
Ruben Vereecken
|
a3f65ace7a
|
Created differentation between nl-BE and nl-NL
|
2014-03-24 22:21:34 +01:00 |
|
Nick Winter
|
e6e216fcd3
|
Mergred Diplomats.
|
2014-03-24 14:20:40 -07:00 |
|
Ruben Vereecken
|
3f3eeab02a
|
Fixed NaN in ladder in case a player has never played before
|
2014-03-24 19:46:50 +01:00 |
|
Michael Schmatz
|
83bfc28a9e
|
Partially refactored scoring callback pyramid of hell
|
2014-03-24 10:58:43 -07:00 |
|
Scott Erickson
|
f55cef5ced
|
Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents
|
2014-03-24 10:38:57 -07:00 |
|
Shrihari
|
093cc66fa0
|
Reverted few wrong migrations
|
2014-03-24 22:56:32 +05:30 |
|
Shrihari
|
f085b0d319
|
Refactored cast-button events
|
2014-03-24 22:41:27 +05:30 |
|
Shrihari
|
0160538b44
|
More migrations
|
2014-03-24 22:28:34 +05:30 |
|
Scott Erickson
|
bf039ed485
|
Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema)
Select dependents when a extant component is selected.
|
2014-03-24 09:31:27 -07:00 |
|
Scott Erickson
|
6de62154bd
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 09:28:06 -07:00 |
|
Shrihari
|
69ee16f77f
|
Fixed wrong migrations
|
2014-03-24 21:37:09 +05:30 |
|
Nick Winter
|
92c87dc4ad
|
Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view
|
2014-03-24 08:28:48 -07:00 |
|
Ting-Kuan
|
e9118142db
|
Fix issue #662
|
2014-03-24 10:54:59 -04:00 |
|
Shrihari
|
5845125b43
|
Migrate .on, .once - Fixed a small error
|
2014-03-24 12:32:29 +05:30 |
|
Shrihari
|
67f5270bfc
|
Migrate .on, .once - Batch 1
|
2014-03-24 12:23:41 +05:30 |
|
Akaza Akari
|
3e4d7d745a
|
Script-based movement for all CocoSprites for #140
|
2014-03-23 23:19:18 -07:00 |
|
Nick Winter
|
5852b87aa3
|
A little longer debounce is better.
|
2014-03-23 18:55:44 -07:00 |
|
Nick Winter
|
808762c229
|
Merge pull request #663 from domenukk/master
fixes codecombat/codecombat#655
|
2014-03-23 18:11:40 -07:00 |
|
Dominik Maier
|
f66e210c73
|
regarding codecombat/codecombat#655 debounce debounces.
|
2014-03-24 01:18:36 +01:00 |
|
Nick Winter
|
dbeb3d445b
|
Give focus back to spell view on palette click.
|
2014-03-23 16:48:30 -07:00 |
|
Dominik Maier
|
dcbd55a864
|
regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.
|
2014-03-24 00:47:41 +01:00 |
|
Nick Winter
|
4a47c5b517
|
Dead Thangs sink down a bit in the layer order.
|
2014-03-23 16:21:36 -07:00 |
|
Nick Winter
|
fcfa0d4eca
|
Updated Glen's portrait URL in the README.
|
2014-03-23 16:15:30 -07:00 |
|
Nick Winter
|
656b34fc34
|
Fixed comment gutter icons jumping all over the place.
|
2014-03-23 16:00:23 -07:00 |
|
Glen De Cauwsemaecker
|
d6178aa2cc
|
Fixed a small error
|
2014-03-24 00:46:44 +01:00 |
|
Glen De Cauwsemaecker
|
724592601c
|
Merge branch 'master' of github.com:JasperDhaene/codecombat
|
2014-03-24 00:45:09 +01:00 |
|
Glen De Cauwsemaecker
|
131b963bfb
|
Merge github.com:codecombat/codecombat
|
2014-03-24 00:44:46 +01:00 |
|
Nick Winter
|
b922b9dd20
|
Increased number of matches played.
|
2014-03-23 15:34:38 -07:00 |
|
Dominik Maier
|
0dee3d042f
|
fixes codecombat/codecombat#655 completely
Removes asynchronous name checking, though, if it ever worked.
|
2014-03-23 23:04:39 +01:00 |
|
JasperDhaene
|
58601e95f6
|
finished review of nl.coffee
|
2014-03-23 22:54:30 +01:00 |
|
Nick Winter
|
9fbd008f59
|
Merge branch 'ItsLastDay-arrow'
|
2014-03-23 14:15:24 -07:00 |
|
Nick Winter
|
d85dd9f62c
|
Bringing in #664, but only when maximizesArc is on.
|
2014-03-23 14:15:06 -07:00 |
|
Mikhail Koltsov
|
13338afe3d
|
Now absolutely done scaling (#46)
also commented math's out.
|
2014-03-23 23:51:46 +04:00 |
|
Mikhail Koltsov
|
446726acc9
|
done rotating, looks good in Zone of Danger (#46)
|
2014-03-23 22:13:07 +04:00 |
|
Dominik Maier
|
459a1f9e48
|
fixes codecombat/codecombat#655
|
2014-03-23 18:41:15 +01:00 |
|
Nick Winter
|
111973e1c8
|
Maybe this will be better - more on #650.
|
2014-03-23 10:29:08 -07:00 |
|
Nick Winter
|
7ba959045a
|
A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added.
|
2014-03-23 10:00:16 -07:00 |
|