Ricardo Quesada
|
9082ca18c3
|
Platform fixed
|
2014-09-09 16:50:02 -07:00 |
Huabing.Xu
|
bfaef3574a
|
android works for trianglesCommand
|
2014-09-01 13:57:33 +08:00 |
Dhilan007
|
bef774a14a
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 22:54:28 +08:00 |
samuele3hu
|
3d5f8de346
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 20:58:32 +08:00 |
samuele3hu
|
471820568f
|
Update android.mk of cocos and lua-templates
|
2014-08-27 10:28:04 +08:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
samuele3hu
|
07cf4d3526
|
Fix the win32 and android compile error
|
2014-08-25 14:10:13 +08:00 |
samuele3hu
|
d1b4d43a0b
|
Remove CCModuleManager.h/cpp and adjust the related project
|
2014-08-22 15:10:46 +08:00 |
samuele3hu
|
70cba1f64a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
cocos/Android.mk
|
2014-08-22 14:01:17 +08:00 |
samuele3hu
|
523dcdb6fb
|
Update cocos2d android.mk
|
2014-08-22 13:43:18 +08:00 |
minggo
|
21cb90bf12
|
Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR
Migrate some changes from Cocos2d-JS to -x
|
2014-08-21 22:38:59 +08:00 |
pandamicro
|
34b93a24ff
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
|
2014-08-21 16:07:19 +08:00 |
minggo
|
4563e65427
|
fix compiling error on android and fix some coding style
|
2014-08-21 15:41:05 +08:00 |
pandamicro
|
9544482058
|
Fix Android.mk s
|
2014-08-21 15:40:42 +08:00 |
andyque
|
9a3c2dc6a4
|
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-20 09:56:16 +08:00 |
minggo
|
cdd67be77a
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
minggo
|
f2f8035724
|
Merge pull request #7708 from super626/obb
AABB, OBB
|
2014-08-15 15:32:14 +08:00 |
minggo
|
bf75e9996a
|
separate jpeg, tiff and webp
|
2014-08-15 14:29:10 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |
gin0606
|
17aa2833db
|
Fix xcode warning that cause `getEngine` inline expansion
|
2014-08-12 18:07:17 +09:00 |
Huabing.Xu
|
031efaf242
|
Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3
|
2014-08-11 14:37:43 +08:00 |
yangxiao
|
ceb6549ec8
|
merge cocos2d
|
2014-08-08 16:25:52 +08:00 |
yangxiao
|
97edd303b5
|
remove DrawNode3D
|
2014-08-08 15:06:45 +08:00 |
lvlong
|
28769c9b15
|
add obb sample
|
2014-08-08 11:16:33 +08:00 |
yangxiao
|
813e954f4e
|
aabb, obb
|
2014-08-08 00:00:58 +08:00 |
yangxiao
|
3c9483899e
|
camera, cameratest, drawNode3D squash
|
2014-08-07 15:23:31 +08:00 |
Huabing.Xu
|
16842b4a69
|
android work now, add shadowBuffer to recreate VBO
|
2014-08-07 14:15:49 +08:00 |
yangxiao
|
4452d9579a
|
merge cocos2d, fix lua
|
2014-08-04 12:07:27 +08:00 |
huangshiwu
|
575c9787c0
|
Merge branch 'v3' into v3_pr
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-01 15:11:34 +08:00 |
yangxiao
|
e03d284e26
|
merge cocos2d
|
2014-07-31 18:55:41 +08:00 |
samuele3hu
|
ee4e479ce1
|
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
|
2014-07-31 16:38:55 +08:00 |
yangxiao
|
f6ad1df092
|
android work
|
2014-07-31 11:47:47 +08:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
Sergey
|
2acce6771f
|
software per decompression support
|
2014-07-22 15:49:36 +04:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
Dhilan007
|
5e10575ab0
|
disable warn on zero-sized structures.
|
2014-07-14 17:53:55 +08:00 |
zhangbin
|
b0c465d96b
|
Adjust the dependencies between modules on android.
|
2014-07-14 09:48:16 +08:00 |
LinWenhai
|
3fb02acbde
|
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
|
2014-07-04 17:03:48 +08:00 |
Dhilan007
|
6d48cd9523
|
Refactoring game controller API
|
2014-07-04 17:01:41 +08:00 |
LinWenhai
|
992245e744
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
|
2014-07-04 15:29:40 +08:00 |
Dhilan007
|
552a9251c4
|
issue #4689: Refactor controller API.
|
2014-07-04 15:22:53 +08:00 |
minggo
|
6cc600ccce
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
Dhilan007
|
2a9e10be2c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
|
2014-06-30 13:41:55 +08:00 |
Dhilan007
|
7cd7b9e054
|
issue #4892:Implement logical codes of game controller
|
2014-06-30 00:28:21 +08:00 |
Huabing.Xu
|
47471e202d
|
Merge branch 'v3' into fast_tmx
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
|
2014-06-29 20:23:43 +08:00 |
yangxiao
|
1be44465b5
|
android version
|
2014-06-26 22:34:05 +08:00 |
Huabing.Xu
|
290897af14
|
Merge branch 'v3' into fast_tmx
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-25 10:10:08 +08:00 |
boyu0
|
5f10ff2c29
|
issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
|
2014-06-19 15:57:13 +08:00 |
yangxiao
|
17854cd922
|
change speed
|
2014-06-17 13:45:58 +08:00 |