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 |