pandamicro
|
ddb636a022
|
Add ScriptComponent and ComponentJS
|
2015-09-26 19:43:36 +08:00 |
pandamicro
|
7e2b8c71a7
|
Improve lua script component
|
2015-09-26 19:43:35 +08:00 |
minggo
|
26632ec69a
|
linjia demo finish
|
2015-09-26 19:43:35 +08:00 |
CocosRobot
|
c135587962
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-25 08:43:00 +00:00 |
pandamicro
|
970300c3e2
|
Merge pull request #14012 from jianglong0156/customSpine
add custom spine skeletonAnimation test
|
2015-09-25 16:34:57 +08:00 |
Vincent Yang
|
5c0d6691ca
|
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
|
2015-09-25 14:50:20 +08:00 |
江龙
|
9eb05707fb
|
add custom spine skeletonAnimation test
|
2015-09-25 13:36:48 +08:00 |
pandamicro
|
e16404c280
|
Merge pull request #14008 from thuydx55/fix_android_compile_script_load_pluginx
Fix loading pluginx lib when compile Android with --compile-script flag
|
2015-09-24 14:08:46 +08:00 |
pandamicro
|
95379c5dc2
|
Merge pull request #13995 from xiaofeng11/v3
Fix issue http://punchbox.info:3000/issues/23146
|
2015-09-24 13:03:59 +08:00 |
Nick
|
003920f826
|
fix loading pluginx when compile Android with --compile-script flag
|
2015-09-24 11:41:18 +07:00 |
XiaoFeng
|
6db2cd7b9c
|
Fix issue : http://punchbox.info:3000/issues/23182
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
|
2015-09-23 18:37:12 +08:00 |
XiaoFeng
|
f5c88c32af
|
Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent
|
2015-09-23 10:55:01 +08:00 |
CocosRobot
|
b09b146f97
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-22 09:23:14 +00:00 |
Martin Taylor
|
62e36e8006
|
fix typos and syntax error. A thorough check by tool VSSpellChecker.
|
2015-09-22 16:08:23 +08:00 |
XiaoFeng
|
573f5868ca
|
Fix issue http://punchbox.info:3000/issues/23146
|
2015-09-22 14:52:16 +08:00 |
pandamicro
|
08204ec0bd
|
Merge pull request #13991 from MSOpenTech/v3-win10-fix
V3 Win10 UWP fixes
|
2015-09-22 02:44:45 +08:00 |
pandamicro
|
d3504a9216
|
Update versions and html5 engine
|
2015-09-22 02:31:21 +08:00 |
Dale Stammen
|
6a5db06115
|
added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project
|
2015-09-21 11:11:34 -07:00 |
pandamicro
|
b54a06a55e
|
Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType
Fix crash in destructor of FontFreeType
|
2015-09-22 01:59:34 +08:00 |
pandamicro
|
deacab9222
|
Merge pull request #13990 from MSOpenTech/v3-win10-fix
V3 Win10 UWP fixes
|
2015-09-22 01:57:53 +08:00 |
pandamicro
|
eec67ea13b
|
Merge pull request #13975 from zilongshanren/fixIssue11259
don't change Text's dimension when label scale.
|
2015-09-22 01:49:20 +08:00 |
Dale Stammen
|
70e157a44a
|
removed CCComponentPhysics2d from Win10 UWP project
|
2015-09-21 10:44:30 -07:00 |
pandamicro
|
7fcea1ccaf
|
Merge pull request #13976 from lsybblll/lsybblll-patch-1
Update CCPhysics3DComponent.cpp
|
2015-09-22 01:44:03 +08:00 |
Dale Stammen
|
d5151952bb
|
fixed compiler warning
|
2015-09-21 10:43:28 -07:00 |
dimon4eg
|
09b5b7fcc3
|
Fix crash in destructor of FontFreeType
|
2015-09-21 18:18:58 +03:00 |
CocosRobot
|
9ef7991b99
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-21 10:43:59 +00:00 |
子龙山人
|
f2190c79b9
|
Merge pull request #13835 from neokim/add_jump_to_item_to_listview
Add a feature of jumping to a specific item in list tview
|
2015-09-21 18:36:05 +08:00 |
lsybblll
|
84489d322a
|
Update CCPhysics3DComponent.cpp
there should save old bool.
|
2015-09-21 17:11:45 +08:00 |
zilongshanren
|
fd8cfd8ccb
|
don't change Text's dimension when label scale.
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
|
2015-09-21 17:03:29 +08:00 |
CocosRobot
|
0af77fca90
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-21 08:35:18 +00:00 |
Neo Kim
|
b09a0bd0e3
|
Add a missing parameter in comment for document.
|
2015-09-21 17:07:32 +09:00 |
pandamicro
|
5511d42cd4
|
Merge pull request #13716 from fusijie/particle_performance
Refactory particle system update.
|
2015-09-21 14:19:55 +08:00 |
子龙山人
|
aa6d5e1a04
|
Merge pull request #13961 from zilongshanren/fix-xcode7-override-issue
fix missing override keyword
|
2015-09-21 11:34:43 +08:00 |
pandamicro
|
6ab7f3804e
|
Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile
Add jsb.fileUtils.writeDataToFile()
|
2015-09-21 10:48:25 +08:00 |
zilongshanren
|
511b58a3b2
|
fix missing override keyword
|
2015-09-21 09:51:27 +08:00 |
pandamicro
|
9246d50a7f
|
Merge pull request #13234 from perminovVS/v3-dev-check-create-window
glfwCreateWindow not guarantee create
|
2015-09-20 23:22:47 +08:00 |
pandamicro
|
fa9afd6c2b
|
Merge pull request #13953 from himynameschris/fix-socketio
Fix socketio to work with servers v1.0+
|
2015-09-20 23:15:27 +08:00 |
pandamicro
|
c2214e56af
|
Merge pull request #13954 from geron-cn/v3
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
|
2015-09-20 17:01:41 +08:00 |
fusijie
|
d871b1aa8a
|
Refactory particle system.
|
2015-09-20 16:46:09 +08:00 |
pandamicro
|
44329d96ba
|
Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine
Refine lua/js binding tool
|
2015-09-20 16:42:40 +08:00 |
geron-cn
|
f93cfac0f7
|
rename setAnimationEndCallFunc
|
2015-09-20 16:24:41 +08:00 |
zhangting
|
caaf912a28
|
add writeDataToFile() for jsb
|
2015-09-20 15:38:15 +08:00 |
geron-cn
|
0cfc33e4d3
|
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
|
2015-09-20 12:34:34 +08:00 |
Chris Hannon
|
bd7f90f993
|
adds initializing value and corrects spelling of variable _endpointseparator
Signed-off-by: Chris Hannon <chris@channon.us>
|
2015-09-19 20:47:54 -04:00 |
Chris Hannon
|
e7c2436d85
|
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
Signed-off-by: Chris Hannon <chris@channon.us>
|
2015-09-19 20:31:48 -04:00 |
WenhaiLin
|
b77d04f593
|
Fixed link errors
|
2015-09-19 00:59:28 +08:00 |
CocosRobot
|
c562a57030
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 16:32:43 +00:00 |
pandamicro
|
6bf54a3eda
|
Merge pull request #13770 from geron-cn/v3
add Frame End Call Back and Animation Clip End Call Back
|
2015-09-19 00:24:21 +08:00 |
CocosRobot
|
37cb9afb3f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 14:04:49 +00:00 |
pandamicro
|
0cbc1e5f40
|
Merge pull request #13923 from WenhaiLin/v3-physics-refine
Refine components to improve physics performance
|
2015-09-18 21:56:36 +08:00 |