minggo
|
38810eeb2e
|
Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices
change indices to short for fast tmx
|
2014-09-17 11:31:58 +08:00 |
minggo
|
32ed437e6d
|
Merge pull request #8081 from andyque/addInterfaceToUI
add getTitleRenderer interface to UIButton
|
2014-09-17 11:31:16 +08:00 |
Huabing.Xu
|
725d107ae5
|
change indices to short for fast tmx
|
2014-09-17 11:06:15 +08:00 |
minggo
|
38259bd311
|
Merge pull request #8075 from dabingnn/v3_FixVertsAndDrawCallsForPrimitiveCommand
add draw calls and draw verts for PrimitiveCommand
|
2014-09-17 11:04:43 +08:00 |
andyque
|
6badfb30e1
|
add getTitleRenderer interface to UIButton
|
2014-09-17 10:57:40 +08:00 |
Huabing.Xu
|
34e3e23af5
|
Fix compile error
|
2014-09-17 10:35:42 +08:00 |
minggo
|
71325220bc
|
[ci skip]
|
2014-09-17 10:26:03 +08:00 |
minggo
|
21af9a4701
|
[ci skip]
|
2014-09-17 10:24:20 +08:00 |
minggo
|
77371a025d
|
Merge pull request #8062 from zhongfq/v3
optimize decompress jpg data
|
2014-09-17 10:22:57 +08:00 |
joewan
|
729910d77e
|
Merge branch 'v3-official'
|
2014-09-16 22:04:46 +08:00 |
Eric Zhong
|
ae5f6e63e5
|
optimize decompress jpg data and fix warnings
|
2014-09-16 21:55:05 +08:00 |
minggo
|
e60a5db1cb
|
Merge pull request #8079 from CocosRobot/update_lua_bindings_1410858873
[AUTO]: updating luabinding automatically
|
2014-09-16 17:31:00 +08:00 |
minggo
|
7d97aaeeb3
|
Merge pull request #8078 from minggo/SchedulerPauseResumeAll-issue
SchedulerPauseResumeAll can not resume at 5s
|
2014-09-16 17:30:20 +08:00 |
CocosRobot
|
b37659a448
|
[AUTO]: updating luabinding automatically
|
2014-09-16 09:16:17 +00:00 |
minggo
|
0d7674d864
|
[ci skip]
|
2014-09-16 17:13:34 +08:00 |
minggo
|
da29b92ff4
|
Merge pull request #8072 from Dhilan007/v3-audio903
move AudioEngine to cocos2d:experimental namespace
|
2014-09-16 17:12:03 +08:00 |
minggo
|
3de82474c0
|
SchedulerPauseResumeAll can not resume at 5s
|
2014-09-16 16:38:30 +08:00 |
honghui
|
86416e73ca
|
sync code from default template
|
2014-09-16 16:19:05 +08:00 |
minggo
|
98a85fd635
|
Merge pull request #8077 from huangshiwu/v3_test
fix ClippingNode's memory leak bug
|
2014-09-16 15:36:56 +08:00 |
Dhilan007
|
369c14ed49
|
fix compile error
|
2014-09-16 14:57:58 +08:00 |
huangshiwu
|
3907e5c1a2
|
fix ClippingNode's memory leak bug
|
2014-09-16 14:50:00 +08:00 |
Huabing.Xu
|
f702b4e9b3
|
add draw calls and draw verts for PrimitiveCommand
|
2014-09-16 12:04:35 +08:00 |
honghui
|
c34eedae1c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-09-16 11:53:55 +08:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
minggo
|
afd1271078
|
Merge pull request #8071 from huangshiwu/v3_wp8test
fix wp8 and winrt compile error --add chipmunk static lib
|
2014-09-16 10:07:50 +08:00 |
minggo
|
75ff798239
|
Merge pull request #8070 from samuele3hu/v3_beta0_test
Update release configure setting for cpp template
|
2014-09-16 10:03:40 +08:00 |
huangshiwu
|
d0d3e185ce
|
fix wp8 and winrt compile error --add chipmunk static lib
|
2014-09-16 10:03:00 +08:00 |
samuele3hu
|
2fa87b9c38
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
|
2014-09-16 09:57:45 +08:00 |
samuele3hu
|
0c2268d85e
|
Update release configure setting for cpp template
|
2014-09-16 09:57:10 +08:00 |
minggo
|
a8a8265174
|
Merge pull request #8068 from CocosRobot/update_cocosfiles_1410809260
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-16 09:41:00 +08:00 |
minggo
|
b3aa9cc045
|
Merge pull request #8064 from CocosRobot/update_lua_bindings_1410795317
[AUTO]: updating luabinding automatically
|
2014-09-16 09:40:30 +08:00 |
CocosRobot
|
34f679a88a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-15 19:27:41 +00:00 |
Ricardo Quesada
|
56a59f7671
|
Merge pull request #8067 from ricardoquesada/english_fixes
English fixes
|
2014-09-15 12:24:14 -07:00 |
Ricardo Quesada
|
c89f7ec6c4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into english_fixes
Conflicts:
CHANGELOG
|
2014-09-15 09:34:11 -07:00 |
Ricardo Quesada
|
38cdee45f8
|
English fixes
|
2014-09-15 09:33:07 -07:00 |
CocosRobot
|
4097a68ea9
|
[AUTO]: updating luabinding automatically
|
2014-09-15 15:38:05 +00:00 |
minggo
|
d35141a1e2
|
Merge pull request #8063 from CocosRobot/update_lua_bindings_1410794320
[AUTO]: updating luabinding automatically
|
2014-09-15 23:23:09 +08:00 |
CocosRobot
|
526c28bea9
|
[AUTO]: updating luabinding automatically
|
2014-09-15 15:21:18 +00:00 |
Eric Zhong
|
8de3657f3c
|
optimize decompress jpg data
it may be unnecessary copy jpg bytes one by one when decompress jpg data
|
2014-09-15 23:15:01 +08:00 |
minggo
|
27528f3e5f
|
Merge pull request #8061 from minggo/fix-cocostudio-test-crash
[ci skip]remove unneeded Android.mk
|
2014-09-15 22:53:18 +08:00 |
minggo
|
14d1fc48bd
|
Merge pull request #8057 from samuele3hu/v3_beta0_test
Update cocos2dx_3d.ini
|
2014-09-15 22:52:24 +08:00 |
minggo
|
625dfb4781
|
Merge pull request #8056 from super626/v3
BillBoard Rease Notes
|
2014-09-15 22:50:23 +08:00 |
minggo
|
9a29ab2113
|
Merge pull request #8058 from andyque/fixWebView
improve webview coding style
|
2014-09-15 22:49:53 +08:00 |
minggo
|
515e230f85
|
Merge pull request #8059 from andyque/addWebViewReleaseNote
modify release note
|
2014-09-15 22:48:28 +08:00 |
minggo
|
a61cda04ee
|
remove unneeded Android.mk
|
2014-09-15 22:47:44 +08:00 |
andyque
|
6bc04cd129
|
modify release note
|
2014-09-15 18:34:46 +08:00 |
andyque
|
af3dd215cb
|
improve android web view
|
2014-09-15 18:14:04 +08:00 |
samuele3hu
|
c56c0dfd4f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
|
2014-09-15 18:04:08 +08:00 |
andyque
|
5f95ad221e
|
improve iOS WebView
|
2014-09-15 18:02:11 +08:00 |
samuele3hu
|
225c3db005
|
Update cocos2dx_3d.ini
|
2014-09-15 17:59:57 +08:00 |