pandamicro 12de53726d Merge pull request #12182 from VisualSJ/v3-jsb ... [ci skip] Synchronization studio parser		2015-06-11 17:35:15 +08:00
..
2d	Rename CCRenderBufferObject to CCRenderBuffer in windows projects.	2015-06-11 11:45:10 +08:00
3d	Fixed merge conflict issue	2015-06-09 14:06:24 -07:00
audio	Added ogg support to audio engine. Fixed issues #150 and #151	2015-06-03 20:57:14 -07:00
base	Merge branch 'v3' into v3FrameBufferObject	2015-06-10 10:16:42 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Merge pull request #12040 from geron-cn/v3	2015-06-11 14:36:08 +08:00
math	Optimize Vec2	2015-04-19 20:40:52 +03: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	get set gravity	2015-06-07 22:02:06 -07:00
platform	Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix	2015-06-11 14:30:36 +08:00
renderer	Rename CCRenderBufferObject to CCRenderBuffer in windows projects.	2015-06-11 11:45:10 +08:00
scripting	Merge pull request #12182 from VisualSJ/v3-jsb	2015-06-11 17:35:15 +08:00
storage	Implement localStorage.clear on Android	2015-05-14 10:40:25 +08:00
ui	Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path	2015-06-08 17:22:14 +08:00
Android.mk	compiles on android and linux	2015-06-09 17:57:07 +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	file rename CCFrameBufferObject->CCFrameBuffer	2015-06-09 15:32:12 +08:00