Jacky d8369dda94 fix on the wp8 universal.		2015-06-09 16:00:51 +08:00
..
2d	fix on the wp8 universal.	2015-06-09 16:00:51 +08:00
3d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon	2015-06-08 13:59:26 +08:00
audio	Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall	2015-06-01 11:19:01 +08:00
base	issue #10323: Fix the compile error when COCOS2D_DEBUG>=2.	2015-06-04 11:58:22 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.	2015-06-04 14:06:31 +08:00
math	Finished AutoPolygon and Sprite	2015-06-04 15:43:31 +08:00
network	Merge pull request #12204 from jianglong0156/issue1756	2015-06-05 13:17:53 +08:00
physics	Correct field initialization order in various places (Xcode warnings)	2015-05-01 12:19:30 +03:00
physics3d	rename syncToNode and syncToPhysics	2015-06-04 12:04:41 +08:00
platform	Merge pull request #12165 from gyf19/v3	2015-06-04 22:00:13 +08:00
renderer	samplers are treated as uniforms	2015-06-05 14:55:33 -07:00
scripting	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-05 23:13:03 +00:00
storage	Implement localStorage.clear on Android	2015-05-14 10:40:25 +08:00
ui	fixed double to float conversion compiler warning	2015-05-28 15:00:49 -07:00
Android.mk	fix on the android.	2015-06-09 13:47:29 +08:00
CMakeLists.txt	add physics3d support	2015-05-08 15:49:33 +08:00
cocos2d.cpp	Material uses new file format	2015-05-11 21:31:33 -07:00
cocos2d.h	deleted more leftover comments, placed polygon test further down the tests	2015-06-08 15:40:18 +08:00