| .. |
|
2d
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
3d
|
Merge pull request #15493 from njh0602/somefix
|
2016-04-26 11:41:09 +08:00 |
|
audio
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
base
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
deprecated
|
Merge pull request #14485 from cpascal/fix_libexport
|
2016-04-20 11:26:25 +08:00 |
|
editor-support
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
math
|
Fixes 1605 include path in 541 files
|
2016-03-20 21:53:44 +08:00 |
|
navmesh
|
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
|
2016-01-09 18:01:56 +08:00 |
|
network
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
physics
|
fix: use chipmunk v6.2 API whenever possible
|
2016-04-11 11:12:34 +08:00 |
|
physics3d
|
Fix warnings about signed/unsigned mismatch
|
2016-04-22 12:20:05 +09:00 |
|
platform
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
renderer
|
reset UIGrayScale Shader when reload shaders
|
2016-04-23 13:33:22 +08:00 |
|
scripting
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
storage
|
Fix indentation for readability
|
2016-04-15 04:31:19 +09:00 |
|
ui
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
|
Android.mk
|
remove unsupport flags
|
2016-04-26 14:08:23 +08:00 |
|
CMakeLists.txt
|
Removed unnecessary search paths.
|
2016-03-22 16:04:12 +08:00 |
|
cc_dummy.c
|
Squashed commit of the following:
|
2016-03-02 16:51:54 -08:00 |
|
cocos2d.cpp
|
update cocos2d-x's version to 3.11
|
2016-01-29 14:49:05 +08:00 |
|
cocos2d.h
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
a5602cc732