minggo
f0aaacae5d
Merge pull request #9853 from suzukaze/fix-indents
...
Replace tab with spaces.
2015-01-08 09:29:05 +08:00
Huabing.Xu
0f0e54a00b
Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile
...
Compatibility code for executeScriptFile
2015-01-08 09:26:47 +08:00
yinjimmy
70e0874add
Compatibility code for executeScriptFile
2015-01-08 09:01:39 +08:00
Nite Luo
b675a2ca61
Turn off Depth Write by default, only 3D opaque object will write to Depth buffer
2015-01-07 16:35:08 -08:00
huangshiwu
be02233815
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 00:23:27 +08:00
Jun Hiroe
ca86bce60d
Replace tab with spaces
2015-01-07 23:46:28 +09:00
CocosRobot
9253ae99bc
[AUTO]: updating luabinding automatically
2015-01-07 09:50:54 +00:00
Huabing.Xu
b5859114b7
Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp
...
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-07 17:45:43 +08:00
minggo
a76d4e76da
Merge pull request #9832 from super626/v3
...
Fix warning log when loading sphere.c3b
2015-01-07 17:28:07 +08:00
minggo
c229ee0060
Merge pull request #9831 from CocosRobot/update_lua_bindings_1420600634
...
[AUTO]: updating luabinding automatically
2015-01-07 17:24:14 +08:00
minggo
4c7377480b
Merge pull request #9837 from minggo/memory-leak
...
fix memory leak
2015-01-07 17:23:28 +08:00
andyque
0f49bb977d
improve ui::Text and ui::TextField creation performance
2015-01-07 17:21:41 +08:00
Wenhai Lin
8524a5fb97
Improve performance of physics
2015-01-07 17:08:04 +08:00
htl
66dd8bb449
modify float convert to unsigned int
2015-01-07 16:03:46 +08:00
yinjimmy
7d430742f1
Merge branch 'bugfix_executeScriptFile' into combine
2015-01-07 15:33:15 +08:00
yinjimmy
cbf9741dfd
Compatibility code for executeScriptFile
2015-01-07 15:23:58 +08:00
htl
3d2aa30aa7
modify trans lua value to fontdefinition error
2015-01-07 15:18:56 +08:00
minggo
1dcdd81fc4
fix memory leak
2015-01-07 15:02:27 +08:00
minggo
f69f2359c8
Merge pull request #9833 from htlxyz/v3_origin
...
V3 origin
2015-01-07 14:47:11 +08:00
Huabing.Xu
27d4c6a0f6
Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug
...
DrawNode override drawPoints function to set pointSize, fix draw points ...
2015-01-07 14:46:13 +08:00
htl
194fa09f30
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-07 14:14:52 +08:00
htl
e1fd472df1
modify texture format name
2015-01-07 14:11:48 +08:00
huangshiwu
f41f00fcb2
make rotated rect draw correctly
2015-01-07 11:44:16 +08:00
CocosRobot
54c75337c5
[AUTO]: updating luabinding automatically
2015-01-07 03:19:27 +00:00
minggo
fbf565fd59
Merge pull request #9798 from samuele3hu/v3_4_packagesize
...
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-07 11:14:22 +08:00
lvlong
f9b0c9bc92
fix bug.
2015-01-07 11:09:09 +08:00
minggo
f60cbef0da
Merge pull request #9811 from dabingnn/v3_refactorEGLConfigChooserJavaCode
...
move class cocos2dEGLConfigChooser to Cocos2dxActivity
2015-01-07 11:05:36 +08:00
huangshiwu
ac7ddad4ac
DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug
2015-01-07 11:02:31 +08:00
CocosRobot
f83daed2cf
[AUTO]: updating luabinding automatically
2015-01-07 02:27:01 +00:00
minggo
4b0a35d772
Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass
...
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
2015-01-07 10:21:54 +08:00
Sergey
babbac4e38
comments
2015-01-06 14:45:10 +03:00
Huabing.Xu
339a8b1abc
class rename for EGLConfigChooser
2015-01-06 16:18:01 +08:00
minggo
5b0925d42d
Merge pull request #9802 from dabingnn/v3_fixGLProgramLogCrash
...
fix delete wild opengl buffers
2015-01-06 15:13:49 +08:00
WenhaiLin
2847a940ed
Update project
2015-01-06 14:40:15 +08:00
WenhaiLin
fdaa0bbfc6
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
2015-01-06 14:40:14 +08:00
minggo
31819bafc3
Merge pull request #9769 from ton1517/fix/jumpto
...
fix problem : JumpTo position is changed each repeat.
2015-01-06 14:09:54 +08:00
minggo
c8387dd2a8
Merge pull request #9780 from Dhilan007/v3-physics-gravity
...
Fixed physics body not still after disable gravitational force by PhysicsBody::setGravityEnable.
2015-01-06 13:59:31 +08:00
Huabing.Xu
1180f7a41e
move class cocos2dEGLConfigChooser to Cocos2dxActivity
2015-01-06 12:44:29 +08:00
WenhaiLin
f620038c59
Add miss file for win32 project
2015-01-06 10:55:26 +08:00
minggo
b88b9ea994
Merge pull request #9777 from ffskyfan/v3
...
fix the problem that engine can't get data from file on windows
2015-01-06 10:21:36 +08:00
Huabing.Xu
7f61a3d97b
reset _VAOname to 0 before recreating on android
2015-01-06 09:44:19 +08:00
WenhaiLin
ac8e820472
Fixed gravity of physics module not work as expected.
2015-01-05 22:15:03 +08:00
Huabing.Xu
a1654e5714
fix delete wild opengl buffers
2015-01-05 17:53:31 +08:00
samuele3hu
58d946b578
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-05 17:10:25 +08:00
yusheng.lu
3c992fe38c
Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur.
...
Now it's fixed.
2015-01-05 16:59:09 +08:00
minggo
c7508bb1c6
Merge pull request #9783 from doomsdayer/v3
...
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
2015-01-05 15:11:22 +08:00
minggo
4b2375e28c
Merge pull request #9794 from htlxyz/v3_origin
...
modify event register function name
2015-01-05 14:22:53 +08:00
minggo
ef5076983d
Merge pull request #9792 from minggo/memory-leak
...
fix memory leak
2015-01-05 14:20:49 +08:00
htl
c4cc6b5c34
modify event register function name
2015-01-05 14:19:27 +08:00
htl
d754900b28
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-05 14:07:37 +08:00
htl
f82404f9c9
modify node register event interface
2015-01-05 14:02:29 +08:00
minggo
1f271a3668
Merge pull request #9786 from dabingnn/v3_fixGLProgramLogCrash
...
fix GLProgram log crash on windows
2015-01-05 13:56:05 +08:00
Huabing.Xu
8dde42b66a
code adjust, delay deprecated flag specification
2015-01-05 13:52:22 +08:00
minggo
f155386f05
fix memory leak
2015-01-05 13:49:47 +08:00
yusheng.lu
ec540fcaa2
Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader
2015-01-05 13:26:46 +08:00
Huabing.Xu
63e6557165
fix GLProgram log crash on windows
2015-01-04 21:51:22 +08:00
yusheng.lu
7e8d1bb74c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-01-04 19:13:20 +08:00
yusheng.lu
a7fb75dc7d
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
2015-01-04 19:12:19 +08:00
samuele3hu
c91bd076cb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp
2015-01-04 17:10:22 +08:00
samuele3hu
832a87f5f0
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-04 17:09:35 +08:00
ffskyfan
cb3b760759
Update CCFileUtils-win32.cpp
...
fix the problem that engine can't get data from file while other app using the file on windows platform
2015-01-04 16:43:10 +08:00
minggo
4224319d61
Merge pull request #9775 from huangshiwu/iosnetwork-fixbug
...
fix iOS HttpClient immediately mode's bug
2015-01-04 14:45:18 +08:00
minggo
24daad384c
Merge pull request #9776 from samuele3hu/v3_4_bug
...
Fix compile iOS compile error on the Xcode 5.1.1
2015-01-04 14:38:45 +08:00
samuele3hu
713de37c5b
Fix compile iOS compile error on the Xcode 5.1.1
2015-01-04 13:49:41 +08:00
minggo
26a6502558
Merge pull request #9766 from raydelto/v3
...
Fixing typo in the constant INVAILD_AUDIO_ID
2015-01-04 13:36:16 +08:00
minggo
001cb59d8e
Merge pull request #9764 from zhensydow/patch-1
...
Remove warn error on Exit
2015-01-04 11:14:53 +08:00
huangshiwu
79e3e8463d
fix iOS HttpClient immediately mode's bug
2015-01-04 10:54:29 +08:00
ton
a445148a5e
fix problem : JumpTo position is changed each repeat.
...
example:
sprite->runAction(
RepeatForever::create(
Sequence::create(
JumpTo::create(1, Vec2(300, 200), 100, 2),
MoveTo::create(1, Vec2(100, 200)),
nullptr
)
)
);
2015-01-03 01:13:57 +09:00
raydelto
e20c347767
Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID
2014-12-31 20:51:45 -04:00
Dale Stammen
395b9fbaa7
added /bigobj to c++ command line options to fix arm builds
2014-12-31 12:56:16 -08:00
Luis Cabellos
651b7fc13c
Remove warn error on Exit
...
Change the return error on Linux to -1 to standard EXIT_SUCCESS value.
2014-12-31 18:37:59 +01:00
dualface
432bdf3541
fix framework on iOS
2014-12-31 18:01:03 +08:00
minggo
bbfa7a9183
Merge pull request #9753 from samuele3hu/v3_4_httpclient
...
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:48:33 +08:00
samuele3hu
54d376db01
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:28:14 +08:00
CocosRobot
2e1d8b4e42
[AUTO]: updating luabinding automatically
2014-12-31 08:15:01 +00:00
yusheng.lu
718cfb9d37
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version1
2014-12-31 16:06:19 +08:00
yusheng.lu
89034469f5
Updated the version check description.
2014-12-31 16:01:11 +08:00
minggo
292fff3c29
Merge pull request #9746 from pandamicro/v3_origin
...
Current restart game will disable ActionManager
2014-12-31 15:50:33 +08:00
pandamicro
677f7ca1d3
Improve restart game
2014-12-31 15:32:59 +08:00
CocosRobot
3614f716ae
[AUTO]: updating luabinding automatically
2014-12-31 06:23:33 +00:00
minggo
ad443da6a0
Revert "Feature of version check. "
2014-12-31 14:17:18 +08:00
minggo
84c193a343
Merge pull request #9737 from samuele3hu/v3_4_httpclient
...
Resolve the require file errror
2014-12-31 13:49:16 +08:00
samuele3hu
6bad549285
Resolve the require file errror
2014-12-31 13:43:47 +08:00
Dale Stammen
d8c2927944
added base/allocator files
2014-12-30 21:41:46 -08:00
Dale Stammen
7276f64f29
updated dll name from 3.3 to 3.4
2014-12-30 21:40:01 -08:00
Dale Stammen
79e71b6c50
Merge branch 'v3' into wp8-fix2
2014-12-30 21:25:54 -08:00
Dale Stammen
2948a0cdcd
used CreateMutexEx for WINRT and WP8
2014-12-30 21:24:05 -08:00
Dale Stammen
ac95d292bd
added base/allocator files
2014-12-30 21:21:36 -08:00
Dale Stammen
09efe9be04
removed unused winrt CCPlatformDefine.h
2014-12-30 21:03:33 -08:00
minggo
161b0a3985
Merge pull request #9727 from samuele3hu/v3_4_httpclient
...
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 13:00:04 +08:00
Dale Stammen
df64718ef1
removed 3dExport.h as it no longer exists
2014-12-30 20:51:54 -08:00
minggo
fde63be06a
Merge pull request #9725 from huangshiwu/iosnetwork
...
iOS HttpClient replace libcurl
2014-12-31 12:50:11 +08:00
samuele3hu
3795f9cc2a
Rename HttpClient-android.cpp and unify java indent format
2014-12-31 12:03:27 +08:00
yangxiao
d23eb83ba1
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-12-31 11:40:37 +08:00
huangshiwu
893aded9b7
iOS HttpClient replace libcurl - fix Jenkins compile error
2014-12-31 11:32:35 +08:00
samuele3hu
f7ed73c1e1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient
2014-12-31 10:17:12 +08:00
samuele3hu
0e94bdda3a
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 10:15:14 +08:00
minggo
51c89c3a22
Merge pull request #9720 from dabingnn/v3_perf
...
V3 perf
2014-12-31 10:02:59 +08:00
huangshiwu
7426b5c4b5
iOS HttpClient replace libcurl
2014-12-31 10:02:14 +08:00
minggo
274d7d2276
Merge pull request #9718 from darkdukey/depthWriteFix
...
Disable write to depth buffer for transparent objects
2014-12-31 10:00:48 +08:00
minggo
0d23e5906d
Merge pull request #9717 from geron-cn/armaturenodefix
...
make current animation name take effect when autoplay is false
2014-12-31 09:58:35 +08:00
minggo
5d109d0415
Merge pull request #9721 from MSOpenTech/wp8-fix
...
WP8 and Windows 8.1 Universal App fixes
2014-12-31 09:47:58 +08:00
minggo
a281634c1e
Merge pull request #9711 from dabingnn/v3_addUpdateUniformsAndAttributes
...
V3 add update uniforms and attributes
2014-12-31 09:45:08 +08:00
Dale Stammen
f73a07c7b9
added missing files
2014-12-30 17:27:37 -08:00
Dale Stammen
bd1fef7515
added missing files
2014-12-30 16:40:04 -08:00
Dale Stammen
57f0ef41b4
added missing inet_pton() for windows phone
2014-12-30 16:39:26 -08:00
Dale Stammen
d33fad0ac7
fixed check for header already included
2014-12-30 16:39:02 -08:00
Dale Stammen
f4cd2e311d
added missing inet_pton() for windows phone
2014-12-30 16:38:18 -08:00
Nite Luo
a68dfa13ec
Disable Depth Write for transparent objects
2014-12-30 13:35:29 -08:00
geron-cn
89c39d3f10
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix
2014-12-31 04:06:11 +08:00
geron-cn
b048b65ae3
make current animation name take effect when autoplay is false
2014-12-31 03:59:36 +08:00
minggo
70a29a8470
Merge pull request #9709 from htlxyz/v3_origin
...
modify widget interface for lua
2014-12-30 18:32:20 +08:00
Huabing.Xu
c60c3fb2b1
refresh uniforms and attributes when access uniform or attribute table
2014-12-30 18:32:09 +08:00
htl
dce4383357
modify widget interface for lua
2014-12-30 16:45:26 +08:00
CocosRobot
f4fbf51905
[AUTO]: updating luabinding automatically
2014-12-30 08:30:45 +00:00
minggo
ef95b1d52d
Merge pull request #9700 from minggo/use-const
...
fix some coding style
2014-12-30 16:24:41 +08:00
CocosRobot
5b8492770e
[AUTO]: updating luabinding automatically
2014-12-30 07:49:45 +00:00
minggo
869a9bb0a9
Merge pull request #9652 from lite3/patch-2
...
fix incorrect font path
2014-12-30 15:43:31 +08:00
Huabing.Xu
b92802a770
optimise Renderer::fillQuads()
2014-12-30 15:07:50 +08:00
Huabing.Xu
6576c16fe1
optimise QuadCommand::init()
2014-12-30 14:21:33 +08:00
minggo
538be7d973
Merge pull request #9693 from doomsdayer/v3_version
...
Feature of version check.
2014-12-30 13:56:16 +08:00
minggo
ba4ae50868
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into use-const
2014-12-30 13:36:10 +08:00
minggo
da8c007932
add const for Sprite::getTextureRect() and do some format
2014-12-30 11:55:54 +08:00
CocosRobot
ed7823c08b
[AUTO]: updating luabinding automatically
2014-12-30 03:52:26 +00:00
minggo
c78bf0f7aa
Merge pull request #9668 from pandamicro/v3_origin
...
Added restart game feature and getSearchPaths API in Manifest
2014-12-30 11:47:51 +08:00
Huabing.Xu
485c72651d
exextract updateUniformsAndAttributes
2014-12-30 11:13:14 +08:00
yusheng.lu
9a0f302370
revert the layoutComponent codes to prevent the demos crush.
2014-12-30 10:47:00 +08:00
yusheng.lu
e5961047aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
2014-12-30 10:42:54 +08:00
yusheng.lu
88f0a1e642
prevent the crush of the cocosstudio demos
2014-12-30 10:33:07 +08:00
pandamicro
ffd7c30c87
Polish restart implementation
2014-12-30 10:09:56 +08:00
minggo
3c1978fcc3
Merge pull request #9611 from super626/quaternion
...
Rotation With Quaternion
2014-12-30 10:09:08 +08:00
minggo
73a39d0966
Merge pull request #9688 from pipu/modify_warning
...
Modify warning code.
2014-12-30 10:07:41 +08:00
minggo
f3d91f8b79
Merge pull request #9692 from dabingnn/v3_perf
...
optimize rendering code
2014-12-30 10:07:17 +08:00
yusheng.lu
505a4e8ab0
Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file.
...
Removed the version compatible control code before.
2014-12-29 19:37:53 +08:00
Huabing.Xu
2348e5c247
optimize rendering code
2014-12-29 18:45:55 +08:00
pipu
d3783cba95
Modify warning code.
2014-12-29 17:04:23 +08:00
minggo
7db279220c
Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3
2014-12-29 15:04:43 +08:00
CocosRobot
75436db583
[AUTO]: updating luabinding automatically
2014-12-29 05:51:45 +00:00
dualface
653b15b4b8
add UIWidget support, fix typo
2014-12-29 13:37:20 +08:00
minggo
7ab4e0de3a
Merge pull request #9634 from andyque/fixIssue9628
...
fix setTitleColor calls method setColor instead of setTextColor of title label.
2014-12-29 11:24:36 +08:00
minggo
f1b014327f
Merge pull request #9678 from dualface/update_lua_templates
...
Update lua templates
2014-12-29 11:01:14 +08:00
dualface
40acc98f14
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates
2014-12-29 10:58:42 +08:00
minggo
24fc26fb5d
Merge pull request #9679 from super626/frustum
...
Release note for Frustum
2014-12-29 10:57:24 +08:00
yangxiao
0963b3d86e
add comment
2014-12-29 10:51:16 +08:00
dualface
954f170e9e
remove chinese comments
2014-12-29 10:44:16 +08:00
minggo
d7dfdc9124
Merge pull request #9417 from lite3/spriteretainframe
...
retain the sprite frame in sprite
2014-12-29 10:33:42 +08:00
minggo
67ae66a90e
Merge pull request #9663 from dualface/update_lua_corelib
...
update lua corelib
2014-12-29 10:30:50 +08:00
CocosRobot
35774cc0f6
[AUTO]: updating luabinding automatically
2014-12-29 02:07:20 +00:00
minggo
d95d8d98e3
Merge pull request #9672 from CocosRobot/update_lua_bindings_1419817593
...
[AUTO]: updating luabinding automatically
2014-12-29 10:03:00 +08:00
minggo
212684fcd4
Merge pull request #9665 from andyque/fixLibpngWarning
...
Fix libpng warning
2014-12-29 10:00:43 +08:00
minggo
06cd28f524
Merge pull request #9618 from yinjimmy/bindAddress
...
support bind address for console
2014-12-29 09:52:01 +08:00
CocosRobot
4172e7ad7f
[AUTO]: updating luabinding automatically
2014-12-29 01:49:00 +00:00
minggo
206aa94ff2
Merge pull request #9667 from SunLightJuly/fix_crash_when_display_FPS
...
fixed bug which caused crash when display FPS
2014-12-29 09:45:30 +08:00
minggo
b01b25e17e
Merge pull request #9558 from super626/frustum
...
Frustum Culling
2014-12-29 09:43:14 +08:00
minggo
a8ac3df48c
Merge pull request #9651 from CocosRobot/update_lua_bindings_1419581293
...
[AUTO]: updating luabinding automatically
2014-12-29 09:17:15 +08:00
minggo
2b0e287b5f
Merge pull request #9656 from geron-cn/v3_actionline_animationlist
...
fix: auto add search path for armaturenodereader
2014-12-29 09:17:01 +08:00
dualface
8d99d8a78e
fix typo
2014-12-29 05:47:37 +08:00
dualface
9684d6e164
update corelib
2014-12-29 05:41:13 +08:00
dualface
74daae1c39
update framework
2014-12-29 01:58:16 +08:00
pandamicro
e3795c0223
Added restart game feature
2014-12-28 11:55:06 +08:00
SunLightJuly
4d08128e89
fixed bug which caused crash when display FPS: the value of "_secondsPerFrame" of Director was not be Initialized
2014-12-27 22:05:29 +08:00
andyque
9c974eebd0
fix libpng warning
2014-12-27 20:47:59 +08:00
dualface
cc3021467f
add more usable functions
2014-12-27 15:31:31 +08:00
dualface
46a0ad11ac
update lua corelib
2014-12-27 11:59:14 +08:00
yinjimmy
4567cf1c40
Fix: Address family not supported by protocol
2014-12-26 21:04:49 +08:00
geron-cn
b25e307dee
fix add search path for armaturenodereader
2014-12-26 18:27:47 +08:00
XiaoYang
8b95c591b1
Merge pull request #189 from songchengjiang/v3
...
read AABB from file(v0.6+)
2014-12-26 16:15:56 +07:00
lite3
b102587590
fix incorrect font path
2014-12-26 16:20:04 +08:00
yangxiao
afb01dcd9a
config linux
2014-12-26 16:19:02 +08:00
CocosRobot
f8b1b34025
[AUTO]: updating luabinding automatically
2014-12-26 08:10:13 +00:00
minggo
f01cc596a3
Merge pull request #9637 from geron-cn/v3_actionline_animationlist
...
V3 actiontimeline animationlist
2014-12-26 16:05:49 +08:00
yinjimmy
5bcd3d9a00
bind address is available for all platform
2014-12-26 16:02:24 +08:00
yangxiao
b0a6720cb2
reset auto lua, fix #9515
2014-12-26 15:52:27 +08:00
yangxiao
25ce54b43b
reset
2014-12-26 15:46:45 +08:00
minggo
275de89746
Merge pull request #9650 from pipu/update_checkboxreader
...
Update that parse plist for CheckBoxReader.
2014-12-26 15:43:30 +08:00
minggo
84a88f4f76
Merge pull request #9649 from minggo/fileutil-extend
...
make FileUtils extendable
2014-12-26 15:37:51 +08:00
minggo
42e6232113
fix typo and memory leak
2014-12-26 14:25:55 +08:00
pipu
bc18bafaa7
Update that parse plist for CheckBoxReader.
2014-12-26 14:18:28 +08:00
lvlong
f592671df6
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
minggo
94d70358b7
make FileUtils extendable
2014-12-26 11:34:31 +08:00
CocosRobot
a30d606fe6
[AUTO]: updating luabinding automatically
2014-12-26 02:40:22 +00:00
minggo
9e8582e01a
Merge pull request #9643 from CocosRobot/update_lua_bindings_1419557440
...
[AUTO]: updating luabinding automatically
2014-12-26 10:35:53 +08:00
minggo
564b9f0aef
Merge pull request #9635 from super626/sync_load
...
ReleaseNote for Sprite3D::createAsync
2014-12-26 09:37:19 +08:00
CocosRobot
ff37578611
[AUTO]: updating luabinding automatically
2014-12-26 01:32:36 +00:00
minggo
1c87c53ff8
Merge pull request #9636 from musikov/v3-language
...
added Turkish and Ukrainian language;
2014-12-26 09:31:57 +08:00
minggo
491d36c62b
Merge pull request #9626 from liamcindy/CocoReader
...
update for cocos reader
2014-12-26 09:29:37 +08:00
minggo
3581c00301
Merge pull request #9619 from yinjimmy/trackLogForWindows
...
Track log for windows
2014-12-26 09:28:23 +08:00
minggo
3b01762db4
Merge pull request #9638 from yinjimmy/writablepath
...
set default resource root path & writable path
2014-12-26 09:27:59 +08:00
yinjimmy
744a9043f9
set default resource root path & writable path
2014-12-25 20:33:47 +08:00
yinjimmy
b21eaab047
using suitable variable name
2014-12-25 19:39:44 +08:00
andyque
19dc8b5d19
fix conflicts and wp8, wp8.1 linker error
2014-12-25 18:11:59 +08:00
Mykyta Usikov
d9b5ab4a4c
added Turkish and Ukrainian language;
...
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
2014-12-25 12:08:23 +02:00
andyque
29e9ef7edf
Merge branch 'v3' into modifyWidgetDefaultBehavior
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
geron-cn
70eef1f660
fix play
2014-12-25 17:45:14 +08:00
yangxiao
64ff6bb51c
modify msg word
2014-12-25 17:42:58 +08:00
yangxiao
d9d5e1a5cb
add release note
2014-12-25 17:40:26 +08:00
geron-cn
490b33405d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist
2014-12-25 17:37:05 +08:00
geron-cn
79e5341742
remove animation list binary parse
2014-12-25 17:22:49 +08:00
andyque
3f0f7c289f
change setColor to setTextColor
2014-12-25 16:07:34 +08:00
minggo
6ec03010a7
Merge pull request #9630 from andyque/fixCICompile
...
fix ci compile error
2014-12-25 16:03:50 +08:00
andyque
60893607cc
fix ci compile error
2014-12-25 15:38:51 +08:00
lvlong
75d2deb2c8
revert
2014-12-25 15:25:19 +08:00
lvlong
3f91957e79
revert
2014-12-25 15:21:53 +08:00
Liam
fa85faec68
update for cocos reader
2014-12-25 15:02:22 +08:00
yangxiao
04e273e245
bind setRotationQuat
2014-12-25 14:54:20 +08:00
CocosRobot
6b15f4edcb
[AUTO]: updating luabinding automatically
2014-12-25 06:14:03 +00:00
Liam
807e63eae3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader
2014-12-25 14:13:02 +08:00
Liam
bd37d806ff
update for cocos reader
2014-12-25 14:11:05 +08:00
minggo
2ec85f8c4e
Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket
...
avoid locking when message queue is empty in websocket
2014-12-25 14:09:35 +08:00
minggo
9643b87ed0
Merge pull request #9173 from 2youyouo2/v3
...
improve ActionTimeline api
2014-12-25 14:06:02 +08:00
lvlong
a4a108f766
fix lua binding again!!
2014-12-25 14:04:41 +08:00
minggo
0c66e638f7
Merge pull request #8183 from xseekerj/patch-3
...
CCPlatformMacros.h
2014-12-25 14:02:52 +08:00
minggo
2ca143959b
Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile
...
execute script with full file path
2014-12-25 13:45:46 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
yangxiao
0db70977f9
wrong scale order
2014-12-25 10:39:48 +08:00
yangxiao
510633ba72
wrong spelling
2014-12-25 10:33:49 +08:00
yinjimmy
b4a442cd8c
fix compile error on windows
2014-12-25 09:33:28 +08:00
yangxiao
6eed142e03
rename _rotation_quat to _rotationQuat
2014-12-24 18:12:00 +08:00
CocosRobot
381be0f6f0
[AUTO]: updating luabinding automatically
2014-12-24 09:41:09 +00:00
minggo
03d53ba7c4
Merge pull request #9585 from doomsdayer/v3_armature_reader
...
V3 armature reader
2014-12-24 17:36:09 +08:00
yangxiao
17207673ff
merge cocos
2014-12-24 17:34:58 +08:00
yangxiao
88e0f025ef
make it clean
2014-12-24 17:18:09 +08:00
yangxiao
22ae384edf
Rotation representation with quaternion fix #9510
2014-12-24 17:07:54 +08:00
minggo
705bf500f7
Merge pull request #9604 from CocosRobot/update_lua_bindings_1419403220
...
[AUTO]: updating luabinding automatically
2014-12-24 17:06:05 +08:00
yusheng.lu
7c34b06969
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-24 16:02:37 +08:00
youyou
db6ffd7962
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x ; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-24 15:59:50 +08:00
minggo
0b7572f3ee
[ci skip]
2014-12-24 15:35:58 +08:00
yusheng.lu
c64792959c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-24 15:32:02 +08:00
lvlong
da2683aad9
Merge branch 'frustum' of github.com:lvlonggame/cocos2d-x into frustum
2014-12-24 15:10:48 +08:00
lvlong
4d1ca0966c
lua binding
2014-12-24 15:09:26 +08:00
lvlonggame
805b248af3
modify win-project
2014-12-24 15:06:58 +08:00
minggo
42f1d5fdf3
Merge pull request #9601 from minggo/set-glcolor
...
Director supports setting clear color
2014-12-24 14:45:43 +08:00
CocosRobot
a5d3e8361b
[AUTO]: updating luabinding automatically
2014-12-24 06:42:09 +00:00
minggo
bb9fb9f0d6
Merge pull request #9591 from liamcindy/Layout
...
update for lay out
2014-12-24 14:27:08 +08:00
yusheng.lu
fa5b4f8df7
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
2014-12-24 13:06:38 +08:00
minggo
b925689435
Director supports setting clear color
2014-12-24 11:53:38 +08:00
Liam
dcd544cc66
update ui widget function format
2014-12-24 11:12:14 +08:00
Liam
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
minggo
5d8e004b9b
Merge pull request #9600 from huangshiwu/v3_allocator_wp
...
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:54:16 +08:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
huangshiwu
01eeb15a8d
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
minggo
ef9c44566b
Merge pull request #9593 from CocosRobot/update_lua_bindings_1419317247
...
[AUTO]: updating luabinding automatically
2014-12-24 10:31:58 +08:00
minggo
4cac8e2cb4
Merge pull request #9595 from super626/v3
...
Do not try to load empty texture
2014-12-24 10:31:44 +08:00
songchengjiang
ceb834b8d4
read AABB from file(v0.6+)
2014-12-24 10:12:31 +08:00
yinjimmy
24648db2b5
execute script with full file path
2014-12-24 02:18:29 +08:00
yinjimmy
b46ee82e90
support bind address for console
2014-12-24 02:04:42 +08:00
yinjimmy
a26f62186b
track log for windows
2014-12-24 01:26:13 +08:00
Liam
33bd5e3f4c
remove unused code
2014-12-23 20:36:18 +08:00
Liam
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
minggo
dea483b6ef
performance improve
2014-12-23 18:07:22 +08:00
yusheng.lu
d543f8f6a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-23 16:12:50 +08:00
yangxiao
908b9e470d
do not try to load empty texture
2014-12-23 15:52:45 +08:00
yusheng.lu
2b7c0edfed
license in ArmatureNodeReader.h added.
2014-12-23 15:13:27 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
CocosRobot
864b924dfb
[AUTO]: updating luabinding automatically
2014-12-23 06:49:30 +00:00
minggo
ca932a38e4
Merge pull request #9538 from andyque/fixCapInsetSize
...
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-23 14:44:32 +08:00
minggo
90a7f99873
Merge pull request #9570 from liamcindy/UIListView
...
override function for listview
2014-12-23 14:25:46 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
CocosRobot
facf9a1a66
[AUTO]: updating luabinding automatically
2014-12-23 04:05:21 +00:00
minggo
40d00e3d97
Merge pull request #9554 from super626/sync_load
...
create 3d sprite asynchronously
2014-12-23 12:00:13 +08:00
yusheng.lu
7eedef71e6
armature node test completed
2014-12-23 11:13:05 +08:00
yangxiao
3d77c7535d
merge cocos
2014-12-23 10:35:35 +08:00
yangxiao
2309a524fd
simplify AsyncTaskPool
2014-12-23 10:12:37 +08:00
lvlong
026f0a8b25
modify code format.
2014-12-23 09:57:46 +08:00
mannewalis
9d885fe664
default lock macros to nothing for unsupported platforms
2014-12-22 19:49:20 -05:00
mannewalis
09f2eed4b8
default lock macros to nothing for unsupported platforms
2014-12-22 19:46:16 -05:00
mannewalis
aad45d6952
fixing windows8 build
2014-12-22 19:43:40 -05:00
yusheng.lu
1e05361873
ios/mac project compeleted
2014-12-22 20:08:27 +08:00
yusheng.lu
2de5ba7c2f
vs filters update
2014-12-22 19:43:14 +08:00
yusheng.lu
02b9269cff
completed multiplatform projects
2014-12-22 19:39:10 +08:00
Liam
1e85f1a080
Merge branch 'UILayout_Widget' into UILayout_Reader
2014-12-22 19:23:03 +08:00
Liam
377d8ec3c0
Merge branch 'UILayout' into UILayout_Widget
2014-12-22 19:22:09 +08:00
Liam
39d0f183d4
update for code format
2014-12-22 19:05:31 +08:00
youyou
70052b2a3f
support animation list
2014-12-22 18:57:48 +08:00
Liam
0465ff8325
remote unuseful format
2014-12-22 18:39:44 +08:00
yusheng.lu
b0bfc2906a
change armature codes files path
2014-12-22 18:26:50 +08:00
lvlong
db9f4a23fe
feedback commit.
2014-12-22 18:13:07 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +08:00
yangxiao
1ba826ea17
modify code style
2014-12-22 17:40:02 +08:00
lvlong
2058742e4a
Merge branch 'frustum' of github.com:super626/cocos2d-x into frustum
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCCamera.cpp
cocos/2d/CCCamera.h
cocos/3d/CCFrustum.cpp
cocos/3d/CCFrustum.h
cocos/3d/CCPlane.cpp
cocos/3d/CCPlane.h
cocos/3d/CCRay.cpp
cocos/3d/CCRay.h
cocos/3d/CCSprite3D.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
2014-12-22 17:37:00 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
yangxiao
e8c7f30541
add quaternion
2014-12-22 17:23:44 +08:00
CocosRobot
34e1bce6c3
[AUTO]: updating luabinding automatically
2014-12-22 08:02:05 +00:00
minggo
feacf75f12
Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
...
#9555 MoveTo and MoveBy support Vec3
2014-12-22 15:57:12 +08:00
lvlong
63ebf20026
modify code format.
2014-12-22 15:51:10 +08:00
Liam
ce9f269680
update object reader for new lay out system
2014-12-22 15:38:47 +08:00
lvlong
7291e6e94a
modify about feedback.
2014-12-22 15:23:41 +08:00
Liam
f5a242be97
update for widget percent position and size logic
2014-12-22 15:23:26 +08:00
yangxiao
bdc12dce8b
add quaternion property
2014-12-22 15:14:18 +08:00
minggo
6ac611bd1d
Merge pull request #9573 from pipu/update_parse_resource_path
...
Update that parse resource path with flat buffers for readers
2014-12-22 15:11:24 +08:00
minggo
81de0ae687
Merge pull request #9566 from austinkelleher/dev
...
Fixing variable name lenght -> length.
2014-12-22 15:07:15 +08:00
Liam
5a73ea9313
reset widget chaned
2014-12-22 15:04:25 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
Liam
7c4d31feab
update for lay out samples
2014-12-22 14:51:50 +08:00
minggo
39f56f1303
Merge pull request #9562 from wefiends/upstream2-v3
...
AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.
2014-12-22 14:50:38 +08:00
minggo
1268f73a7c
MoveTo and MoveBy support Vec3
2014-12-22 14:34:35 +08:00
pipu
0c6e22dd77
Update that parse resource path with flat buffers for readers
2014-12-22 13:42:18 +08:00
Liam
56e42b0a0a
update for lay out
2014-12-22 11:20:03 +08:00
kaile.yin
a8dd2a4e80
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
2014-12-22 11:15:07 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
Liam
8d8215b148
override function for listview
2014-12-22 09:55:29 +08:00
joewanchen
bb1267cd09
use auto&.
2014-12-21 14:05:34 +08:00
joewanchen
a15a4a0739
fix compile error.
2014-12-21 02:03:41 +08:00
joewanchen
c2473b9b99
fix.
2014-12-21 01:03:30 +08:00
joewanchen
3765f87651
fix.
2014-12-21 00:49:23 +08:00
joewanchen
7d6686eb7b
fix.
2014-12-21 00:42:55 +08:00
joewanchen
fc69dabca2
fix serious performance problem.
2014-12-21 00:22:23 +08:00
Austin Kelleher
d3ca364259
Fixing variable name lenght -> length.
2014-12-20 07:34:44 -05:00
Ricardo Quesada
92584bbc7f
Merge pull request #9547 from mannewalis/mem_alloc_again
...
Mem alloc again
2014-12-19 14:35:26 -08:00
Nick Barrios
0c2e64b8b9
AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.
2014-12-19 16:50:47 -05:00
mannewalis
50bd3cf2b7
modify inline macro to work on windows
2014-12-19 10:57:19 -05:00
XiaoYang
9102c77840
Merge pull request #182 from lvlonggame/v3
...
camera frustum update
2014-12-19 16:14:01 +07:00
XiaoYang
6be4538f3d
Merge pull request #181 from songchengjiang/sync_load
...
fix errors on Windows
2014-12-19 13:33:20 +07:00
yangxiao
eb2e27ef27
Merge branch 'newcode' into sync_load
2014-12-19 14:27:17 +08:00
WenhaiLin
4366fb7230
Fix compile error on WIN32.
2014-12-19 11:49:40 +08:00
songchengjiang
f5f95c5693
fix errors on Windows
2014-12-19 11:30:51 +08:00
yangxiao
f4dbaa53e4
add to linux
2014-12-19 10:29:10 +08:00
lvlong
13cae3c480
deal tab
2014-12-19 10:25:59 +08:00
yangxiao
5aad841080
add stop task
2014-12-19 10:22:02 +08:00
yangxiao
d1a35fe47a
make bundle thread safe
2014-12-19 10:21:30 +08:00
yangxiao
c788a1892d
make it thread safe
2014-12-19 10:20:44 +08:00
yangxiao
37f4d67a49
make it thread safe
2014-12-19 10:20:37 +08:00
minggo
627e5dacfc
Merge pull request #9543 from tjunxin/patch-1
...
comment line 83
2014-12-19 10:04:14 +08:00
minggo
8f3e9d9fb1
Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers
...
Update that avoid crash during load resource which serialize by flat buffers.
2014-12-19 09:58:26 +08:00
minggo
6f0a4191cb
Merge pull request #9533 from andyque/fixWebpPremultiplyAlpha
...
fix webp format premultipliedAlpha error
2014-12-19 09:53:44 +08:00
yangxiao
549ec2adab
make bundle thread safe
2014-12-19 09:48:20 +08:00
mannewalis
467a5e9c12
minor changes for linux build
2014-12-18 18:21:49 -05:00
mannewalis
c05a6c877d
adding files to cmake files
2014-12-18 18:10:13 -05:00
lvlong
a5746dd2a0
1. modify Android.mk
...
2. modify DrawNode3D include path
2014-12-18 18:14:16 +08:00
lvlong
f6bea9b6bb
1.add camera culling.
...
2.add camera culling sample.
3.fix bug: load .obj file material.
2014-12-18 17:18:22 +08:00
yangxiao
f54f8a4826
remove return value of enque
2014-12-18 16:16:04 +08:00
yangxiao
6e99698c59
Merge branch 'newcode' into sync_load
2014-12-18 14:03:07 +08:00
tjunxin
561350c2bc
comment line 83
...
As known, _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant.
If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.
2014-12-18 13:49:54 +08:00
mannewalis
6b1f994c40
turn off global new delete
2014-12-17 13:55:14 -05:00
mannewalis
a6eab3c496
Merge branch 'v3' into mem_alloc_again
2014-12-17 11:59:24 -05:00
mannewalis
34a2f6f640
minor tweak
2014-12-17 11:56:19 -05:00
mannewalis
fd22242fb2
added locking semantics to fixed block allocator
...
pool allocator uses lockless semantics by default
2014-12-17 11:54:06 -05:00
pipu
79acf80fb1
Update that avoid crash during load resource which serialize by flat buffers
2014-12-17 19:00:24 +08:00
CocosRobot
9ffacb3f78
[AUTO]: updating luabinding automatically
2014-12-17 10:38:03 +00:00
minggo
9da1317f10
Merge pull request #9453 from sxd1140/v3
...
add stopActionByName()
2014-12-17 18:32:04 +08:00
andyque
b11e3d74cc
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-17 16:46:48 +08:00
andyque
6856f03bff
fix webp format premultipliedAlpha error
2014-12-17 14:21:46 +08:00
samuele3hu
5c20885ad1
Synchronize the KeyCode Enum to Lua
2014-12-17 11:27:01 +08:00
yangxiao
ae0888ba8d
merge cocos
2014-12-17 10:06:07 +08:00
minggo
d9953d4aac
Merge pull request #9519 from andyque/addNewRequirements
...
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-17 09:53:31 +08:00
CocosRobot
189e386846
[AUTO]: updating luabinding automatically
2014-12-16 10:44:15 +00:00
minggo
116ff0de63
Merge pull request #9439 from andyque/addcreateMethodToLoadingBar
...
add TextureResType to LoadingBar's create method
2014-12-16 18:31:20 +08:00
minggo
e800b3d9ba
Merge pull request #9501 from joewan/v3-fix-mismatch
...
V3 fix uninitialized members.
2014-12-16 18:28:36 +08:00
andyque
16cf396ed7
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-16 16:44:04 +08:00
lvlong
73a2a6385a
add frustum culling.
2014-12-16 16:34:35 +08:00
CocosRobot
3d327deb6d
[AUTO]: updating luabinding automatically
2014-12-16 02:14:01 +00:00
minggo
b3731fa06a
Merge pull request #9486 from 2youyouo2/v3_EventFrame
...
fixed frame event
2014-12-16 09:53:43 +08:00
minggo
6b18305550
Merge pull request #9497 from Dhilan007/v3-game
...
Fixed content size of Label is incorrect after sets empty string.
2014-12-16 09:48:36 +08:00
mannewalis
640695c21c
reverting android properties change
2014-12-15 16:31:22 -08:00
mannewalis
a095635459
android fixes
2014-12-15 16:21:12 -08:00
mannewalis
b532ce74d8
diagnostics track allocator enable
2014-12-15 16:16:35 -08:00
mannewalis
c50bf94c59
removing Allocator<T> and inheriting base directly.
2014-12-15 09:34:25 -08:00
joewanchen
7b23e3ab1d
remove useless function call.
2014-12-15 19:47:25 +08:00
joewanchen
713d19c830
initialize _contentSizeDirty.
2014-12-15 19:43:54 +08:00
joewanchen
0cc4b58383
initialize _startPointCaptured.
2014-12-15 19:42:25 +08:00
yangxiao
5ad408530c
merge cocos
2014-12-15 17:47:05 +08:00
Wenhai Lin
4ed5872ba3
Fixed content size of Label is incorrect after sets empty string.
2014-12-15 14:36:57 +08:00
youyou
69824ff07b
add space for readable
2014-12-15 09:36:21 +08:00
Vladimir Timofeev
be01bede63
Fix couple of warnings. Make forward declarations to match to real declarations.
2014-12-14 21:04:14 +03:00
Vladimir Timofeev
6494a7abae
Hide tinyxml2 from user visible header.
2014-12-14 20:32:24 +03:00
Vladimir Timofeev
9bd1ab74c7
Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory.
...
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
2014-12-14 12:14:16 +03:00
mannewalis
cb547413d2
fix range error on reporting all allocators
2014-12-13 11:45:08 -08:00
mannewalis
58be92b35f
added more diagnostic info.
...
still crashing, but only on device. Suspect a free(p) that was allocated with new.
2014-12-13 11:42:35 -08:00
mannewalis
e81e9a7f47
fixing some issues, still crashing, but want to keep changes.
2014-12-13 10:40:45 -08:00
Sergey
9a01b76fec
Clang static analyzer crash fix
2014-12-13 12:40:04 +03:00
mannewalis
7b2fea798a
add total count and fix remaining reporting issues
2014-12-12 17:16:44 -08:00
mannewalis
00da483e1b
minor changes
2014-12-12 14:54:24 -08:00
mannewalis
595b3c1cd2
some minor tweaks comments and logging
2014-12-12 10:54:59 -08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
youyou
579bb3f8d8
fixed frame event
2014-12-12 18:02:03 +08:00
minggo
cf8b6120a0
Merge pull request #9481 from super626/v3
...
CullFace state change bug and fix #9465
2014-12-12 15:48:31 +08:00
XiaoYang
b106b2f7ce
Merge pull request #175 from lvlonggame/v3
...
fix bug: same model in mirror state cullFace problem.
2014-12-12 09:52:01 +07:00
minggo
7acb8bfddf
Merge pull request #9477 from pipu/update_serialize_plist_file_name
...
Update that serialize plist file name and load plist file
2014-12-12 10:13:18 +08:00
pipu
accf66c49f
Update that serialize plist file name
2014-12-11 19:15:04 +08:00
minggo
93561fcb8e
[ci skip]update version
2014-12-11 18:14:28 +08:00
minggo
07c9251557
Merge pull request #9462 from edwardzhou/fix_UIText_clone_missing_contentSize
...
Fix UIText miss copy contentSize for clone
2014-12-11 17:55:32 +08:00
minggo
f0f393654e
Merge pull request #9459 from pipu/fix_#9457
...
Fixes #9457
2014-12-11 15:12:48 +08:00
minggo
d7c722c67f
Merge pull request #9455 from samuele3hu/v3_cocostudio
...
Add Websocket support for Mac platform
2014-12-11 15:12:10 +08:00
lvlong
d0ce99413d
fix bug: same model in mirror state cullFace problem.
2014-12-11 14:24:26 +08:00
Edward Zhou
1ca92411fc
Fix UIText miss copy contentSize for clone
2014-12-11 13:33:28 +08:00
pipu
70b9767c56
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
...
2. Modify default value of selectedState to serialize check box data.
2014-12-11 11:34:31 +08:00
minggo
a1c60bcf24
Merge pull request #9452 from minggo/java-style
...
[ci skip]use java coding style
2014-12-11 10:55:14 +08:00
minggo
48345a0d65
Merge pull request #9441 from pipu/update_reader
...
Update Reader
2014-12-11 10:02:38 +08:00
minggo
7c07bc6a90
Merge pull request #9449 from Dhilan007/v3-keycode
...
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-11 09:58:57 +08:00
samuele3hu
5d3008d6ac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
2014-12-11 09:51:18 +08:00
Sxd
5f47bef320
add stopActionByName()
2014-12-11 02:57:13 +08:00
minggo
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
minggo
0e7470505f
replace tab with 4 spaces
2014-12-10 18:32:58 +08:00
Dhilan007
8b78c181ce
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-10 18:11:07 +08:00
minggo
77ed7a47e2
use java coding style
2014-12-10 18:07:46 +08:00
pipu
d3351a4b11
1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic.
...
2. Update how to parse attribute scale9Enabled
2014-12-10 17:35:39 +08:00
pipu
e81dca372a
Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader
2014-12-10 15:46:58 +08:00
pipu
6b6fe4129d
Update Reader
2014-12-10 12:36:14 +08:00
minggo
33a8c0d49b
Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129
...
[AUTO]: updating luabinding automatically
2014-12-10 11:15:09 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00