11 Commits

Author	SHA1	Message	Date
Scott Goodson	a2cf2a88e6	Overhaul header files / includes to eliminate circular references that Xcode 7 is angry about.	2015-12-25 19:22:00 -08:00
Scott Goodson	882d4b336e	Merge branch 'master' into pr/664	2015-12-25 14:32:41 -08:00
Aaron Schubert	e35697d162	Greatly improve the internal logic of ASMapNode. Also fixes bug #971	2015-12-23 10:19:05 +00:00
Adlai Holler	69767d558e	Merge branch 'master' into update-objc ... Conflicts: AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h	2015-12-22 00:28:21 -05:00
Aaron Schubert	4ceab33038	Further clean up for ASDK 2.0	2015-12-16 10:20:13 +00:00
Adlai Holler	e202b18db9	Annotate some new stuff	2015-12-13 10:07:14 -08:00
Aaron Schubert	1dfb8fac67	Changed init method, as well as further clean up to get ASMapNode ready for 2.0	2015-12-08 10:37:00 +00:00
Aaron Schubert	79b4c95749	Substantially improved ASMapNode and made it a lot clearer and less complex internally.	2015-12-03 11:22:05 +00:00
Aaron Schubert	863156b2dc	Changed hasLiveMap to liveMap/isLiveMap. Removed internal action handler. Renamed ASDisplayNode liveMap to mapView to avoid naming confusion.	2015-11-16 13:48:21 +00:00
Aaron Schubert	46bf49cae7	Fix indentation	2015-11-12 12:18:09 +00:00
Aaron Schubert	fe06f211ca	Added an ASMapNode to AsyncDisplayKit	2015-11-12 12:13:42 +00:00