codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-03 12:27:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-03-04 13:55:51 -08:00
commit 3310e2bdbf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/world/ellipse.coffee
View file

@ -153,7 +153,7 @@ class Ellipse
rectangle.intersectsEllipse @ rectangle.intersectsEllipse @
intersectsEllipse: (ellipse) -> intersectsEllipse: (ellipse) ->
@rectangle().intersectsEllipse @ # TODO: actually implement ellipse-ellipse intersection @rectangle().intersectsEllipse ellipse # TODO: actually implement ellipse-ellipse intersection
#return true if @containsPoint ellipse.getPos() #return true if @containsPoint ellipse.getPos()
intersectsShape: (shape) -> intersectsShape: (shape) ->