Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,857 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

9588 Commits

Author SHA1 Message Date
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
WenhaiLin 6fec9c40b0 SimpleAudioEngine:Fixed thread safety problem on android. 2015-06-09 15:07:35 +08:00
XiaoFeng f6083f3490 Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
yangxiao e433ad305b decopule physics and navmesh from Director 2015-06-09 13:49:07 +08:00
Jacky 74aed5ae85 fix on the android. 2015-06-09 13:47:29 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer 
Move FrameBufferObject related class to experimental namespace
 2015-06-09 10:59:43 +08:00
Justin Hawkwood eca488b85a Fails if file does not exist 
This adds a callback with nullptr if the file does not exists.  Checking this before checking cache means that if a file is cached then deleted, the async call will fail.  To allow a cached but deleted file to return the texture, move the isFileExist check to ALTERNATIVE.

If leaving check where it is, on failure should it also check if the file was cached and remove it?
 2015-06-08 17:14:15 -07:00
Dale Stammen a2b677d300 Merge branch 'v3' into v3-winrt-ogg 2015-06-08 08:22:46 -07:00
Michael Sotnikov dae8f788c1 improve rendering of inner shapes when outline is used 2015-06-08 12:56:43 +03:00
子龙山人 57e92df8ee Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path 
Fixed: #12097 VideoPlayer on Android ignores search paths
 2015-06-08 17:22:14 +08:00
子龙山人 54e23f15e6 Merge pull request #12179 from WenhaiLin/v3-37-physics-ap 
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
 2015-06-08 16:12:56 +08:00
VisualSJ 3306c7b072 Fixed control LayoutComponent positioning bug 2015-06-08 15:41:33 +08:00
WuHao a67e570ef7 deleted more leftover comments, placed polygon test further down the tests 2015-06-08 15:40:18 +08:00
WuHao e175815c70 deleted some leftover comments in sprite 2015-06-08 15:17:46 +08:00
WuHao 2650de030c modified tests to show current epsilon 2015-06-08 15:08:16 +08:00
子龙山人 272f40a3cf Merge pull request #12242 from CocosRobot/update_lua_bindings_1433744214 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-08 14:27:50 +08:00
pandamicro 1b75d4a192 Merge pull request #12212 from super626/sprite3d 
call setTransparent
 2015-06-08 14:21:40 +08:00
CocosRobot 4fc0366e4d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-08 06:21:14 +00:00
子龙山人 03892caed5 Merge pull request #12206 from super626/fixphysics3d2 
3D Physics: remove addChildToPhysics
 2015-06-08 14:13:38 +08:00
WuHao a555b2fb52 added documentation for auto polygon 2015-06-08 13:59:44 +08:00
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	cocos/2d/MarchingSquare.cpp
 2015-06-08 13:59:26 +08:00
VisualSJ 060ab85f22 Fixed UIText color settings bug 2015-06-08 13:58:08 +08:00
yangxiao 3fa17c28df add comment 2015-06-07 22:02:23 -07:00
yangxiao f9cc7fec0e code style 2015-06-07 22:02:15 -07:00
yangxiao 076c3a8d90 get set gravity 2015-06-07 22:02:06 -07:00
tangziwen 87dab42255 fix Terrain::getIntersectionPoint 2015-06-07 22:01:38 -07:00
子龙山人 c5ba7eef8b Merge pull request #12019 from super626/v3 
getIntersectionPoint failed when there is no intersection on the terrain
 2015-06-08 11:26:19 +08:00
Dale Stammen 2002054463 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-ogg 2015-06-07 20:19:52 -07:00
Huabing.Xu 133ef90c09 Merge branch 'v3Viewport' into v3FrameBufferObject 
# Conflicts:
#	cocos/renderer/CCFrameBufferObject.h
 2015-06-06 18:16:22 +08:00
Jacky 3e62dd0473 remove unused file and code. 2015-06-06 13:31:25 +08:00
CocosRobot 835e56e80a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 23:13:03 +00:00
Dale Stammen d4c9a81908 Merge branch 'v3' into v3-winrt-ogg 2015-06-05 16:03:54 -07:00
Ricardo Quesada 453a3d93bc samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
Dale Stammen 47b5085ade Merge branch 'v3' into v3-winrt-ogg 2015-06-05 05:36:15 -07:00
andyque 1954f6c55c fix enum class wrong indentation 2015-06-05 17:23:32 +08:00
andyque 56b7037c5f optimize uislider memory usage 2015-06-05 17:16:10 +08:00
yangxiao 8e558db3d6 call setTransparent 2015-06-05 16:25:09 +08:00
CocosRobot 9178eeca73 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 08:11:21 +00:00
pandamicro 399ecfcb9f Merge pull request #12176 from super626/fixphysics3d 
rename syncToNode and syncToPhysics
 2015-06-05 16:02:45 +08:00
andyque 6390f063fe optimize UILoadingBar memory usage 2015-06-05 15:57:39 +08:00
子龙山人 c5c96042ef Merge pull request #12181 from namezero111111/patch-5 
TintBy::clone() incorrect cast
 2015-06-05 15:27:43 +08:00
yangxiao d50c1823d4 merge cocos 2015-06-05 14:25:37 +08:00
andyque a7141bab38 improve imageView memory usage 2015-06-05 14:19:05 +08:00
yangxiao 761944f507 remove addChildToPhysicsWorld for 3d object 2015-06-05 13:54:09 +08:00
pandamicro fa71a6e352 Merge pull request #12204 from jianglong0156/issue1756 
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
 2015-06-05 13:17:53 +08:00
ffskyfan b8a022238f Update extension.h 
#define MALLOC(TYPE,COUNT) ((TYPE*)_malloc(sizeof(TYPE) * COUNT, __FILE__, __LINE__))

It is a really dangerous macros here.
If use it like this "MALLOC(Type, n+2)", it will alloc sizeof(TYPE) * COUNT + 2 byte memory.but I want it alloc sizeof(TYPE) * (COUNT + 2) byte. It is a typical macro unwind error.
 2015-06-05 12:14:27 +08:00
jianglong0156 8d011fd457 formate the space 2015-06-05 11:45:05 +08:00
andyque 91ddb802e1 optimize ui::CheckBox memory consumption 2015-06-05 10:32:22 +08:00
CocosRobot 9e3fa92803 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 01:51:34 +00:00
Dale Stammen 3f3ace05a7 added ogg support for Windows 10 UWP 2015-06-04 14:42:11 -07:00
pandamicro e0eff26674 Fix component function execution issue in JSB 2015-06-05 00:03:21 +08:00
pandamicro 25e047eb41 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns 2015-06-04 23:29:45 +08:00
pandamicro 461f2f88f4 Merge pull request #12197 from CocosRobot/update_lua_bindings_1433422057 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-04 22:08:03 +08:00
pandamicro 6216e74a38 Merge pull request #12165 from gyf19/v3 
HttpClient Android supports gzip
 2015-06-04 22:00:13 +08:00
CocosRobot 8865bd488e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-04 12:52:41 +00:00
pandamicro af756c50dc Merge pull request #12184 from pandamicro/v3 
Fix issue that __JSDownloaderDelegator::onError get called twice
 2015-06-04 20:42:35 +08:00
pandamicro e75dee6e7c Remove C++ invocation functions of Component 2015-06-04 20:10:10 +08:00
pandamicro 2da754dcf2 Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode 
Add onEnter and onExit of components to CCNode's onEnter and onExit function
 2015-06-04 18:39:52 +08:00
Jacky afa422d898 fixed copy constructor and operation = bug. 2015-06-04 18:27:58 +08:00
pandamicro 9576adeafb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-04 17:53:00 +08:00
pandamicro ba1191f98f Merge pull request #12132 from pandamicro/v3_origin 
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
 2015-06-04 17:51:11 +08:00
VisualSJ a91fdd6b8e Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:59:42 +08:00
VisualSJ 587bd475e9 Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:23:06 +08:00
WuHao 5b572ab803 Polyinfo is no longer a pointer 2015-06-04 16:20:00 +08:00
Namezero 19f95c5542 TintBy::clone() incorrect cast 
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
 2015-06-04 10:13:34 +02:00
pandamicro 2c168130ed Fix jsbinding calls for CCComponent 2015-06-04 15:59:05 +08:00
pandamicro 86d372222c Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB 2015-06-04 15:54:58 +08:00
Huabing.Xu d35a8a3a9e add default FBO 2015-06-04 15:53:13 +08:00
WuHao 0a51c9bd27 Finished AutoPolygon and Sprite 2015-06-04 15:43:31 +08:00
pandamicro 83f7f30c1c Fix issue that __JSDownloaderDelegator::onError get called twice 2015-06-04 15:03:20 +08:00
WenhaiLin bd718bb85f Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body. 2015-06-04 14:57:37 +08:00
zhangcheng 6a53cfdc76 1, modify space format. 2015-06-04 14:08:47 +08:00
zhangcheng 8d3d3a0348 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
pandamicro 9c23126d9e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-04 13:14:34 +08:00
yangxiao ded5c36271 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-04 12:46:12 +08:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
yangxiao 73d815b0ab rename syncToNode and syncToPhysics 2015-06-04 12:04:41 +08:00
samuele3hu fbd5a09cfd issue #10323: Fix the compile error when COCOS2D_DEBUG>=2. 2015-06-04 11:58:22 +08:00
anniruddh.koppal 84fad34daf Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 20:57:14 -07:00
pajeroquan 956101bb72 Fix JNI object memory leak! 
Fix JNI object memory leak!
 2015-06-04 11:54:53 +08:00
Huabing.Xu ad1f7c472c add render buffer render target for color attachment 2015-06-04 11:18:35 +08:00
子龙山人 831ca47b13 Merge pull request #12158 from WenhaiLin/v3-letter-space 
Label:Fixed letter spacing may be wrong.
 2015-06-04 10:51:25 +08:00
zhangcheng 55995ece1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode 2015-06-04 10:38:39 +08:00
zhukaixy f891a0b124 configure navi for winodow phone 2015-06-04 10:00:15 +08:00
samuele3hu 3bae5620d6 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-06-04 09:40:54 +08:00
子龙山人 95934bf310 Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix 
V3: Fixes for Windows 8.1 Universal App JavaScript
 2015-06-04 09:22:21 +08:00
CocosRobot 76b151c281 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-03 20:25:32 +00:00
Ricardo Quesada 6a19661a80 Merge pull request #12150 from ricardoquesada/material_custom_uniforms 
Material custom uniforms
 2015-06-03 13:08:04 -07:00
Dale Stammen 18ce48dc2a /NODEFAULTLIB:MSVCRT to fix linker warning 2015-06-03 09:26:15 -07:00
Dale Stammen 38c9490f4d don't delete rendering thread. SpiderMonkey needs to stay on same thread 2015-06-03 09:19:05 -07:00
gyf19 164e4c8314 HttpClient Android supports gzip 2015-06-03 19:41:14 +08:00
Namezero c09e280b58 JumpTo::clone() results in incorrect end position 
JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition
 2015-06-03 13:14:11 +02:00
Namezero 89915a084c Blink::stop() access violation 
Blink::stop() is calles twice when inside a Repeat action. This results in an access violation
 2015-06-03 12:39:16 +02:00
samuele3hu 0cccd6e765 Fix compile error on the Linux and update the test cases 2015-06-03 18:12:21 +08:00
WenhaiLin ffa7dc6b5a Label:Fixed letter spacing may be wrong. 2015-06-03 16:28:44 +08:00
子龙山人 883f250f6a Merge pull request #12137 from WenhaiLin/v3-text-line-height 
Fixed the text line height calculation is wrong with system font on Android.
 2015-06-03 16:24:38 +08:00
zhangcheng a51a32fa9d 1, add onEnter and onExit of components to CCNode's onEnter and onExit function. 2015-06-03 15:10:48 +08:00
Ricardo Quesada b8957b176a fixes win compilation issues 2015-06-02 23:31:57 -07:00
zhukaixy 76ad42bb0b configure recast project for win8.1 project 2015-06-03 14:31:12 +08:00
Ricardo Quesada 872e4f5a4f removes logging 2015-06-02 17:50:34 -07:00
Ricardo Quesada 5f6f38616a Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms 2015-06-02 17:05:05 -07:00
Ricardo Quesada 87a3a1844a Adds support for Autobindings in Shader 
...part of Material
 2015-06-02 16:56:59 -07:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +08:00
pandamicro 613e0f73b7 Merge pull request #12095 from jianglong0156/videoplayer 
add videoplayer jsb
 2015-06-02 17:35:56 +08:00
WenhaiLin 88697bf136 Remove unused function. 2015-06-02 16:38:06 +08:00
WenhaiLin 67d0088103 Fixed the text line height calculation is wrong with system font on Android. 2015-06-02 16:23:40 +08:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
jianglong0156 ac71777e97 add webview and videoplayer protect contidition. 2015-06-02 13:50:55 +08:00
jianglong0156 c46fea1f7a Merge branch 'v3' into videoplayer 2015-06-02 11:26:48 +08:00
jianglong0156 97d0265e32 gzip test 2015-06-02 10:23:30 +08:00
pandamicro 4c6f67fd7e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	web
 2015-06-02 10:12:22 +08:00
子龙山人 2c611693c6 Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness 
Improve UserDefault's robustness on Android.
 2015-06-02 10:11:19 +08:00
子龙山人 40ea6e3e41 Merge pull request #12103 from samuele3hu/v3_http_leak 
Fix the memory leak of HttpClient on the iOS/Mac platform.
 2015-06-02 10:11:03 +08:00
WuHao 3c5326ba1f removed spritePolygon, merge into sprite and draft of AutoPolygon 2015-06-02 10:10:09 +08:00
pandamicro fdec552ed7 Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader 2015-06-02 10:08:13 +08:00
子龙山人 0ab6472ee6 Merge pull request #12107 from MSOpenTech/v3-uwp 
V3: Windows 10.0 Universal App (UWP) support
 2015-06-02 10:00:40 +08:00
江龙 a8b640f751 add videoplayer project 2015-06-02 09:04:15 +08:00
yangxiao 5bf09a676e setRadius and setGeight implementation 2015-06-01 17:38:35 +08:00
WenhaiLin 9d8225aae8 Improve UserDefault's robustness on Android. 2015-06-01 15:09:11 +08:00
Huabing.Xu 27d0f6328f origin code of viewport 2015-06-01 14:26:08 +08:00
linshun 09b52331d1 issue #12078: added renderer group and removed core and support group. 2015-06-01 13:43:56 +08:00
子龙山人 d7534c26a3 Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall 
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
 2015-06-01 11:19:01 +08:00
子龙山人 4e914a01da Merge pull request #12098 from WenhaiLin/v3-simpleaudio-lagged 
Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x
 2015-06-01 11:17:26 +08:00
Huabing.Xu 739923a4a3 Merge branch 'v3' into v3Viewport 2015-06-01 09:41:45 +08:00
Dale Stammen e0c65c203a Merge branch 'v3' into v3-uwp 2015-05-29 08:09:05 -07:00
WenhaiLin 59435f8749 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-05-29 21:41:54 +08:00
samuele3hu c3ea65e66b Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-05-29 18:25:15 +08:00
WuHao 3d62805d04 Merge branch 'v3' into fix_spritepolygon 
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/MarchingSquare.cpp
 2015-05-29 18:10:41 +08:00
samuele3hu ae6cb678c6 Fix the memory leak of HttpClient on the iOS/Mac platform. 2015-05-29 17:13:49 +08:00
yangxiao c782d63bef add 3d navigation 2015-05-29 16:45:33 +08:00
Jacky e69a6116fa make SpritePolygonInfo extend from Ref. 2015-05-29 16:44:06 +08:00
yangxiao 618f63cb35 replace windows folder sperator 2015-05-29 16:43:36 +08:00
yangxiao 410d09525f setTransparent for mesh command 2015-05-29 16:38:42 +08:00
yangxiao db2b2cf0b8 getTrianglesList for obj file 2015-05-29 16:37:37 +08:00
Huabing.Xu b5e76c7521 Merge branch 'v3_origin' into v3FrameBufferObject 2015-05-29 15:59:38 +08:00
Huabing.Xu f76585f046 Merge branch 'v3' into v3FrameBufferObject 2015-05-29 15:59:15 +08:00
Huabing.Xu 9bf15877e5 add applyViewport in camera. 2015-05-29 15:52:06 +08:00
子龙山人 039c0036be Merge pull request #12072 from iris-wy/v3 
Add enhance service  API
 2015-05-29 15:32:06 +08:00
Michael Sotnikov b430353cd8 Fixed: #12097 VideoPlayer on Android ignores search paths 2015-05-29 10:17:40 +03:00
Jacky 8df4920f6e fixed file name. 2015-05-29 15:03:36 +08:00
WenhaiLin 9c31aafba0 Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x 2015-05-29 14:52:25 +08:00
CocosRobot 3a1b52cafd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-05-29 06:31:00 +00:00
子龙山人 a165790ba9 Merge pull request #12083 from yangws/v3 
Add opengl version project/unproject function in camera.
 2015-05-29 14:21:56 +08:00
Huabing.Xu 2f32fcabba Merge branch 'v3FrameBufferObject' into v3Viewport 2015-05-29 14:10:49 +08:00
Huabing.Xu b2579a754a refactor, use Camera::apply() to apply Rendertarget and Viewport 2015-05-29 14:08:20 +08:00
Huabing.Xu 1fb0ba112b init code for viewport 2015-05-29 13:47:29 +08:00
CocosRobot 892816de3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-29 05:46:22 +00:00
子龙山人 035420893e Merge pull request #12076 from andyque/update-changelog-v3 
Fix a memory issue in AudioEngine
 2015-05-29 11:44:45 +08:00
jianglong0156 722b6b1baf add video player binding files 2015-05-29 11:39:47 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
jianglong0156 8b52563a8a add videoplayer config ini and fix the url bug 2015-05-29 11:10:39 +08:00
Vincent Yang b714dde0ea Add opengl version project/unproject function in camera. 2015-05-29 10:44:48 +08:00
Huabing.Xu 22ddf53539 Merge branch 'v3FrameBufferObject' into v3 2015-05-29 10:38:42 +08:00
Dale Stammen 8584f5f399 removed old WP8 files 2015-05-28 15:03:36 -07:00
Dale Stammen 2a71407501 fixed double to float conversion compiler warning 2015-05-28 15:00:49 -07:00
Dale Stammen 05d33ac0c8 removed old WP8 files 2015-05-28 14:08:25 -07:00
Dale Stammen dadbbc18d6 added Windows 10 UWP project files 2015-05-28 13:51:25 -07:00
Dale Stammen 60f672599b added winrt networking files 2015-05-28 13:48:13 -07:00
Dale Stammen 962393233f removed old winrt property sheets 2015-05-28 13:12:37 -07:00
jianglong0156 9a62d06091 add video player test and auto bindings 2015-05-28 18:10:07 +08:00
子龙山人 a76018041e Merge pull request #12077 from WenhaiLin/v3-label-mlinefix 
Text:Fixed the scale factor may be incorrect with multiline text.
 2015-05-28 17:20:33 +08:00
Huabing.Xu 2d6d1b7a8c add android background and foreground switch support for framebufferobject 2015-05-28 17:08:36 +08:00
linshun 543b6c2b07 issue #12078: added storage group. 2015-05-28 15:48:08 +08:00
linshun ef39251d14 issue #12078: added platform group 2015-05-28 15:47:40 +08:00
linshun 56c848e341 issue #12078: added physics group. 2015-05-28 15:47:03 +08:00
linshun 2a02510a9c issue #12078: Added network group. 2015-05-28 15:46:36 +08:00
linshun 77639bc88e issue #12078: Added audio group. 2015-05-28 15:46:02 +08:00
子龙山人 f6f8796dfa Merge pull request #11762 from WenhaiLin/v3-audioengine-i11697 
AudioEngine:Fixed program may freeze if `AudioEngine::stop` or `AudioEngine::stopAll()` is invoked frequently on Android.
 2015-05-28 14:52:20 +08:00
jianglong0156 ab124978aa web view can not run in mac, remove it from project file 2015-05-28 14:46:29 +08:00
jianglong0156 379f536330 improve test case, remove the invalid testcase 2015-05-28 14:02:07 +08:00
yangxiao 2e27bfd6c7 add comment 2015-05-28 12:40:16 +08:00
WenhaiLin c60112a634 Text:Fixed the scale factor may be incorrect with multiline text. 2015-05-28 11:56:43 +08:00
jianglong0156 1dbaa5bb11 fix error log output 2015-05-28 11:56:07 +08:00
andyque 578fda54ba fix a memory issue in AudioEngine. 
This PR also update AUTHORS and CHANGELOG files.
 2015-05-28 11:49:27 +08:00
samuele3hu 9a4a545025 Issue #10570: Make getItemForTouch of Menu virtual. 2015-05-28 11:41:49 +08:00
iris-wy bbfc33dfd2 format 
format
 2015-05-28 11:03:49 +08:00
子龙山人 001614a9c5 Merge pull request #11908 from flashjay/patch-1 
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
 2015-05-28 10:58:46 +08:00
iris-wy 9e477303f1 delete useless TAG 
delete useless TAG
 2015-05-28 10:55:10 +08:00
iris-wy 0007799794 modify Enhance API 
modify Enhance API
 2015-05-28 10:47:12 +08:00
jianglong0156 c0b42fdfec modify addEventListener to setEventListener 2015-05-28 10:12:58 +08:00
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
子龙山人 6f16965b06 Merge pull request #12060 from CocosRobot/update_lua_bindings_1432717405 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-27 22:43:28 +08:00
子龙山人 88c26d9c5d Merge pull request #12059 from andyque/add-button-bmfont-test 
add ui::Button  BMFont title test
 2015-05-27 22:42:46 +08:00
pandamicro 37f2d84675 Merge pull request #12056 from musikov/v3-jsb-cccolor-fix 
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
 2015-05-27 21:31:29 +08:00
yangxiao a5976a43f7 code style 2015-05-27 18:19:44 +08:00
Huabing.Xu 9ffbe39f18 DepthStencil RenderTarget could be null, which can be used to detach the old DepthStencil RenderTarget 2015-05-27 18:16:05 +08:00
yangxiao c68efaa79a Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-05-27 18:09:08 +08:00
yangxiao 28b9b86b0b get set gravity 2015-05-27 18:07:31 +08:00
jianglong0156 7402295205 improve event key 2015-05-27 18:02:01 +08:00
jianglong0156 2dd7b9575b iOS project add web view project 2015-05-27 17:53:50 +08:00
CocosRobot 3bf58ab401 [AUTO]: updating luabinding & jsbinding automatically 2015-05-27 09:08:33 +00:00
Huabing.Xu 9d4e50f3a5 add optional params for RenderTarget creation 2015-05-27 16:59:54 +08:00
子龙山人 b8fd5ba290 Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-27 16:59:50 +08:00
andyque 74f0b3b436 add bmfont test 2015-05-27 16:58:52 +08:00
子龙山人 e044b1ab11 Merge pull request #11785 from geron-cn/fixbug 
fix crash when run TestTimelineFrameEvent in cpp-test
 2015-05-27 16:28:13 +08:00
子龙山人 62832586d0 Merge pull request #12049 from samuele3hu/v3_material 
issue #12046: Add Lua bindings for material systems and related test cases
 2015-05-27 16:26:26 +08:00
Mykyta Usikov 355381e0d8 cc.Color() and cc.color() don't replace 0 alpha with 255 no more 2015-05-27 11:25:04 +03:00
子龙山人 ca8ca35fd6 Merge pull request #12054 from andyque/Feature_Add_Title_Alignment_for_Button 
[ci skip]Feature add title alignment for button
 2015-05-27 16:09:06 +08:00
andyque 44babe18fb add missing comments and fix back compatibility. 2015-05-27 16:07:37 +08:00
CocosRobot 3851e8356e [AUTO]: updating luabinding & jsbinding automatically 2015-05-27 08:00:53 +00:00
子龙山人 616ac0058c Merge pull request #12016 from namezero111111/v3 
ui::TextField::getTextColor() missing
 2015-05-27 15:53:09 +08:00
samuele3hu 9934d73548 issue #12046: Add Lua bindings for material systems and related test cases. 2015-05-27 15:37:59 +08:00
jianglong0156 83f34c23d8 fixed the code error 2015-05-27 15:22:03 +08:00
jianglong0156 579f122cb1 add webview jsb eventType 2015-05-27 15:11:12 +08:00
jianglong0156 521ce15cb6 add webview autobindings. modify webtest. adapt the web interface 2015-05-27 11:46:26 +08:00
Huabing.Xu 471547e0b0 refactor FrameBufferObject to FrameBufferObject and RenderTarget 2015-05-27 11:40:12 +08:00
子龙山人 b2132eb127 Merge pull request #11921 from felixjingga/uibutton-support-bmfont 
Uibutton support bmfont
 2015-05-27 11:19:46 +08:00
子龙山人 b8fdb152fd Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue 
fix assert failure of NinePatchImageParser and rapidjson
 2015-05-27 11:17:31 +08:00
子龙山人 2cfeed2c49 Merge pull request #12031 from yangws/v3_bugfixTerrain 
Fix bug: terrain can't move to other position except origin point in world coord.
 2015-05-27 10:48:02 +08:00
geron-cn c19adbdc3c fix bug: fix actiontimeline can not step to last frame when loop play 2015-05-27 10:24:50 +08:00
CocosRobot 824456b073 [AUTO]: updating luabinding & jsbinding automatically 2015-05-26 21:56:01 +00:00
Dale Stammen 06a5f7ed7a moved CCNinePath files to base folder in solution 2015-05-26 09:48:25 -07:00
Dale Stammen d146f26144 define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds 2015-05-26 09:46:15 -07:00
Namezero 9808f6aa91 Update UITextField.h 2015-05-26 12:55:57 +02:00
Vincent Yang d7ad7221e4 ciskip add doc for camera::getnear/farplane(). 2015-05-26 18:14:37 +08:00
Vincent Yang 8105e9c714 Fix bug: terrain can't move to other position except origin point. 2015-05-26 17:51:26 +08:00
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest 
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
 2015-05-26 17:49:17 +08:00
andyque 8d78fd31b7 add assert to make program more robust 2015-05-26 17:25:42 +08:00
andyque c668001e73 fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
Vincent Yang 246913c092 Fix bug: skybox can't move to other position except origin point in world space. 2015-05-26 17:14:26 +08:00
Namezero 8bc7d08d3f added alignment getters 2015-05-26 09:34:13 +02:00
Namezero 2be136dc8e alignment getters added 2015-05-26 09:33:11 +02:00
Huabing.Xu 83bae15caf Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/libcocos2d.vcxproj.filters
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-05-26 12:06:05 +08:00
minggo 104f11fe4c Merge pull request #12010 from CocosRobot/update_lua_bindings_1432542799 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-26 09:33:37 +08:00
Namezero 4c380bfaf0 Update UITextField.cpp 2015-05-25 21:06:27 +02:00
Namezero dfb479d480 Update UITextField.h 2015-05-25 21:05:49 +02:00
Huabing.Xu c22a8e81ce Merge branch 'v3' into v3FrameBufferObject 2015-05-25 16:56:22 +08:00
minggo bcc1bf8d32 Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand 
use trianglescommand for sprite
 2015-05-25 16:48:22 +08:00
CocosRobot 7fa68d9b3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-25 08:37:59 +00:00
minggo 999de9072a Merge pull request #12003 from minggo/remove-unneeded-function 
remove uneeded function
 2015-05-25 16:33:38 +08:00
minggo 273ac5d00a Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix 
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
 2015-05-25 16:29:43 +08:00
Felix J d5a7163b29 don't update content size if not necessary 
refactor a little so we don't need to update the content size if bmfont is used, but still updating the _fontSize.
 2015-05-25 14:45:26 +07:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
Felix J 219d8193c4 remove else clause 
Removing the else clause cause BMFont cannot set its font size
 2015-05-25 12:48:56 +07:00
andyque 81070a5299 fix lua project compile error 2015-05-25 13:42:54 +08:00
WenhaiLin 234ad668ec Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image. 2015-05-25 11:47:37 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
minggo db0caf68c6 remove uneeded function 2015-05-25 09:50:48 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
anniruddh.koppal b2eb946c14 Added MP3 support 2015-05-23 19:13:12 -07:00
minggo cad1b911c4 Merge pull request #11990 from xiaofeng11/v3 
Remove missing resource notice label from all UI widget
 2015-05-23 08:05:45 +08:00
XiaoFeng e94bcbd28c Remove missing resource label from all UI widget 2015-05-22 18:21:59 +08:00
minggo 311f453ea0 Merge pull request #11973 from dabingnn/v3_fixCameraVisitError 
Fix visiting scene error with multiple camera
 2015-05-22 17:16:30 +08:00
Huabing.Xu 6d9f850e2c use trianglescommand for sprite 2015-05-22 15:54:56 +08:00
CocosRobot f18b8bfd95 [AUTO]: updating luabinding & jsbinding automatically 2015-05-22 06:55:54 +00:00
minggo 1eb8d59666 Merge pull request #11966 from samuele3hu/v3_httpclient 
fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.
 2015-05-22 14:47:44 +08:00
minggo 698428e0a1 Merge pull request #11971 from joshuastray/physics 
Physics3d js binding
 2015-05-22 14:42:34 +08:00
minggo 11f8f0fc21 Merge pull request #11963 from CocosRobot/update_lua_bindings_1432259998 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-22 14:41:28 +08:00
minggo 27b7f2dd19 Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash 
TileMap:Fixed crash if referring a non-existent layer in TMX.
 2015-05-22 14:37:23 +08:00
Huabing.Xu 0644efc55e isVisitableByVisitingCamera should not affect the calculation of transform 2015-05-22 13:59:45 +08:00
joshuastray b1169c7d56 win32 and universal compile 2015-05-22 11:58:28 +08:00
WenhaiLin fdde58386f experimental::TileMap:Fixed crash if referring a non-existent layer in TMX. 2015-05-22 11:14:34 +08:00
minggo bf25a0429d Merge pull request #11964 from WenhaiLin/v3-console-crash 
[ci skip]Add comment.
 2015-05-22 11:05:54 +08:00
WenhaiLin 2f558b5793 Merge branch 'tmx-crash-fix' of https://github.com/dumganhar/cocos2d-x into v3-support-android-studio 2015-05-22 11:01:13 +08:00
samuele3hu 27e7101322 fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result. 2015-05-22 10:47:52 +08:00
joshuastray 1366f615dd mac && ios works 2015-05-22 10:43:37 +08:00
WenhaiLin a94a6baf87 [ci skip]Add comment. 2015-05-22 10:35:34 +08:00
CocosRobot 59807629d9 [AUTO]: updating luabinding & jsbinding automatically 2015-05-22 02:04:38 +00:00
minggo d5d329b74f Merge pull request #11946 from andyque/v3-final-android-9-patch-feature 
add Android 9-patch image format support
 2015-05-22 09:52:12 +08:00
minggo 678b279754 Merge pull request #11953 from MSOpenTech/v3-winrt-settings 
V3: Windows 8.1 Universal App CCUserDefault implementation
 2015-05-22 09:44:41 +08:00
minggo 36089b9bc3 Merge pull request #11950 from WenhaiLin/v3-console-crash 
Console:Fixed crash
 2015-05-22 09:42:41 +08:00
tangziwen fb1a7f1e8b fix Terrain::getIntersectionPoint 2015-05-22 09:07:57 +08:00
Dale Stammen 6c02e46865 fix deprecated method 2015-05-21 13:30:51 -07:00
Dale Stammen 382d681250 added winrt version of CCUserDefault 2015-05-21 11:23:36 -07:00
Dale Stammen 2e5b604d2f added CC_PLATFORM_WINRT to comments 2015-05-21 11:23:20 -07:00
Dale Stammen 992e292338 added winrt version of CCUserDefault 2015-05-21 11:21:46 -07:00
joshuastray 342734e3b5 Merge remote-tracking branch 'upstream/v3' into physics 2015-05-21 21:15:42 +08:00
WenhaiLin 158181d4eb Console:Fixed crash 2015-05-21 18:14:21 +08:00
joshuastray 83237b8dbd add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
andyque 0352a7a3ea add Android 9-patch image format support 
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date:   Mon May 18 17:16:09 2015 +0800

    Add Android 9-patch format support.

    Squashed commit of the following:

    commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 17:08:05 2015 +0800

        finish refactoring

    commit 730bf817f833de56999c616779fc0279890e14bf
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 11:47:08 2015 +0800

        refactoring 9-patch

    commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 09:42:06 2015 +0800

        refactor

    commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 17:59:21 2015 +0800

        fix lua and Android compile error

    commit 2877538fb3a436f95400b2ad637ea147b9df81d7
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 11:32:43 2015 +0800

         Add Android 9-patch image format support.

        The 9-patch format is used for creating Scale9Sprite.
 2015-05-21 16:04:37 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08:00
CocosRobot ad301891f0 [AUTO]: updating luabinding & jsbinding automatically 2015-05-21 02:46:49 +00:00
minggo 22f0e2fbbf Merge pull request #11918 from WenhaiLin/v3-37 
AudioEngine: Fixed play with a large audio file may fail on Win32
 2015-05-21 10:36:08 +08:00
minggo 69b6c9a3e5 Merge pull request #11906 from samuele3hu/v3_check 
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
 2015-05-21 10:35:38 +08:00
CocosRobot cb6abaa14c [AUTO]: updating luabinding & jsbinding automatically 2015-05-21 01:52:51 +00:00
minggo f1eae8f724 Merge pull request #11929 from namezero111111/patch-1 
Fixed missing const-correctness
 2015-05-21 09:38:24 +08:00
子龙山人 9ac23a5436 Merge pull request #11933 from kobake/fix-typo-angel 
Fix typo: "angel" to "angle"
 2015-05-21 09:37:53 +08:00
minggo bfbc8d28f2 Merge pull request #11928 from MSOpenTech/v3-winrt-bullet3d 
V3: Windows 8.1 Universal App version of Bullet 3D physics lib
 2015-05-21 09:36:42 +08:00
kobake d6f7a0a8a1 Fix typo. angel -> angle 2015-05-21 09:22:59 +09:00
Ricardo Quesada f2d3ecad48 Removes state from MeshCommand. 
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
 2015-05-20 15:57:26 -07:00
Dale Stammen d70a9bf369 resolve full path for audio file 2015-05-20 11:18:54 -07:00
Namezero 89152ef514 Fixed missing const-correctness 2015-05-20 17:19:42 +02:00
Dale Stammen 209e7c62f4 added libbullet to Windows 8.1 Universal App projects 2015-05-20 08:01:01 -07:00
Dale Stammen 46a69cf00b ignore warning 4996 2015-05-20 07:59:17 -07:00
Dale Stammen 3523173594 removed CC_PLATFORM_WP8 2015-05-20 07:58:39 -07:00
Dale Stammen aa7876aefc remove deprecated methods 2015-05-20 07:55:10 -07:00
Dale Stammen 14e812c7d4 enable CC_USE_3D_PHYSICS for CC_PLATFORM_WINRT 2015-05-20 07:53:49 -07:00
Dale Stammen 1b9a36f041 removed CC_PLATFORM_WP8 code 2015-05-20 07:52:59 -07:00
Dale Stammen cada493685 remove deprecated methods 2015-05-20 07:51:52 -07:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
felixjingga 9c264ab64b include algorithm header file 2015-05-20 16:42:48 +07:00
felixjingga ee13dd82b8 fix compile error, and fix check of the fontname 2015-05-20 16:34:45 +07:00
WenhaiLin 02946a55a1 Fixed crash. 2015-05-20 17:13:04 +08:00
felixjingga dcf4492ff0 add implementation detail to support BMFont 2015-05-20 15:56:07 +07:00
felixjingga 2d0fc637fc add BMFont FontType to support BMFont 2015-05-20 15:50:20 +07:00
WenhaiLin 81dc551fe9 AudioEngine: Fixed play with a large audio file may fail on Win32. 2015-05-20 15:13:31 +08:00
minggo 7024d3129c Merge pull request #11893 from MSOpenTech/v3-winrt-audio 
New audio engine support in winrt win8.1-universal
 2015-05-20 13:40:41 +08:00
minggo 79f70c49ce Merge pull request #11905 from WenhaiLin/v3-37 
Remove unnecessary files.
 2015-05-20 13:39:36 +08:00
James Chen 07f6774cee Crash fix for referring a non-existent layer in tmx. 2015-05-20 11:29:52 +08:00
minggo ba694beccb Merge pull request #11895 from super626/v3 
fix #10767
 2015-05-20 11:20:47 +08:00
minggo dbf1b415a5 Merge pull request #11898 from WenhaiLin/v3-console-crash 
Console:Fixed crash
 2015-05-20 11:19:38 +08:00
joshuastray 712ba4f64c add physics3d auto binding 2015-05-20 10:36:26 +08:00
HuaYang Huang acb29ed5a8 fix: luaLoadChunksFromZIP should just remove .lua or .luac extension 
last version may filter modules like 'framework.luaj', 'framework.luaoc'
 2015-05-20 10:36:05 +08:00
samuele3hu dec9acfd87 Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule 2015-05-20 10:26:54 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
Ricardo Quesada ae413a6f6d Merge pull request #11904 from ricardoquesada/meshcommand_fixes 
MeshCommand uses StateBlock
 2015-05-19 18:51:03 -07:00
Ricardo Quesada ac54dad9a0 MeshCommand uses StateBlock 
When MeshCommand is used with GLProgramState, it will use the StateBlock
internally, instead of the manual and error prone way of keeping state
 2015-05-19 18:13:18 -07:00
Ricardo Quesada 5d90a8725e Merge pull request #11903 from ricardoquesada/cleaner_code_properties 
Terrain uses StateBlock
 2015-05-19 18:07:50 -07:00
Ricardo Quesada 5924a917a1 Terrain uses StateBlock 
cleaner code, conforms to new way of setting the state
 2015-05-19 17:18:44 -07:00
CocosRobot 61aad4581a [AUTO]: updating luabinding & jsbinding automatically 2015-05-19 23:02:24 +00:00
anniruddh.koppal 8432323450 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio 2015-05-19 16:01:10 -07:00
Ricardo Quesada c28c1ffbfb Merge pull request #11901 from ricardoquesada/cleaner_code_properties 
Properties fixes
 2015-05-19 15:48:08 -07:00
Jacky bbaa60bbbb change to autopolygon. 2015-05-20 06:07:50 +08:00
Ricardo Quesada aa027fbe0f Properties fixes 
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
 2015-05-19 13:51:52 -07:00
WenhaiLin 80367e978d Console:Fixed crash 2015-05-19 18:33:06 +08:00
tangziwen 8d791390ff fix crash when visiting camera is not exist 2015-05-19 14:47:28 +08:00
anniruddh.koppal ea345717c7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio 2015-05-18 23:40:28 -07:00
Vincent Yang 8d3ade78ca Add CC_DLL to Class FrameBufferObject. 2015-05-19 13:50:10 +08:00
Vincent Yang 628619a694 Add CCFrameBufferObject files to win32 and win8 vcproj. 2015-05-19 11:53:08 +08:00
minggo bb3ad7d249 Merge pull request #11677 from tankorsmash/patch-1 
Fix setSprite never updating progress on ProgressTimer
 2015-05-19 11:42:20 +08:00
Jacky 514c8ae965 move sprite polygon logic to sprite polygon cache. 2015-05-19 11:25:53 +08:00
Wenhai Lin 17f2fcd201 Add more comment. 2015-05-19 11:01:23 +08:00
anniruddh.koppal 3a8d2ffc9e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio 2015-05-18 19:23:48 -07:00
anniruddh.koppal e0b3091dcf Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio 
Conflicts:
	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
 2015-05-18 19:21:48 -07:00
minggo 38773e2164 Merge pull request #11869 from samuele3hu/v3_updateccs 
Fix the bug that tableCellSizeForIndex of tableview get the wrong result  in the Lua
 2015-05-19 09:26:09 +08:00
dkorchinskiy 03aa73d68f Feature #11886 add title alignment for button 2015-05-18 13:33:48 +03:00
minggo e3e78b039a Merge pull request #11851 from andyque/fixIssue11769 
Copy missing text color property of ui::Text.
 2015-05-18 18:14:29 +08:00
Huabing.Xu 75f740add5 linux works 2015-05-18 18:08:15 +08:00
Huabing.Xu 5634609e05 android works 2015-05-18 18:06:59 +08:00
samuele3hu 349f9bde11 Fix the compile error in the release mode 2015-05-18 17:43:20 +08:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
Jacky bcfa29a7d7 fixed memory leakage. 2015-05-18 15:52:46 +08:00
Jacky d21f85787e fixed memory leakage, remove unused header, fixed reference args. 2015-05-18 15:10:41 +08:00
CocosRobot 3e08ec4c11 [AUTO]: updating luabinding & jsbinding automatically 2015-05-18 07:04:27 +00:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
minggo f30cb9ac19 Merge pull request #11877 from CocosRobot/update_lua_bindings_1431927557 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-18 14:48:42 +08:00
minggo 7b76d5fc41 Merge pull request #11871 from walzer/v3 
fixed #11821, after release StateBlock::_defaultState, set it to null.
 2015-05-18 14:47:16 +08:00
Huabing.Xu f96e704f7d Merge branch 'v3' into v3FrameBufferObject 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/cocos2d.h
	cocos/renderer/CCGLProgramCache.cpp
 2015-05-18 13:48:50 +08:00
CocosRobot 9572de26d4 [AUTO]: updating luabinding & jsbinding automatically 2015-05-18 05:43:08 +00:00
minggo c2f245733c Merge pull request #11872 from xiaofeng11/v3 
Fix ArmatureAnimation crash
 2015-05-18 13:32:52 +08:00
minggo 8068a2c220 Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering 
V3 camera mask for2 d and3 d rendering
 2015-05-18 13:32:26 +08:00
XiaoFeng be20666b65 Fix ArmatureAnimation crash 2015-05-18 12:08:26 +08:00
walzer 02f295dfbf fixed #11821, after release StateBlock::_defaultState, set it to null, because developers would reconstruct it. 2015-05-18 10:44:49 +08:00
Huabing.Xu 384041a950 improve the perfermance of clear background for camera 2015-05-18 10:31:17 +08:00
samuele3hu da2314b00a Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua 2015-05-18 09:41:35 +08:00
minggo 2dbe375380 Merge pull request #11868 from joshuastray/bullet-preprocessor-macro 
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
 2015-05-18 09:33:00 +08:00
joshuastray ead74ac89e add CC_ENABLE_BULLET_INTEGRATION=1 to js project 2015-05-17 23:11:17 +08:00
anniruddh.koppal 2db5a89b87 Added new audio engine with wav support 2015-05-15 18:17:52 -07:00
unknown 91432f0ddf fixed include paths for arm builds 2015-05-15 15:35:36 -07:00
Jacky 19c5d2dc84 fixed some memory leakage and pixel cutting. 2015-05-15 17:18:19 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
samuele3hu 71595898ed Update the Lua binding for Physics3D ,related test cases and the template project 2015-05-15 16:25:07 +08:00
andyque be62b3a8e2 Copy missing text color property of ui::Text. 2015-05-15 16:04:34 +08:00
iris-wy 68ec7c8ca1 Add enhance service API 
Add enhance service  API
 2015-05-15 14:29:22 +08:00
minggo 70cefb1589 Merge pull request #11845 from MSOpenTech/v3-winrt-js-fix 
V3: WinRT added ignore warning 4996 to Universal App libcocos2d-jsb
 2015-05-15 11:34:44 +08:00
minggo 5e776381aa Merge pull request #11820 from Dimon4eg/v3 
Fix crash in web view if illegal character in url (Android only)
 2015-05-15 10:12:54 +08:00
Huabing.Xu fbe49f538d remove WP8 code which is added by accident when resolve merge conflicts 2015-05-15 10:06:44 +08:00
Dale Stammen 46c69c7793 added ignore warning 4996 to hide the 200 deprecated warnings in libcocos2d-jsb 2015-05-14 19:00:53 -07:00
Huabing.Xu c994f28914 Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering 2015-05-15 09:55:51 +08:00
samuele3hu fa63471c0a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
 2015-05-15 09:31:53 +08:00
samuele3hu 8db62c82f8 Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00
Ricardo Quesada 989848a358 fixes memory leak 
improves performance a little bit
 2015-05-14 17:24:27 -07:00
minggo 9f3284d62f Merge pull request #11833 from super626/v3 
getTriangleList to bundle and add terrain to 3d render queue
 2015-05-14 18:16:27 +08:00
minggo 0a3e6338f1 Merge pull request #11834 from pandamicro/v3_origin 
Sync fixes in Cocos2d-JS
 2015-05-14 13:38:18 +08:00
Huabing.Xu 84540c1ff4 Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering 
Conflicts:
	cocos/renderer/CCGLProgramCache.cpp
	tests/cpp-tests/Classes/controller.cpp
 2015-05-14 11:55:10 +08:00
Huabing.Xu 57a3fa256a Fix memory leak for FrameBufferObject 2015-05-14 11:19:13 +08:00
pandamicro 4146a6edf4 Fix incorrect property of cc.Texture2D 2015-05-14 10:41:10 +08:00
pandamicro 2685df73f2 Fix spine crash issue 2015-05-14 10:40:37 +08:00
pandamicro 8577055d5a Implement localStorage.clear on Android 2015-05-14 10:40:25 +08:00
Huabing.Xu e6e0a1d15c refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D 2015-05-14 10:36:49 +08:00
CocosRobot 006f9fcd36 [AUTO]: updating luabinding & jsbinding automatically 2015-05-14 02:30:32 +00:00
yangxiao e659373648 add getTriangleList to bundle 2015-05-14 10:30:20 +08:00
yangxiao 0f0f85b33c terrain to 3d render queue 2015-05-14 10:29:50 +08:00
minggo cbab1074fa Merge pull request #11819 from cpascal/fix_defined 
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
 2015-05-14 10:21:38 +08:00
minggo 7732cd6e77 Merge pull request #11814 from super626/issue9767 
add issue9767 test
 2015-05-14 10:20:09 +08:00
minggo 1eaacd27c5 Merge pull request #11818 from joshuastray/fix-js-compilation 
fix script binding code generation
 2015-05-14 10:19:27 +08:00
Ricardo Quesada fde5f8d63c Adds better sample 
adds clone support as well
 2015-05-13 17:39:39 -07:00
Ricardo Quesada aeea7ade14 RenderState can be part of Material and Technique 2015-05-13 14:12:37 -07:00
Ricardo Quesada e95de4de62 fixes mipmap issue with parsing Sampler 2015-05-13 10:24:32 -07:00
dkorchinskiy 9d7e5e5edc Fix crash in web view if illegal character in url (Android only) 2015-05-13 14:56:07 +03:00
cpascal 134355d763 Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0 
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0

But CCImage.cpp just check wheather defined or not..
 2015-05-13 20:52:32 +09:00
cpascal 7e9019f9d6 Revert "Fixed ogg filepath has unicode in Win32" 
This reverts commit 382fd48b6a.
 2015-05-13 20:49:46 +09:00
joshuastray 4699b0cfb5 fix script binding code generation 2015-05-13 17:51:30 +08:00
Huabing.Xu 8311cf8920 Fix clearcolor overwrite bug 
change test case for FrameBufferObject
 2015-05-13 17:40:10 +08:00
cpascal 14f8b02d9b Merge remote-tracking branch 'upstream/v3' into v3 2015-05-13 18:28:38 +09:00
Huabing.Xu 6097b4ddd2 add clearAllFBOs function in FrameBufferObject 2015-05-13 17:17:54 +08:00
minggo 1007c0bfdb Merge pull request #11813 from CocosRobot/update_lua_bindings_1431504407 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-13 17:05:27 +08:00
minggo 3d0c7705f7 Merge pull request #11763 from Dimon4eg/v3 
Fix web view leak on iOS
 2015-05-13 17:02:50 +08:00
yangxiao ec69a34c51 add issue9767 test 2015-05-13 16:16:45 +08:00
CocosRobot 6bf984f3d3 [AUTO]: updating luabinding & jsbinding automatically 2015-05-13 08:11:34 +00:00
Huabing.Xu 42514ee62f FrameBufferObject works 2015-05-13 14:24:53 +08:00
Ricardo Quesada f23b15c6d3 Merge pull request #11810 from ricardoquesada/api_fixes 
More material samples
 2015-05-12 23:03:40 -07:00
minggo 384c20f390 Merge pull request #11805 from super626/physics3d2 
pass parameter by reference
 2015-05-13 13:39:49 +08:00
Ricardo Quesada c693573d77 more samples 
and API fixes
 2015-05-12 22:24:52 -07:00
Ricardo Quesada a83c10fdbf Merge pull request #11807 from ricardoquesada/material_vertexattrib 
Adds support of VertexAttribBinding per Pass
 2015-05-12 21:05:02 -07:00
Ricardo Quesada d23ff0ea2c Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00