WuHao
|
c1d10ffa1c
|
fixed poly2tri creation method, added testCase
|
2015-04-24 18:28:28 +08:00 |
WuHao
|
5620da1adf
|
fixed anchor point issue, removed rect rotated property
|
2015-04-24 18:17:12 +08:00 |
yangxiao
|
7547a58e80
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-04-24 17:59:13 +08:00 |
yangxiao
|
dee966e586
|
modify change log
|
2015-04-24 17:59:00 +08:00 |
XiaoYang
|
d7deabc3ad
|
Merge pull request #311 from lvlonggame/v3
animate 3d quality
|
2015-04-24 17:54:28 +08:00 |
WuHao
|
0e318dd8dc
|
fixed UV issue, also taking account of contentScaleFactor, made test case better
|
2015-04-24 17:39:43 +08:00 |
minggo
|
0198c8707b
|
Merge pull request #11572 from super626/v3
Fix memory leak
|
2015-04-24 16:42:33 +08:00 |
XiaoYang
|
a860277ddd
|
Merge pull request #312 from songchengjiang/v3
Optimization
|
2015-04-24 16:05:08 +08:00 |
minggo
|
5a33fba01f
|
Merge pull request #11587 from andyque/update-config-json-for-v36
update config.json to v3.6
|
2015-04-24 15:53:36 +08:00 |
songchengjiang
|
2aee4abd66
|
fix https://github.com/cocos2d/cocos2d-x/issues/11203
fix the error of CCBundle3D
|
2015-04-24 15:31:50 +08:00 |
andyque
|
abaf63aa35
|
update config.json to v3.6
|
2015-04-24 15:00:28 +08:00 |
minggo
|
32f3331fe7
|
Merge pull request #11574 from xiaofeng11/v3.6
Add function for studio needed
|
2015-04-24 14:53:02 +08:00 |
lvlong
|
59dc646c17
|
modify test
|
2015-04-24 14:12:24 +08:00 |
lvlong
|
a379196340
|
modify comments
|
2015-04-24 14:06:20 +08:00 |
lvlong
|
8e51a561b1
|
modify some about animate3D quality!
|
2015-04-24 11:49:28 +08:00 |
XiaoFeng
|
07725ce84d
|
fix
|
2015-04-24 11:40:15 +08:00 |
XiaoYang
|
5c89b3acda
|
Merge pull request #309 from lvlonggame/v3
memory leaks and UI action
|
2015-04-23 18:13:41 +08:00 |
WuHao
|
07349ff588
|
initial cpp test
|
2015-04-23 18:03:03 +08:00 |
XiaoFeng
|
faddbd8e71
|
Add function to texture cache for studio to check if texture have been already loaded
|
2015-04-23 16:50:28 +08:00 |
WuHao
|
ada7ced0a8
|
change getVecCount to ssize_t
|
2015-04-23 16:40:11 +08:00 |
lvlong
|
d7fc85eb97
|
remove model ~~ !!!
|
2015-04-23 16:10:01 +08:00 |
XiaoFeng
|
944184b5d0
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-04-23 16:07:52 +08:00 |
lvlong
|
59b7ab8154
|
fix bug: animation curve memory leak !
|
2015-04-23 14:35:37 +08:00 |
WuHao
|
1ee87140b1
|
renamed PolySprite to SpritePolygon
|
2015-04-23 14:34:56 +08:00 |
minggo
|
cf177bbbee
|
Merge pull request #11559 from MSOpenTech/v3-winrt-fix
V3 winrt fix to update Angle and correctly handle App termination
|
2015-04-23 13:50:37 +08:00 |
WuHao
|
53342629e9
|
Merge branch 'v3' of https://github.com/Wu-Hao/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-04-23 13:47:50 +08:00 |
Dale Stammen
|
431937edb4
|
updated version to v3-deps-44
|
2015-04-22 19:49:37 -07:00 |
minggo
|
ca03fe8729
|
Merge pull request #11557 from CocosRobot/update_cocosfiles_1429756043
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-23 10:33:09 +08:00 |
CocosRobot
|
941c8d9f14
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-23 02:27:24 +00:00 |
minggo
|
5640084281
|
Merge pull request #11550 from andyque/add-button-release-note
add button memory optimization
|
2015-04-23 10:25:20 +08:00 |
minggo
|
8ab03a62d1
|
Merge pull request #11543 from yinjimmy/runtime
Add lua runtime template
|
2015-04-23 10:25:00 +08:00 |
Dale Stammen
|
102726784e
|
update windows 8.1 univeral app cpp-template files
|
2015-04-22 19:13:57 -07:00 |
Dale Stammen
|
ac8755868d
|
need to call Cleanup() if app is terminating
|
2015-04-22 19:13:12 -07:00 |
Dale Stammen
|
b78f830ed8
|
cleaned up Draw()
|
2015-04-22 19:11:42 -07:00 |
Dale Stammen
|
4119b0f10d
|
cleaned up Draw()
|
2015-04-22 19:11:29 -07:00 |
Dale Stammen
|
22daece170
|
made Cleanup() public
|
2015-04-22 19:08:11 -07:00 |
Dale Stammen
|
c3335551b8
|
added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE
|
2015-04-22 19:07:48 -07:00 |
Hao Wu
|
9c6fe3d35a
|
Merge pull request #1 from samuele3hu/v3_spritepoly
Add the PolySprite and adjust the project setting
|
2015-04-23 09:32:53 +08:00 |
Dale Stammen
|
662f8374ae
|
removed CC_PLATFORM_WINRT code. It is now allowed to exit a WinRT app
|
2015-04-22 17:58:10 -07:00 |
samuele3hu
|
7c77bc9587
|
Add the PolySprite support and adjust the project setting on the different platform
|
2015-04-23 00:51:47 +08:00 |
XiaoFeng
|
611565f2a6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-04-22 17:39:23 +08:00 |
andyque
|
b3f96cb2b2
|
add button memory optimization
|
2015-04-22 14:59:22 +08:00 |
minggo
|
ca1a95f2bb
|
Merge pull request #11545 from samuele3hu/v3_beta0_test
Fix the cocos3.6beta0 bugs
|
2015-04-22 14:38:54 +08:00 |
minggo
|
bcc2bb7198
|
Merge pull request #11549 from CocosRobot/update_cocosfiles_1429671178
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-22 11:15:15 +08:00 |
CocosRobot
|
d7e32f270c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-22 02:53:00 +00:00 |
samuele3hu
|
8d9064b4e4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
Conflicts:
tests/cpp-tests/Classes/AppDelegate.cpp
|
2015-04-22 10:31:39 +08:00 |
minggo
|
1f5e5b5058
|
Merge pull request #11536 from xiaofeng11/v3
Update Node3DReader compatibility
|
2015-04-22 10:25:49 +08:00 |
minggo
|
44fefde83d
|
Merge pull request #11537 from CocosRobot/update_lua_bindings_1429611994
[AUTO]: updating luabinding automatically
|
2015-04-22 10:25:31 +08:00 |
minggo
|
a4d5624ef5
|
Merge pull request #11539 from MSOpenTech/v3-winrt-typo-fix
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
|
2015-04-22 10:24:42 +08:00 |
samuele3hu
|
47e2698986
|
Fix the cocos3.6beta0 bugs
|
2015-04-22 10:20:21 +08:00 |