Ricardo Quesada 6a19661a80 Merge pull request #12150 from ricardoquesada/material_custom_uniforms ... Material custom uniforms		2015-06-03 13:08:04 -07:00
..
2d	Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms	2015-06-02 17:05:05 -07:00
3d	Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms	2015-06-02 17:05:05 -07:00
audio	Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall	2015-06-01 11:19:01 +08:00
base	add assert to make program more robust	2015-05-26 17:25:42 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	added Windows 10 UWP project files	2015-05-28 13:51:25 -07:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
network	Merge pull request #12103 from samuele3hu/v3_http_leak	2015-06-02 10:11:03 +08:00
physics	Correct field initialization order in various places (Xcode warnings)	2015-05-01 12:19:30 +03:00
physics3d	use reference param	2015-05-13 10:13:46 +08:00
platform	Merge pull request #12137 from WenhaiLin/v3-text-line-height	2015-06-03 16:24:38 +08:00
renderer	fixes win compilation issues	2015-06-02 23:31:57 -07:00
scripting	Merge pull request #12095 from jianglong0156/videoplayer	2015-06-02 17:35:56 +08: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	add Android 9-patch image format support	2015-05-21 16:04:37 +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	Merge pull request #12072 from iris-wy/v3	2015-05-29 15:32:06 +08:00