yangxiao
|
d5fab0bd38
|
merge cocos
|
2015-09-10 10:44:09 +08:00 |
yangxiao
|
8f5cd6cdc8
|
remove setParent
|
2015-09-10 09:28:01 +08:00 |
CocosRobot
|
b164ac059d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 10:45:05 +00:00 |
pandamicro
|
d03b100ec1
|
Merge pull request #13706 from WenhaiLin/v3-ios-phonecall-fix
[IOS platform]AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
|
2015-09-09 18:37:13 +08:00 |
pandamicro
|
f31ebfe331
|
Merge pull request #13748 from jianglong0156/uniformConversion
add uniform conversion
|
2015-09-09 18:04:07 +08:00 |
江龙
|
4509a316cc
|
add uniform conversion
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
|
2015-09-09 16:03:57 +08:00 |
CocosRobot
|
b3976cdd63
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 06:08:45 +00:00 |
Martin Taylor
|
e592a1a02d
|
fix typos
|
2015-09-09 11:37:41 +08:00 |
yangxiao
|
153bdb7170
|
add comment
|
2015-09-09 11:11:17 +08:00 |
pandamicro
|
f7f8a42ecf
|
Merge pull request #13722 from NatWeiss/patch-17
Fix crash in FrameBuffer if no DepthStencil
|
2015-09-09 10:46:58 +08:00 |
子龙山人
|
ae7b45a569
|
Merge pull request #13732 from CocosRobot/update_lua_bindings_1441765845
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 10:42:04 +08:00 |
CocosRobot
|
2423f05024
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 02:37:17 +00:00 |
子龙山人
|
20531061a2
|
Merge pull request #13728 from CocosRobot/update_lua_bindings_1441765050
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 10:36:54 +08:00 |
pandamicro
|
9814851355
|
Merge pull request #13659 from seivan/patch-2
EventListenerMouse will dispatch EventMouse events
|
2015-09-09 10:34:12 +08:00 |
pandamicro
|
dc607a1784
|
Merge pull request #13726 from jianglong0156/actionExtendSquash
support custom action, and rewrite update function
|
2015-09-09 10:25:56 +08:00 |
CocosRobot
|
a78f5e3dcc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 02:23:01 +00:00 |
江龙
|
badd80bf3a
|
support custom action, and rewrite update function
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
|
2015-09-09 10:08:07 +08:00 |
Nathanael Weiss
|
14b9c2e75c
|
Fix crash in FrameBuffer if no DepthStencil
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
|
2015-09-08 13:13:38 -07:00 |
yangxiao
|
f944750627
|
add material cache
|
2015-09-08 15:29:54 +08:00 |
pandamicro
|
d60eb21d59
|
Merge pull request #13710 from minggo/implement-function-in-cpp
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
|
2015-09-08 13:28:19 +08:00 |
pandamicro
|
eab6dbe6fd
|
Merge pull request #13711 from minggo/crash-in-dynamic-library
don't define static variable in header file or each dynamic lib will have a copy
|
2015-09-08 11:45:12 +08:00 |
minggo
|
d86b256396
|
don't define static variable in header file or each dynamic lib will have a copy
|
2015-09-08 11:04:51 +08:00 |
minggo
|
bbe5861367
|
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
|
2015-09-08 10:26:37 +08:00 |
minggo
|
8326ed6535
|
add physics component
|
2015-09-08 09:54:01 +08:00 |
Seivan Heidari
|
2f02690394
|
EventListenerMouse will dispatch EventMouse events
|
2015-09-07 20:05:51 +02:00 |
子龙山人
|
75882e64a0
|
Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll
Refactor scroll view's inertia scroll
|
2015-09-07 22:38:20 +08:00 |
pandamicro
|
00abec6c2c
|
Merge pull request #13707 from pandamicro/fix_layerrgba
[ci skip] Fix compile error in __LayerRGBA
|
2015-09-07 17:27:46 +08:00 |
TheCodez
|
d77045818c
|
Fix compile error in __LayerRGBA
|
2015-09-07 17:25:56 +08:00 |
WenhaiLin
|
e500b960f3
|
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
|
2015-09-07 16:29:57 +08:00 |
pandamicro
|
0eee625788
|
Merge pull request #13697 from pabitrapadhy/patch-1
Updated spelling and grammar mistakes
|
2015-09-07 15:02:27 +08:00 |
pandamicro
|
4fb34ba190
|
Merge pull request #13703 from cocos2d/v3.8
Sync v3.8 to v3
|
2015-09-07 14:56:37 +08:00 |
yangxiao
|
c3ac446f35
|
resolve conflict
|
2015-09-07 14:45:09 +08:00 |
yangxiao
|
97c59c87ac
|
built in material for sprite3d
|
2015-09-07 13:59:38 +08:00 |
yangxiao
|
137d180dc9
|
fix material clone
|
2015-09-07 13:59:08 +08:00 |
pandamicro
|
2739be06bb
|
Update COCOS2D_VERSION
|
2015-09-07 11:45:04 +08:00 |
WenhaiLin
|
42b24a9c5b
|
Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework
|
2015-09-07 11:12:13 +08:00 |
Pabitra Padhy
|
d4c60144f0
|
Updated spelling and grammar mistakes
|
2015-09-06 15:29:36 +05:30 |
子龙山人
|
f9eef5ceed
|
Merge pull request #13636 from zilongshanren/refactorEditBox
refactor EditBox iOS&Android implementation
|
2015-09-06 10:03:54 +08:00 |
pandamicro
|
2dfd22dfef
|
Merge pull request #13690 from pandamicro/v3.8
[ci skip][JS] Add common APIs for compatibility with web engine
|
2015-09-06 08:59:27 +08:00 |
pandamicro
|
86fb0fc3bc
|
[JS] Add common APIs for compatibility with web engine
|
2015-09-06 08:57:43 +08:00 |
Dale Stammen
|
030157ded0
|
update libcococs2d name to v3.9 for WinRT platforms
|
2015-09-04 08:46:08 -07:00 |
pandamicro
|
f9c20caa67
|
Merge pull request #13603 from perminovVS/correct-key-code
Desktop and WinRT use correct keyboard codes
|
2015-09-04 14:39:44 +08:00 |
pandamicro
|
ab5b634976
|
Merge pull request #13625 from frranck/patch-4
Update CCImage.cpp
|
2015-09-03 00:10:16 +08:00 |
andyque
|
c0f40ad4a5
|
fix Android EditBox font size issue
|
2015-09-02 18:25:30 +08:00 |
linguofeng
|
7fc382055b
|
lua add UPDATE_FAILED ERROR_DECOMPRESS
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
|
2015-09-02 11:27:47 +08:00 |
子龙山人
|
4530043d9b
|
Merge pull request #13649 from WenhaiLin/v3-string-empty-check
Use string::empty() to check whether string is empty.
|
2015-09-01 18:04:41 +08:00 |
Neo Kim
|
3656ce99bd
|
Fix an issue regarding non-bouncing scroll view
|
2015-09-01 15:13:18 +09:00 |
WenhaiLin
|
5fdb041856
|
Use string::empty() to check whether string is empty.
|
2015-09-01 11:26:09 +08:00 |
Neo Kim
|
129f4b3186
|
Implement the inertia scroll using auto scroll feature. Consolidate them into one.
|
2015-09-01 11:52:05 +09:00 |
Neo Kim
|
ecd947d9f4
|
Change auto scroll feature to receive callbacks to remove dependencies.
|
2015-09-01 11:45:42 +09:00 |