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 |