pandamicro
|
3fa016a280
|
Fix win32 project and add winrt support
|
2015-07-30 23:39:52 +08:00 |
pandamicro
|
c0066f9afd
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
|
2015-07-30 20:25:57 +08:00 |
CocosRobot
|
56b58a5839
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:50:00 +00:00 |
pandamicro
|
5aa8647309
|
Merge pull request #13117 from CocosRobot/update_lua_bindings_1438251761
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 18:45:15 +08:00 |
pandamicro
|
8542f8a7a9
|
Merge pull request #13067 from pandamicro/scrollviewbar
Bind UIScrollViewBar
|
2015-07-30 18:42:08 +08:00 |
CocosRobot
|
b167d29a80
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:27:28 +00:00 |
jianglong0156
|
113233b8df
|
add Camera support constructor
|
2015-07-30 18:00:51 +08:00 |
pandamicro
|
507a094653
|
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
improve jsval_to_physics3DRigidBodyDes
|
2015-07-30 17:58:16 +08:00 |
CocosRobot
|
ef7318cf00
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 09:23:06 +00:00 |
jianglong0156
|
0f9483a0e3
|
add SpotLight support constructor
|
2015-07-30 15:21:35 +08:00 |
jianglong0156
|
8d3ceb7ac2
|
add PointLight support constructor
|
2015-07-30 15:11:37 +08:00 |
jianglong0156
|
52ed2e8d4e
|
add conversion function declare, use to the physics3d auto conversion the data
|
2015-07-30 14:56:24 +08:00 |
jianglong0156
|
b16ee0e45d
|
add file in project file with android, linux wp8.1 (reverted from commit 948628b800 )
|
2015-07-30 14:46:10 +08:00 |
jianglong0156
|
73125f46d2
|
add file in project file with android, linux wp8.1 (reverted from commit 948628b800 )
|
2015-07-30 14:38:20 +08:00 |
jianglong0156
|
a1a9e281a3
|
add conversion cpp file into iOS project (reverted from commit 439bc8a99f )
|
2015-07-30 14:37:58 +08:00 |
CocosRobot
|
7a73c65208
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 05:53:20 +00:00 |
CocosRobot
|
f1adc2ffd2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 03:39:17 +00:00 |
CocosRobot
|
bd867311f1
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-29 20:42:46 +00:00 |
Ricardo Quesada
|
642ccac5dc
|
Merge pull request #12927 from ricardoquesada/spine-2.3
Adds support for Spine runtime 2.3
|
2015-07-29 13:33:15 -07:00 |
pandamicro
|
f53ba42b3b
|
Fix test issues and Add audio engine to js templates
|
2015-07-29 21:22:44 +08:00 |
pandamicro
|
9972bfb98c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
|
2015-07-29 21:01:56 +08:00 |
pandamicro
|
da4e062614
|
Add js wrapper for audio engine
|
2015-07-29 20:47:28 +08:00 |
VisualSJ
|
179266240f
|
Update js parser (timelineParser-2.x.js)
|
2015-07-29 19:49:54 +08:00 |
CocosRobot
|
8c642d966f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-29 07:45:19 +00:00 |
pandamicro
|
3089ac302e
|
Refine ui bindings and JS constants
|
2015-07-29 13:06:49 +08:00 |
CocosRobot
|
ac7729332a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 10:39:16 +00:00 |
pandamicro
|
8e883f9956
|
Merge pull request #13049 from jianglong0156/constructedWith3D#12404
Some 3d classes can't be constructed with new in JS
|
2015-07-28 18:31:04 +08:00 |
CocosRobot
|
c8f2514758
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 09:21:06 +00:00 |
jianglong0156
|
f71f9b2b15
|
improve the code
|
2015-07-28 16:32:56 +08:00 |
pandamicro
|
3fa9463ec7
|
Fix manual bindings for changed API in spine
|
2015-07-28 15:11:20 +08:00 |
pandamicro
|
ca54340982
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-07-28 13:00:10 +08:00 |
jianglong0156
|
439bc8a99f
|
add conversion cpp file into iOS project
|
2015-07-28 10:48:18 +08:00 |
jianglong0156
|
948628b800
|
add file in project file with android, linux wp8.1
|
2015-07-28 10:26:45 +08:00 |
jianglong0156
|
ec4d53fcf7
|
add 3d conversion
|
2015-07-28 10:08:58 +08:00 |
jianglong0156
|
d5a6522a37
|
Merge branch 'v3' into constructedWith3D#12404
|
2015-07-28 09:59:35 +08:00 |
jianglong0156
|
6d83a3cea4
|
add Physics3DWorld support new
|
2015-07-27 18:22:56 +08:00 |
jianglong0156
|
cb2b427eed
|
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
|
2015-07-27 18:19:10 +08:00 |
jianglong0156
|
9c6b5730d0
|
add Physics3DPointToPointConstraint support new
|
2015-07-27 16:02:13 +08:00 |
jianglong0156
|
1be5981d6a
|
add Physics3DComponent support new
|
2015-07-27 14:26:50 +08:00 |
jianglong0156
|
4005ef6588
|
add skybox support new
|
2015-07-27 11:19:17 +08:00 |
CocosRobot
|
d9b5ce8d28
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:17:29 +00:00 |
CocosRobot
|
e986aac617
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:14:03 +00:00 |
jianglong0156
|
48147ff08a
|
add the Animate3D and Animation3D js implements
|
2015-07-27 10:53:34 +08:00 |
dualface
|
bd39247192
|
Add Luabinding conversions for std::map<std::string, std::string>
|
2015-07-26 07:40:34 +08:00 |
pandamicro
|
5be905c181
|
Merge pull request #13017 from pandamicro/v3.7.1
[ci skip] Release docs for v3.7.1
|
2015-07-25 15:17:52 +08:00 |
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
pandamicro
|
33007e832f
|
Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 13:40:55 +08:00 |
CocosRobot
|
f7fced7b70
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 05:40:05 +00:00 |
pandamicro
|
fba892f4aa
|
Merge pull request #13002 from VisualSJ/v3.7.1-12940
[ci skip]Issue #12940: Fixed a bug that is removing SimpleAudio play
|
2015-07-25 13:20:27 +08:00 |
pandamicro
|
fa46a0abb4
|
Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-25 09:52:00 +08:00 |
pandamicro
|
a666658764
|
Merge pull request #12998 from pandamicro/v3.7.1
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 23:42:38 +08:00 |
pandamicro
|
05bb775438
|
Sync timelineParser and fix issue
|
2015-07-24 20:16:56 +08:00 |
pandamicro
|
54330576e6
|
Fix JS binding issues for skeleton animation
|
2015-07-24 20:16:01 +08:00 |
VisualSj
|
cf70cb9c40
|
Issue #12940: Fixed a bug that is removing SimpleAudio play
|
2015-07-24 17:41:01 +08:00 |
VisualSj
|
2b05ca731c
|
Issue #12941: Fixed a bug that is ccs.Skin ctor error in jsb
|
2015-07-24 17:34:04 +08:00 |
pandamicro
|
29b9ed685f
|
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 15:48:34 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
Ricardo Quesada
|
2deb492d36
|
compiles and runs on Xcode 7
|
2015-07-23 14:28:23 -07:00 |
pandamicro
|
6110700615
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
|
2015-07-23 15:25:33 +08:00 |
pandamicro
|
739befdc08
|
Add audio engine bindings in JSB
|
2015-07-23 14:43:01 +08:00 |
pandamicro
|
5b8371aaa2
|
Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback
[ci skip] Parse Touch/Click callback in JS Studio parser
|
2015-07-23 09:30:40 +08:00 |
VisualSj
|
d4900493e2
|
JS Studio parser (Modify callback method)
|
2015-07-22 17:56:35 +08:00 |
VisualSj
|
b282d75346
|
Parse Touch/Click callback in JS Studio parser
|
2015-07-22 16:51:44 +08:00 |
VisualSj
|
1496224c6d
|
Add cc.affineTransformConcatIn
|
2015-07-22 15:21:13 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
XiaoFeng
|
fcd7388936
|
Synchronize skybox parser with C++ version
|
2015-07-22 09:45:35 +08:00 |
pandamicro
|
25dff88ff4
|
Merge pull request #12922 from xiaofeng11/v3.7-release
[ci skip]Add Skybox parser to js
|
2015-07-22 09:12:38 +08:00 |
CocosRobot
|
6630157377
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 04:40:43 +00:00 |
pandamicro
|
85d4ce0d5a
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
|
2015-07-21 11:39:24 +08:00 |
CocosRobot
|
0a23e4a305
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-20 07:08:12 +00:00 |
pandamicro
|
65f647ce00
|
Merge pull request #12879 from pandamicro/v3.7-release
[ci skip] Update versions and docs for v3.7
|
2015-07-16 16:55:24 +08:00 |
pandamicro
|
e2068ab84a
|
Update versions and docs for v3.7
|
2015-07-16 16:53:43 +08:00 |
CocosRobot
|
f2567f498c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 08:22:58 +00:00 |
pandamicro
|
b094367c94
|
Merge pull request #12874 from pandamicro/v3.7-release
Remove cleanup from auto bindings add made it support override in JS
|
2015-07-16 16:15:26 +08:00 |
pandamicro
|
949eca2846
|
Improve some manual binding code
|
2015-07-16 14:34:14 +08:00 |
pandamicro
|
490d5a3747
|
Remove cleanup from auto bindings add made it support override in JS
|
2015-07-16 14:09:26 +08:00 |
CocosRobot
|
8442fe5f89
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 06:04:17 +00:00 |
pandamicro
|
0b1d105803
|
Merge pull request #12870 from VisualSJ/v3.7-release-parser
[ci skip] Fixed parser's bug
|
2015-07-16 13:04:06 +08:00 |
VisualSj
|
0bb385f37c
|
Check texture for existence
|
2015-07-16 11:54:45 +08:00 |
VisualSj
|
ef70e1f996
|
Fixed a bug that is Armature parser
|
2015-07-16 10:30:22 +08:00 |
CocosRobot
|
be71b6d563
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-15 08:23:23 +00:00 |
pandamicro
|
436564f922
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
docs/RELEASE_NOTES.md
web
|
2015-07-15 14:39:40 +08:00 |
CocosRobot
|
4b418fe823
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-15 05:46:42 +00:00 |
pandamicro
|
c126aac35f
|
v3.7 rc1 release doc
|
2015-07-14 23:21:34 +08:00 |
pandamicro
|
eb56ad6d60
|
Merge pull request #12836 from pandamicro/v3.7-release
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 17:37:00 +08:00 |
pandamicro
|
a90a8b12c6
|
Merge pull request #12840 from pandamicro/path
[ci skip] Add cc.path.mainFileName
|
2015-07-14 16:41:16 +08:00 |
子龙山人
|
7e4e82da2c
|
Merge pull request #12835 from zilongshanren/improve-coding-style
add more descriptive message to ASSET macro.
|
2015-07-14 16:36:59 +08:00 |
pandamicro
|
41778f35fb
|
Add cc.path.mainFileName
|
2015-07-14 16:33:38 +08:00 |
pandamicro
|
658fe74141
|
Merge pull request #12838 from VisualSJ/v3.7-release-parser
[ci skip] Remove getRes (parser)
|
2015-07-14 16:20:42 +08:00 |
pandamicro
|
efffea5b91
|
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 15:35:29 +08:00 |
andyque
|
91dfb07a8c
|
add more descriptive message to ASSET macro.
|
2015-07-14 15:28:36 +08:00 |
VisualSj
|
a9deb6dda5
|
Remove getRes (parser)
|
2015-07-14 15:26:13 +08:00 |
pandamicro
|
09775d6f2a
|
Ensure backward compatibility
|
2015-07-14 14:14:36 +08:00 |
CocosRobot
|
6b9a5b8264
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-14 05:41:48 +00:00 |
pandamicro
|
43a5b6f020
|
Fix jsb loaders issues
|
2015-07-14 13:40:09 +08:00 |
子龙山人
|
e1ae3631fc
|
Merge pull request #12818 from zilongshanren/v3
merge v3.7 back to v3
|
2015-07-14 13:32:56 +08:00 |
andyque
|
ef5d4ddf86
|
Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-07-14 11:24:38 +08:00 |
Vincent Yang
|
0a6933cc8c
|
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
|
2015-07-14 10:46:17 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
CocosRobot
|
9e60713322
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 14:41:58 +00:00 |
CocosRobot
|
300da3e3fc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 12:57:03 +00:00 |
CocosRobot
|
8b50c307e5
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 09:35:35 +00:00 |
XiaoFeng
|
a68835733f
|
Add Skybox parser to js
|
2015-07-13 16:02:19 +08:00 |
CocosRobot
|
0e8a3f14f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-10 09:11:50 +00:00 |
pandamicro
|
69cdaca306
|
Auto add extend to jsb need to extend classes
|
2015-07-10 09:49:39 +08:00 |
CocosRobot
|
2065e5b4a7
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 07:45:43 +00:00 |
VisualSj
|
9f52b1e6fb
|
Fixed a bug that is SingleNode setColor is null
|
2015-07-09 11:49:11 +08:00 |
CocosRobot
|
bfe6db174e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 01:07:59 +00:00 |
CocosRobot
|
9638ae628a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-08 05:48:55 +00:00 |
pandamicro
|
8f0cf8c3e6
|
Merge pull request #12575 from ywxzm/v3
fix onTouch begin don't return value
|
2015-07-07 14:57:13 +08:00 |
pandamicro
|
e717155930
|
Merge pull request #12715 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 14:13:31 +08:00 |
CocosRobot
|
4a486077c0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 06:05:39 +00:00 |
pandamicro
|
5970f56e1f
|
Merge pull request #12714 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:55:12 +08:00 |
VisualSj
|
dd0edac171
|
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:36:47 +08:00 |
andyque
|
6238ddebf3
|
Merge remote-tracking branch 'upstream/v3.7-release' into v3
|
2015-07-07 10:18:43 +08:00 |
CocosRobot
|
4c88db3fb2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 00:44:47 +00:00 |
CocosRobot
|
a4bce56cca
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 10:37:24 +00:00 |
VisualSj
|
3b69a1726f
|
Fixed a bug that action texture address error
|
2015-07-06 17:17:20 +08:00 |
CocosRobot
|
ae860bd6ee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 08:29:03 +00:00 |
CocosRobot
|
fbf98adc7a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 14:48:11 +00:00 |
CocosRobot
|
91dc2d22de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 10:37:33 +00:00 |
pandamicro
|
1f48beee1e
|
Reorganize code
|
2015-07-03 12:55:55 +08:00 |
pandamicro
|
155b9b918c
|
Add retain/release for XMLHTTPReqest in JSB
|
2015-07-03 11:01:43 +08:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
pandamicro
|
dbd72d0123
|
Merge pull request #12646 from VisualSJ/v3.7-release
[ci skip] Fixed a bug that is don't analytical frame
|
2015-07-02 17:22:13 +08:00 |
Sijie.Wang
|
7818bfcc7a
|
Fixed a bug that is don't analytical frame
|
2015-07-02 14:30:44 +08:00 |
pandamicro
|
079ccbb0e2
|
Merge pull request #12639 from VisualSJ/v3.7-release
Fixed a bug that is LayoutComponent position error
|
2015-07-02 13:58:15 +08:00 |
VisualSJ
|
a475caf35a
|
Fixed a bug that is LayoutComponent position error
|
2015-07-02 11:52:31 +08:00 |
CocosRobot
|
bf3c970534
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-01 14:12:18 +00:00 |
pandamicro
|
3b9fd5502e
|
Fix cc.isArray for JSB
|
2015-07-01 21:57:39 +08:00 |
zhang
|
48c3466774
|
Update LayerEx.lua
|
2015-07-01 20:25:45 +08:00 |
pandamicro
|
4d95c8778b
|
Merge pull request #12598 from shinhirota/v3
Fixed iOS/JS-Bind callStaticMethod() with bool arg
|
2015-07-01 11:34:03 +08:00 |
Bin Zhang
|
d0db3aee98
|
Remove the plugin-x related files from the Xcode project of js-bindings .
|
2015-06-30 17:28:47 +08:00 |
子龙山人
|
077241eecf
|
Merge pull request #12599 from jianglong0156/jsbProjectMerge
merge the jsb project into cocos2d project
|
2015-06-30 17:04:12 +08:00 |
Bin Zhang
|
bb77101f0b
|
Solve the error when building simulator for android.
|
2015-06-30 16:45:13 +08:00 |
jianglong0156
|
185b4419be
|
merge job project into cocos2d-x project
|
2015-06-30 13:49:24 +08:00 |
Shin Hirota
|
221d33a431
|
Fixed iOS/JS-Bind callStaticMethod() with bool arg
|
2015-06-30 14:00:28 +09:00 |
子龙山人
|
29cccf631e
|
Merge pull request #12550 from kompjoefriek/v3-vibrate
Vibrate support in v3
|
2015-06-30 10:28:59 +08:00 |
Dale Stammen
|
38b687f8d8
|
enable support for keyboard on winrt platforms to fix back button
|
2015-06-29 09:13:19 -07:00 |
pandamicro
|
15c763d84a
|
Update engine version
|
2015-06-29 18:21:06 +08:00 |
zhang
|
43ea04da3c
|
fix onTouch begin don't return value
fix only receive "begin" envent,can't receive "moved" "ended"
|
2015-06-28 13:18:33 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
jianglong0156
|
11ac928f59
|
winrt use touch event replace mouse event
|
2015-06-25 17:44:03 +08:00 |
jianglong0156
|
c60e9dfc9e
|
winrt not suppot mouse
|
2015-06-25 17:25:27 +08:00 |
pandamicro
|
04af5dfbe3
|
#12494 Upgrade platform constants for WP8 & WINRT
|
2015-06-23 23:23:25 +08:00 |
江龙
|
7ff383e4d2
|
add the return value
|
2015-06-23 20:27:30 +08:00 |
pandamicro
|
ac138a3287
|
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
|
2015-06-23 16:27:32 +08:00 |
XiaoFeng
|
befe97a78b
|
Update js parser for compatible with CocosStudio 2.3.2 json format export
|
2015-06-23 16:24:53 +08:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +08:00 |
pandamicro
|
7b1694bfeb
|
Merge pull request #12443 from VisualSJ/v3-aa
[ci skip]Studio parser: Code for defense
|
2015-06-19 14:24:39 +08:00 |
VisualSJ
|
8fa755d0e4
|
Studio parser: Code for defense
|
2015-06-19 13:15:10 +08:00 |
VisualSJ
|
ea0ab5c738
|
Studio parser: Code for defense
|
2015-06-19 11:13:07 +08:00 |
pandamicro
|
8e9fed936c
|
Add auto bindings
|
2015-06-19 10:36:36 +08:00 |
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +08:00 |
pandamicro
|
c6d4f283bb
|
Fix compilation issue in navmesh conversion
|
2015-06-19 08:11:45 +08:00 |
pandamicro
|
f405d00336
|
Fix linux compilation
|
2015-06-19 01:14:16 +08:00 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +08:00 |
江龙
|
8fc5835dee
|
modify linux file
|
2015-06-18 23:29:04 +08:00 |
江龙
|
61db9ef103
|
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
|
2015-06-18 23:21:53 +08:00 |
江龙
|
8c97fec5af
|
add navmesh project file path
|
2015-06-18 23:17:49 +08:00 |
jianglong0156
|
618d8f01e8
|
Merge pull request #9 from pandamicro/navmesh
Improve bindings for navmesh
|
2015-06-18 23:15:05 +08:00 |
pandamicro
|
b757837239
|
Move NavMesh to jsb namespace
|
2015-06-18 22:57:41 +08:00 |
jianglong0156
|
56382aae37
|
winphone project
|
2015-06-18 22:50:24 +08:00 |
CocosRobot
|
ea2ec582f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 14:05:05 +00:00 |
CocosRobot
|
e2268bb16f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 22:00:57 +08:00 |
CocosRobot
|
c069da629e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 22:00:56 +08:00 |
pandamicro
|
e09ba8080f
|
Fix create Sprite with PolygonInfo issue
|
2015-06-18 21:48:57 +08:00 |
jianglong0156
|
05c40b13f9
|
fix the win32 head error
|
2015-06-18 21:30:30 +08:00 |
pandamicro
|
10a8adad53
|
Change physics3d api to jsb namespace
|
2015-06-18 20:39:40 +08:00 |
jianglong0156
|
e0b66707f9
|
add nerviest android file
|
2015-06-18 19:30:05 +08:00 |
jianglong0156
|
4fe1542d17
|
add navmesh tests
|
2015-06-18 19:22:27 +08:00 |
CocosRobot
|
6e849a158d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 08:18:00 +00:00 |
pandamicro
|
aa566a3722
|
Merge pull request #12424 from pandamicro/physics3d
Fix Physics3D test and js bindings
|
2015-06-18 16:09:49 +08:00 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
CocosRobot
|
b76db94725
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 05:43:02 +00:00 |
pandamicro
|
7952477469
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
|
2015-06-18 12:05:01 +08:00 |
pandamicro
|
3ffc0e6be6
|
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
|
2015-06-18 09:20:37 +08:00 |
pandamicro
|
a94b49bdef
|
Add nav mesh bindings
|
2015-06-17 23:41:12 +08:00 |
pandamicro
|
85e8a407b1
|
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
|
2015-06-17 19:58:24 +08:00 |
samuele3hu
|
683812d817
|
Update Physics3D test for js.
|
2015-06-17 18:50:55 +08:00 |
jianglong0156
|
b265033a41
|
add testcase and manual bindings
|
2015-06-17 18:38:18 +08:00 |
jianglong0156
|
897b5fd0e9
|
add navmesh test project file and binding file
|
2015-06-17 18:37:19 +08:00 |
CocosRobot
|
22f04da582
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 07:18:18 +00:00 |
CocosRobot
|
55c7de75e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 06:48:41 +00:00 |
Jacky
|
3c5ab4f518
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-17 13:04:24 +08:00 |
CocosRobot
|
6bed988354
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 03:47:36 +00:00 |
pandamicro
|
e4d5db30eb
|
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
|
2015-06-16 15:09:06 +08:00 |
samuele3hu
|
a547d6aa33
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
Conflicts:
tools/bindings-generator
|
2015-06-16 11:36:11 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
Hao Wu
|
b4ca8c1489
|
Merge pull request #15 from pandamicro/spritepolygon
Add SpritePolygon JSB bindingsJSB bindings
|
2015-06-15 15:47:02 +08:00 |
CocosRobot
|
8ec924c206
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-15 05:46:51 +00:00 |
pandamicro
|
852b9b42b9
|
Remove jsb_cocos2dx_experimental_manual
|
2015-06-15 10:46:57 +08:00 |
pandamicro
|
032f231ed4
|
Add bindings for AutoPolygon and PolygonInfo
|
2015-06-13 11:14:57 +08:00 |
CocosRobot
|
60d68ab4de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-12 13:27:20 +00:00 |
pandamicro
|
f9057b3f32
|
Merge pull request #12284 from pandamicro/v3
Fix template android compilation issue on physics3d
|
2015-06-12 21:10:40 +08:00 |
Jacky
|
29c108bdef
|
Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-12 16:28:41 +08:00 |
pandamicro
|
e9d648f151
|
Fix physics 3d macro include issue
|
2015-06-12 15:41:46 +08:00 |
pandamicro
|
df1219c92d
|
Update manual conversion for sprite polygon
|
2015-06-12 12:56:37 +08:00 |
pandamicro
|
9acc51a5eb
|
Merge pull request #12301 from jianglong0156/webviewCrash
fix webview crash in android
|
2015-06-12 08:12:14 +08:00 |
pandamicro
|
12de53726d
|
Merge pull request #12182 from VisualSJ/v3-jsb
[ci skip] Synchronization studio parser
|
2015-06-11 17:35:15 +08:00 |
jianglong0156
|
c317eb428a
|
fix webview crash in android
|
2015-06-11 17:28:02 +08:00 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
CocosRobot
|
94a47fabcf
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-11 06:16:36 +00:00 |
VisualSJ
|
2d12d6a295
|
Plist file parsing (action-2.x.js)
|
2015-06-11 11:14:10 +08:00 |
lijinlong
|
370845a738
|
luabinding enumerateChildren bug
第一次调用enumerateChildren的回调时将lua handler释放了,下次再进入回调时报错,将handler释放提到enumerateChildren调用完成后
|
2015-06-10 17:15:01 +08:00 |
VisualSJ
|
3306c7b072
|
Fixed control LayoutComponent positioning bug
|
2015-06-08 15:41:33 +08:00 |
CocosRobot
|
4fc0366e4d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-08 06:21:14 +00:00 |
VisualSJ
|
060ab85f22
|
Fixed UIText color settings bug
|
2015-06-08 13:58:08 +08:00 |
CocosRobot
|
835e56e80a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 23:13:03 +00:00 |
CocosRobot
|
9178eeca73
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 08:11:21 +00:00 |
CocosRobot
|
9e3fa92803
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 01:51:34 +00: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 |
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 |
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 |
pandamicro
|
2c168130ed
|
Fix jsbinding calls for CCComponent
|
2015-06-04 15:59:05 +08:00 |
pandamicro
|
83f7f30c1c
|
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 15:03:20 +08:00 |
pandamicro
|
9c23126d9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 13:14:34 +08:00 |
CocosRobot
|
76b151c281
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-03 20:25:32 +00:00 |
samuele3hu
|
0cccd6e765
|
Fix compile error on the Linux and update the test cases
|
2015-06-03 18:12:21 +08:00 |
samuele3hu
|
a20681aa21
|
Add Lua-bindings for NavMesh
|
2015-06-02 18:37:57 +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 |
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 |
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 |
江龙
|
a8b640f751
|
add videoplayer project
|
2015-06-02 09:04:15 +08:00 |
CocosRobot
|
3a1b52cafd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 06:31:00 +00:00 |
CocosRobot
|
892816de3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 05:46:22 +00: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 |
jianglong0156
|
9a62d06091
|
add video player test and auto bindings
|
2015-05-28 18:10:07 +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 |
jianglong0156
|
1dbaa5bb11
|
fix error log output
|
2015-05-28 11:56:07 +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 |
jianglong0156
|
c0b42fdfec
|
modify addEventListener to setEventListener
|
2015-05-28 10:12:58 +08: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 |
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 |
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 |
子龙山人
|
b8fd5ba290
|
Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 16:59:50 +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 |
CocosRobot
|
3851e8356e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 08:00:53 +00: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 |
CocosRobot
|
824456b073
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 21:56:01 +00: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 |
CocosRobot
|
7fa68d9b3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-25 08:37:59 +00: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 |
andyque
|
81070a5299
|
fix lua project compile error
|
2015-05-25 13:42:54 +08:00 |
andyque
|
81d562803b
|
upgrade rapidjson to 1.0.2
|
2015-05-25 11:43:03 +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 |
CocosRobot
|
f18b8bfd95
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 06:55:54 +00:00 |
minggo
|
698428e0a1
|
Merge pull request #11971 from joshuastray/physics
Physics3d js binding
|
2015-05-22 14:42:34 +08:00 |
joshuastray
|
b1169c7d56
|
win32 and universal compile
|
2015-05-22 11:58:28 +08:00 |
joshuastray
|
1366f615dd
|
mac && ios works
|
2015-05-22 10:43:37 +08:00 |
CocosRobot
|
59807629d9
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 02:04:38 +00:00 |
joshuastray
|
342734e3b5
|
Merge remote-tracking branch 'upstream/v3' into physics
|
2015-05-21 21:15:42 +08:00 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +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
|
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 |
Dale Stammen
|
3523173594
|
removed CC_PLATFORM_WP8
|
2015-05-20 07:58:39 -07: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 |
CocosRobot
|
61aad4581a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-19 23:02:24 +00: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 |
samuele3hu
|
349f9bde11
|
Fix the compile error in the release mode
|
2015-05-18 17:43:20 +08:00 |
CocosRobot
|
3e08ec4c11
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 07:04:27 +00:00 |
CocosRobot
|
9572de26d4
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 05:43:08 +00: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 |
unknown
|
91432f0ddf
|
fixed include paths for arm builds
|
2015-05-15 15:35:36 -07:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +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 |
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 |
minggo
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +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 |
CocosRobot
|
006f9fcd36
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-14 02:30:32 +00:00 |
CocosRobot
|
6bf984f3d3
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 08:11:34 +00:00 |
minggo
|
5e87bd307b
|
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
Add support for visual studio 2015.
|
2015-05-13 09:37:12 +08:00 |
pandamicro
|
3190d0e5fb
|
Add localStorage.clear test case
|
2015-05-12 19:02:22 +08:00 |
pandamicro
|
c7f3c2fa8b
|
Fix Scale9Sprite's inheritance issue triggered by its constructor
|
2015-05-12 18:04:01 +08:00 |
pandamicro
|
ef0854545b
|
Fix cc.EventMouse constants issue
|
2015-05-12 18:02:36 +08:00 |
pandamicro
|
c9ee849a2c
|
Add localStorage.clear in JSB
|
2015-05-12 18:02:14 +08:00 |
WenhaiLin
|
e53a977439
|
Add support for visual studio 2015.
|
2015-05-12 16:46:09 +08:00 |
CocosRobot
|
dbb51e2367
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 05:59:42 +00:00 |
minggo
|
cdfce7fcae
|
Merge pull request #11791 from CocosRobot/update_lua_bindings_1431407875
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 13:51:32 +08:00 |
minggo
|
398d36b58a
|
Merge pull request #11788 from joshuastray/spritepolygon
SpritePolygon binding and tests for js
|
2015-05-12 13:46:22 +08:00 |
CocosRobot
|
a7fb56de69
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 05:23:45 +00:00 |
joshuastray
|
7a4ca3fe6a
|
add new files to project
|
2015-05-12 10:40:51 +08:00 |
jianglong0156
|
80326aa40e
|
add webiew jsb code
|
2015-05-12 10:30:51 +08:00 |
joshuastray
|
234f4db8a0
|
add SpritePolygon binding && js tests
|
2015-05-11 17:04:23 +08:00 |
CocosRobot
|
e325a3b746
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-11 08:33:55 +00:00 |
CocosRobot
|
b5e9986d17
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-11 02:00:41 +00:00 |
minggo
|
bf93289718
|
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
Remove vs2012 support in v3
|
2015-05-08 14:11:13 +08:00 |
minggo
|
14cebf7150
|
Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 10:42:31 +08:00 |
minggo
|
d587ffd5c0
|
Merge pull request #11736 from samuele3hu/v3_7_js
issue 10411:Bug in Physics manual Lua binding
|
2015-05-08 10:04:55 +08:00 |
CocosRobot
|
4195c4b250
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 02:03:02 +00:00 |
minggo
|
09ddf15b9f
|
Merge pull request #11740 from joshuastray/fix-debu
fix jsb debugger bug
|
2015-05-08 09:29:40 +08:00 |
Jialong Zhai
|
be923b5901
|
fix jsb debugger bug
|
2015-05-07 18:24:30 +08:00 |
samuele3hu
|
23e4e0d4e3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-07 16:21:03 +08:00 |
samuele3hu
|
0d53065476
|
issue 10411:Bug in Physics manual Lua binding
|
2015-05-07 16:15:24 +08:00 |
andyque
|
db95034798
|
fix android compile error
|
2015-05-07 10:37:19 +08:00 |
samuele3hu
|
cc4fe9b746
|
Modify the configuration about js-tests.
|
2015-05-06 10:52:23 +08:00 |
CocosRobot
|
8470ab606b
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-06 01:07:26 +00:00 |
samuele3hu
|
f1b5729183
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-05 16:14:57 +08:00 |
samuele3hu
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +08:00 |
CocosRobot
|
534868368e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-05 05:48:55 +00:00 |
CocosRobot
|
6ef35d48ae
|
[AUTO]: updating luabinding automatically
|
2015-05-05 03:31:53 +00:00 |
minggo
|
5a7cf31663
|
Merge pull request #11682 from CocosRobot/update_lua_bindings_1430789665
[AUTO]: updating luabinding automatically
|
2015-05-05 11:17:06 +08:00 |
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |
CocosRobot
|
4414536612
|
[AUTO]: updating luabinding automatically
|
2015-05-05 01:36:54 +00:00 |
CocosRobot
|
2b916b3b80
|
[AUTO]: updating luabinding automatically
|
2015-04-30 06:56:36 +00:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
CocosRobot
|
1f02af4a94
|
[AUTO]: updating luabinding automatically
|
2015-04-28 12:21:56 +00:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
samuele3hu
|
c801d1868c
|
Update Sprite3DTest and VideoPlayerTest about Lua
|
2015-04-28 11:27:50 +08:00 |
CocosRobot
|
a7edda72f5
|
[AUTO]: updating luabinding automatically
|
2015-04-27 09:47:08 +00:00 |
CocosRobot
|
09a6cc19b7
|
[AUTO]: updating luabinding automatically
|
2015-04-27 07:48:42 +00:00 |
CocosRobot
|
09cddb4d4b
|
[AUTO]: updating luabinding automatically
|
2015-04-27 02:25:05 +00:00 |
minggo
|
c500d6b0a7
|
Merge pull request #11588 from WenhaiLin/v3-jsb
[js-tests]Fixed crash.
|
2015-04-27 10:20:07 +08:00 |
Danut Chereches
|
5f692962b9
|
fixed 'seperate' typo
issue #8408
|
2015-04-25 00:02:39 +03:00 |
WenhaiLin
|
5e5cd5faa1
|
[js-tests]Fixed crash on Win32/Universal.
|
2015-04-24 17:12:46 +08:00 |
zhangbin
|
61cf0ad28b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
|
2015-04-23 15:46:19 +08:00 |
zhangbin
|
dcca32bd82
|
Update the CMakeLists & the remote url of submodule js-bindings.
|
2015-04-23 14:23:19 +08:00 |
CocosRobot
|
30ccbe3526
|
[AUTO]: updating luabinding automatically
|
2015-04-21 10:29:17 +00:00 |
zhangbin
|
8abd2269bd
|
Update js bindings.
|
2015-04-21 11:46:00 +08:00 |
zhangbin
|
6ee624796a
|
Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb
|
2015-04-20 18:09:57 +08:00 |
zhangbin
|
a1b5fa5a8e
|
Solve the error in js template.
|
2015-04-20 18:09:39 +08:00 |
CocosRobot
|
87e29db218
|
[AUTO]: updating luabinding automatically
|
2015-04-20 05:40:58 +00:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
samuele3hu
|
4f22a1470b
|
Update the project setting
|
2015-04-20 10:11:39 +08:00 |
WenhaiLin
|
dc768dbd8c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
|
2015-04-20 10:06:48 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
minggo
|
e133f81226
|
Merge pull request #11482 from samuele3hu/v3_remove_useless
[ci skip]Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B
|
2015-04-17 17:54:53 +08:00 |
minggo
|
768d2bdb48
|
Merge pull request #11481 from andyque/remove-all-lz-in-android
remove system zlib dependency since we use our own prebuilt version
|
2015-04-17 17:49:14 +08:00 |
samuele3hu
|
9aadc2a993
|
Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B,
|
2015-04-17 17:40:28 +08:00 |
zhangbin
|
e5672b6e1f
|
Update js bindings.
|
2015-04-17 17:27:47 +08:00 |
andyque
|
d3a06de6d6
|
remove system zlib dependency since we use our own prebuilt version of
zlib now.
|
2015-04-17 17:24:33 +08:00 |
samuele3hu
|
b300701ec4
|
Remove the reference of quick module
|
2015-04-17 15:52:45 +08:00 |
zhangbin
|
b8b49a387e
|
Update the js template.
|
2015-04-17 14:59:12 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
zhangbin
|
1f491cf656
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
Conflicts:
build/cocos2d-wp8.sln
|
2015-04-16 17:04:07 +08:00 |
CocosRobot
|
f1bd23aa32
|
[AUTO]: updating luabinding automatically
|
2015-04-16 02:19:38 +00:00 |
zhangbin
|
3641451c47
|
Update the submodule js-bindings & update solution files for js-bindings.
|
2015-04-15 13:58:41 +08:00 |
CocosRobot
|
66fcba02b1
|
[AUTO]: updating luabinding automatically
|
2015-04-14 09:10:16 +00:00 |
CocosRobot
|
0e4a209241
|
[AUTO]: updating luabinding automatically
|
2015-04-14 08:44:30 +00:00 |
zhangbin
|
8c2413aa54
|
Add submodule js-bindings & html5.
|
2015-04-14 15:20:46 +08:00 |
CocosRobot
|
a0a6b9cda4
|
[AUTO]: updating luabinding automatically
|
2015-04-14 02:12:05 +00:00 |
minggo
|
bc34554bd9
|
Merge pull request #11407 from samuele3hu/v3_studio2
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 18:22:18 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
CocosRobot
|
698a75e17f
|
[AUTO]: updating luabinding automatically
|
2015-04-13 05:44:29 +00:00 |
CocosRobot
|
bd3b978c89
|
[AUTO]: updating luabinding automatically
|
2015-04-10 10:18:33 +00:00 |
CocosRobot
|
15f22d936f
|
[AUTO]: updating luabinding automatically
|
2015-04-10 07:27:51 +00:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
CocosRobot
|
22da4c4832
|
[AUTO]: updating luabinding automatically
|
2015-04-09 03:50:13 +00:00 |
tangziwen
|
176532eef4
|
update Terrain Lua binding
|
2015-04-09 10:01:40 +08:00 |
CocosRobot
|
58ca1b7911
|
[AUTO]: updating luabinding automatically
|
2015-04-08 03:52:03 +00:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
CocosRobot
|
4bcf6b7b67
|
[AUTO]: updating luabinding automatically
|
2015-04-08 02:04:07 +00:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
minggo
|
50fa15c0cd
|
Merge pull request #11301 from samuele3hu/v3_lua_jit
Add luajit support for iOS 64bit devices and related test cases
|
2015-04-07 18:17:09 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
CocosRobot
|
e20a747138
|
[AUTO]: updating luabinding automatically
|
2015-04-03 07:53:06 +00:00 |
samuele3hu
|
826fe4cf31
|
Update the Xcode project setting for luajit
|
2015-04-02 10:07:31 +08:00 |
CocosRobot
|
dfc2390659
|
[AUTO]: updating luabinding automatically
|
2015-04-02 01:51:14 +00:00 |
CocosRobot
|
17a80b0c54
|
[AUTO]: updating luabinding automatically
|
2015-04-01 02:59:47 +00:00 |
CocosRobot
|
46f32142c7
|
[AUTO]: updating luabinding automatically
|
2015-03-31 10:26:49 +00:00 |
CocosRobot
|
00792e98a3
|
[AUTO]: updating luabinding automatically
|
2015-03-31 04:01:57 +00:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
samuele3hu
|
f54512a618
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment
|
2015-03-27 15:59:05 +08:00 |
samuele3hu
|
bb225d052e
|
Update comments of some header files
|
2015-03-27 15:27:08 +08:00 |
CocosRobot
|
4785e6e383
|
[AUTO]: updating luabinding automatically
|
2015-03-27 05:46:01 +00:00 |
minggo
|
8691602b81
|
Merge pull request #11185 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-27 11:35:11 +08:00 |
samuele3hu
|
a1b054911c
|
Update comments of some header files
|
2015-03-27 11:13:28 +08:00 |
CocosRobot
|
c73602a523
|
[AUTO]: updating luabinding automatically
|
2015-03-27 02:26:35 +00:00 |
CocosRobot
|
a4e633a299
|
[AUTO]: updating luabinding automatically
|
2015-03-26 16:17:35 +00:00 |
samuele3hu
|
e0bde0f789
|
Update comments of some header files
|
2015-03-26 22:07:44 +08:00 |
CocosRobot
|
f43b666929
|
[AUTO]: updating luabinding automatically
|
2015-03-26 02:44:28 +00:00 |
minggo
|
f9589d166d
|
Merge pull request #11161 from samuele3hu/v3_5_comment
Update comments of some header files
|
2015-03-26 10:37:41 +08:00 |
minggo
|
fae951d928
|
Merge pull request #11150 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
|
2015-03-26 10:00:11 +08:00 |
samuele3hu
|
1bea6a52a2
|
Update comments of some header files
|
2015-03-25 18:54:33 +08:00 |
yinjimmy
|
75a7927bad
|
Load all lua module as default
|
2015-03-25 16:35:11 +08:00 |
CocosRobot
|
1ced296b58
|
[AUTO]: updating luabinding automatically
|
2015-03-25 03:59:57 +00:00 |
minggo
|
1f4d7c598f
|
Merge pull request #11126 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
|
2015-03-25 09:53:28 +08:00 |
samuele3hu
|
f3890d3bb3
|
Update comments of some header files
|
2015-03-24 21:52:56 +08:00 |
samuele3hu
|
020b3ba5cb
|
Update comments of some header files
|
2015-03-24 21:46:18 +08:00 |
CocosRobot
|
08919a1445
|
[AUTO]: updating luabinding automatically
|
2015-03-24 08:35:26 +00:00 |
CocosRobot
|
9d886cc5f2
|
[AUTO]: updating luabinding automatically
|
2015-03-24 03:25:31 +00:00 |
minggo
|
73a3051417
|
Merge pull request #11087 from CocosRobot/update_lua_bindings_1427121273
[AUTO]: updating luabinding automatically
|
2015-03-24 09:49:54 +08:00 |
CocosRobot
|
0fb2aeb2b2
|
[AUTO]: updating luabinding automatically
|
2015-03-23 14:37:03 +00:00 |
CocosRobot
|
9f17ed6bed
|
[AUTO]: updating luabinding automatically
|
2015-03-23 08:32:54 +00:00 |
CocosRobot
|
ef631d743c
|
[AUTO]: updating luabinding automatically
|
2015-03-23 03:20:47 +00:00 |
CocosRobot
|
fd7ac235ce
|
[AUTO]: updating luabinding automatically
|
2015-03-21 04:55:48 +00:00 |
samuele3hu
|
865aa886a9
|
Update comments of some header files
|
2015-03-20 14:39:33 +08:00 |
CocosRobot
|
7ea110134c
|
[AUTO]: updating luabinding automatically
|
2015-03-20 04:53:00 +00:00 |
CocosRobot
|
7da412a4e1
|
[AUTO]: updating luabinding automatically
|
2015-03-19 14:17:17 +00:00 |
CocosRobot
|
21e46efb00
|
[AUTO]: updating luabinding automatically
|
2015-03-19 12:30:15 +00:00 |
minggo
|
8075cc1602
|
Merge pull request #10986 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-19 20:01:43 +08:00 |
minggo
|
5601eed02f
|
Merge pull request #10987 from samuele3hu/v3_5_f_bug
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
|
2015-03-19 19:59:28 +08:00 |
samuele3hu
|
5a5acc624a
|
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
|
2015-03-19 17:31:57 +08:00 |
samuele3hu
|
31b34ddf77
|
Update comments of some header files
|
2015-03-19 16:45:53 +08:00 |
CocosRobot
|
0afd385412
|
[AUTO]: updating luabinding automatically
|
2015-03-19 08:29:09 +00:00 |
CocosRobot
|
f2c49b3311
|
[AUTO]: updating luabinding automatically
|
2015-03-19 03:55:42 +00:00 |
CocosRobot
|
b7881eab88
|
[AUTO]: updating luabinding automatically
|
2015-03-18 14:02:42 +00:00 |
CocosRobot
|
9df3f57e0d
|
[AUTO]: updating luabinding automatically
|
2015-03-17 06:28:14 +00:00 |
minggo
|
f7d5a16734
|
Merge pull request #10873 from konopka/fix_compiler_override_warnings
Fix compiler override warnings
|
2015-03-17 10:38:19 +08:00 |
CocosRobot
|
a3ddd92307
|
[AUTO]: updating luabinding automatically
|
2015-03-16 07:11:12 +00:00 |
CocosRobot
|
7a4e727ee2
|
[AUTO]: updating luabinding automatically
|
2015-03-16 06:53:18 +00:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Nite Luo
|
cfa1f0c84f
|
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
|
2015-03-13 21:12:35 -07:00 |
SunLightJuly
|
6871e30b8d
|
define __G__TRACKBACK__ in cocos.init
|
2015-03-13 16:39:36 +08:00 |
CocosRobot
|
2f0eb6712d
|
[AUTO]: updating luabinding automatically
|
2015-03-13 07:15:34 +00:00 |
CocosRobot
|
fa2fe74986
|
[AUTO]: updating luabinding automatically
|
2015-03-13 06:19:29 +00:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
CocosRobot
|
e079216248
|
[AUTO]: updating luabinding automatically
|
2015-03-11 02:45:36 +00:00 |
CocosRobot
|
1f78b18d22
|
[AUTO]: updating luabinding automatically
|
2015-03-09 02:27:14 +00:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
Jacky
|
c38c4a1373
|
fixed source coding error.
|
2015-03-04 18:15:05 +08:00 |
yangxiao
|
ea7dfe1147
|
lua test
|
2015-03-04 10:42:08 +08:00 |
CocosRobot
|
93c2b48779
|
[AUTO]: updating luabinding automatically
|
2015-03-03 15:15:43 +00:00 |
CocosRobot
|
84fb4094fc
|
[AUTO]: updating luabinding automatically
|
2015-02-28 03:23:08 +00:00 |
CocosRobot
|
8a310c09c0
|
[AUTO]: updating luabinding automatically
|
2015-02-27 03:54:42 +00:00 |
yangxiao
|
dd070e177e
|
modify unproject
|
2015-02-27 10:20:32 +08:00 |
CocosRobot
|
6a91450f7c
|
[AUTO]: updating luabinding automatically
|
2015-02-15 11:53:55 +00:00 |
samuele3hu
|
3a7cbe9d67
|
Add Particle3DTest for Lua and update related configure files
|
2015-02-15 15:56:20 +08:00 |
CocosRobot
|
a643691795
|
[AUTO]: updating luabinding automatically
|
2015-02-12 10:47:08 +00:00 |
Naoyuki Totani
|
2b43c12b88
|
fix SpriteEx
|
2015-02-12 15:16:48 +09:00 |
Nite Luo
|
ee2781e6a6
|
Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
Cmake build system fixes for MSVC (partial)
|
2015-02-04 23:18:08 -08:00 |
WenhaiLin
|
6873713c31
|
Fixed compile error on win32
|
2015-01-29 19:38:55 +08:00 |
CocosRobot
|
fcf0a2272f
|
[AUTO]: updating luabinding automatically
|
2015-01-29 02:27:42 +00:00 |
minggo
|
de3e9be2c5
|
Merge pull request #10265 from samuele3hu/v3_4_fi
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-29 10:16:49 +08:00 |
samuele3hu
|
0ec8510f00
|
Fix linux compile error
|
2015-01-29 09:19:57 +08:00 |
samuele3hu
|
80c2e0c153
|
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-28 21:47:52 +08:00 |
CocosRobot
|
ba5b23d2a5
|
[AUTO]: updating luabinding automatically
|
2015-01-28 07:21:15 +00:00 |
CocosRobot
|
78463a4a66
|
[AUTO]: updating luabinding automatically
|
2015-01-28 05:46:25 +00:00 |
minggo
|
f54916cf69
|
Merge pull request #10247 from samuele3hu/v3_4_fi
Add more 3D test case and adjust some binding function
|
2015-01-28 13:41:34 +08:00 |
samuele3hu
|
cd42806367
|
Fix the error of tolua_cocos2d_Mat4_decompose
|
2015-01-28 11:12:12 +08:00 |
samuele3hu
|
82a95bf2fc
|
Modify some script files
|
2015-01-28 10:57:30 +08:00 |
samuele3hu
|
6208e9cba5
|
Add more test cases about 3D
|
2015-01-28 09:40:20 +08:00 |
CocosRobot
|
4792a44a87
|
[AUTO]: updating luabinding automatically
|
2015-01-27 05:58:53 +00:00 |
Vladimir Timofeev
|
b6201f9328
|
cmake: try to fix lua-bindings for msvc
|
2015-01-26 10:09:49 +03:00 |
minggo
|
ebc75579a2
|
Merge pull request #9838 from htlxyz/v3_origin
modify trans lua value to fontdefinition error
|
2015-01-23 16:55:01 +08:00 |
minggo
|
42b6fbd1c6
|
Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
Lua load chunks from zip supports folder structured lua
|
2015-01-23 16:13:09 +08:00 |
CocosRobot
|
ad9e5e21c3
|
[AUTO]: updating luabinding automatically
|
2015-01-22 06:08:11 +00:00 |
samuele3hu
|
d74fb0e8b5
|
Update LayoutComponent Test case of UIEditTest
|
2015-01-22 10:21:38 +08:00 |
CocosRobot
|
5e273da0ec
|
[AUTO]: updating luabinding automatically
|
2015-01-21 09:33:26 +00:00 |
CocosRobot
|
4f7b6608c4
|
[AUTO]: updating luabinding automatically
|
2015-01-21 06:46:49 +00:00 |
CocosRobot
|
b31b22491d
|
[AUTO]: updating luabinding automatically
|
2015-01-21 05:44:30 +00:00 |
minggo
|
08d392dd5f
|
Merge pull request #10132 from samuele3hu/v3_4_issue9537
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 13:39:29 +08:00 |
samuele3hu
|
205ead5b63
|
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 11:48:34 +08:00 |
CocosRobot
|
8f099c7f0d
|
[AUTO]: updating luabinding automatically
|
2015-01-21 03:09:35 +00:00 |
minggo
|
abc6511ceb
|
Merge pull request #10125 from samuele3hu/v3_4_issue9537
issue #10107: Binding AnimationInfo to lua
|
2015-01-21 11:02:11 +08:00 |
CocosRobot
|
2f75d56c9b
|
[AUTO]: updating luabinding automatically
|
2015-01-21 02:10:47 +00:00 |
samuele3hu
|
666af29681
|
issue #10107: Binding AnimationInfo to lua
|
2015-01-21 10:06:48 +08:00 |
CocosRobot
|
dae3e365ed
|
[AUTO]: updating luabinding automatically
|
2015-01-21 01:36:21 +00:00 |
CocosRobot
|
9a15610983
|
[AUTO]: updating luabinding automatically
|
2015-01-20 08:17:36 +00:00 |
CocosRobot
|
37dcdacc7f
|
[AUTO]: updating luabinding automatically
|
2015-01-20 07:38:26 +00:00 |
samuele3hu
|
cc732743da
|
Add macro judgement for CC_PLATFORM_MAC
|
2015-01-19 13:58:03 +08:00 |
htl
|
5a87908344
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-19 09:38:34 +08:00 |
dualface
|
d39b1b7e58
|
fix ResolutionPolicy support
|
2015-01-16 18:04:13 +08:00 |
samuele3hu
|
4601331dee
|
Update the luaval_to_int32 conversional function to get correct value
|
2015-01-16 09:50:22 +08:00 |
htl
|
ecbef0c45c
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-15 16:14:52 +08:00 |
dualface
|
3edd78d6c3
|
add SHOW_ALL support for Lua framework
|
2015-01-15 12:01:27 +08:00 |
CocosRobot
|
97aee8cef0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 09:19:31 +00:00 |
minggo
|
825f90564c
|
Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 17:05:51 +08:00 |
samuele3hu
|
77912270f9
|
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 16:58:35 +08:00 |
CocosRobot
|
e69497c7c0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 08:26:14 +00:00 |
samuele3hu
|
c026aa82f9
|
Add CC_DEPRECATED_ATTRIBUTE flag
|
2015-01-14 15:09:37 +08:00 |
samuele3hu
|
951324a230
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
Conflicts:
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
|
2015-01-14 13:58:12 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
CocosRobot
|
b134f74db4
|
[AUTO]: updating luabinding automatically
|
2015-01-14 03:43:27 +00:00 |
minggo
|
1bb4c12b1d
|
Merge pull request #9948 from samuele3hu/v3_4_fix_bug
issue #9886: fix the number conversion error when passing 0x80000000
|
2015-01-13 14:11:49 +08:00 |
samuele3hu
|
203d20161c
|
issue #9886: fix the number conversion error when passing 0x80000000
|
2015-01-13 10:02:09 +08:00 |
minggo
|
eb74647210
|
Merge pull request #9933 from SunLightJuly/support_func_call_chain
Support func call chain
|
2015-01-13 09:35:12 +08:00 |
SunLightJuly
|
4d2a425450
|
fixed typo
|
2015-01-13 01:02:04 +08:00 |
CocosRobot
|
93d1d9c940
|
[AUTO]: updating luabinding automatically
|
2015-01-12 12:08:54 +00:00 |
pipu
|
d9adda89c2
|
Update cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp
|
2015-01-12 16:51:50 +08:00 |
SunLightJuly
|
3a64d723de
|
modified lua_cocos2dx_Node_setRotationQuat() to to support chain call
|
2015-01-12 15:21:21 +08:00 |
SunLightJuly
|
a902df93c6
|
modified the manual binding files to support functions call chain
|
2015-01-12 15:12:01 +08:00 |
Edward Zhou
|
c2929a30d5
|
fix compile error
|
2015-01-11 23:01:13 +08:00 |
Edward Zhou
|
5bd9e7f1a7
|
support to loading folder structured lua(a.k.a normal zip file) for luaLoadChunksFromZIP
|
2015-01-11 22:57:14 +08:00 |
htl
|
0cf63712e9
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-09 10:02:45 +08:00 |