yinjimmy
82f37fcf72
add libsimulator
2015-01-08 14:10:28 +08:00
yinjimmy
dee536def2
support win32
2015-01-08 13:36:59 +08:00
yinjimmy
197ab05a99
cleanup
2015-01-08 08:56:31 +08:00
yinjimmy
f1f4e5f3c2
support android
2015-01-07 22:19:46 +08:00
yinjimmy
4fee8a5926
support iOS
2015-01-07 22:18:27 +08:00
yinjimmy
9122e15f2c
move simulator
2015-01-07 17:50:15 +08:00
zhangbin
d80830c264
Update the reference of submodule cocos2d-console.
2015-01-07 17:48:10 +08:00
minggo
fbf565fd59
Merge pull request #9798 from samuele3hu/v3_4_packagesize
...
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-07 11:14:22 +08:00
zhangbin
1837b083f7
Update the reference of submodule cocos2d-console.
2015-01-06 18:13:48 +08:00
samuele3hu
58d946b578
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-05 17:10:25 +08:00
zhangbin
6adedee781
Update the reference of submodule cocos2d-console.
2014-12-31 14:55:14 +08:00
zhangbin
98e24b1cdc
Update the reference of submodule cocos2d-console.
2014-12-30 16:28:23 +08:00
minggo
3c1978fcc3
Merge pull request #9611 from super626/quaternion
...
Rotation With Quaternion
2014-12-30 10:09:08 +08:00
yangxiao
de7b70f63e
skip Node::set/getRotationQuat
2014-12-25 14:55:43 +08:00
minggo
6487cebead
[ci skip]Don't notify because we don't use travis now.
2014-12-25 14:28:27 +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
andyque
78e3f92d5c
add generate_docs.sh to tools
2014-12-24 16:40:14 +08:00
kaile.yin
9ef5d8213e
update submodule
2014-12-22 14:07:00 +08:00
zhangbin
f7a6472748
Update the reference of submodule cocos2d-console.
2014-12-16 17:19:06 +08:00
kaile.yin
cb509aa69f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-09 13:33:39 +08:00
zhangbin
72f88a9790
Update the reference of submodule cocos2d-console.
2014-12-08 16:43:44 +08:00
kaile.yin
17bd5bf31e
update submodule
2014-12-05 20:27:10 +08:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
minggo
c217040f61
Merge pull request #9326 from samuele3hu/v3_fi_bindings
...
Add support to clang3.4 because of using the ndk-r10c and update bindings-generator submodule
2014-12-04 15:14:02 +08:00
zhangbin
79a7ca6516
Update the reference of submodule cocos2d-console.
2014-12-03 16:40:42 +08:00
kaile.yin
9d49f82eb9
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-12-03 16:00:32 +08:00
zhangbin
16df08679c
Update the reference of submodule cocos2d-console.
2014-12-03 11:54:59 +08:00
samuele3hu
ef16a460e6
Update bindings-generator submodule
2014-12-01 11:16:40 +08:00
samuele3hu
9900ccba4d
Add support to clang3.4 because of using the ndk-r10c
2014-12-01 11:15:56 +08:00
Dhilan007
6603d7183a
Update the reference of submodule cocos2d-console
2014-11-28 13:41:52 +08:00
Ricardo Quesada
2362ea372c
new console version
2014-11-27 11:34:43 -08:00
Ricardo Quesada
ab8838f0c0
New cocos2d-console version
2014-11-27 10:48:19 -08:00
zhangbin
fade3dc61f
Update the reference of submodule cocos2d-console.
2014-11-27 20:37:18 +08:00
samuele3hu
6cf092b855
Add cocos2dx_csloader.ini to generate the related lua bindings
2014-11-27 10:22:39 +08:00
samuele3hu
222f2cbd51
Decrease the package size of lua_empty_test
2014-11-26 21:54:18 +08:00
samuele3hu
aa4277ed72
Update the bindings-generator submodule
2014-11-26 18:20:22 +08:00
youyou
07457a34b5
update lua ini files
2014-11-26 15:56:51 +08:00
andyque
b70ddc7a14
add exception guard to db operation
2014-11-26 09:52:27 +08:00
samuele3hu
a62fa8de58
Skip binding nodeWithFlatBuffers of CSLoader for lua
2014-11-24 23:36:44 +08:00
Ricardo Quesada
59461439ad
Updates console
2014-11-20 17:55:59 -08:00
James Chen
d6ee9525bd
Merge pull request #9139 from nilium/v3-plugin-libjars-unignore
...
Unignore libs dir and fix Travis script to descend into included directories. (follows #9108 )
2014-11-21 09:35:01 +08:00
Ricardo Quesada
04510c39fa
Uses new version of cocos2d-console
2014-11-19 12:25:50 -08:00
zhangbin
5aff5640b5
Solve the error when building android for sample projects of engine.
...
1. Update the project config.
2. Update the submodule cocos2d-console.
2014-11-18 18:39:53 +08:00
Noel Cower
41027463c9
Descend into included directories to check for file inclusion.
...
Only applies to directories that are marked as unignored, since the
travis script has the odd problem of not descending into those
directories and, as a result, not recording the files in them.
I'm assuming the failure to descend into included directories is
unintended.
2014-11-17 08:45:30 -08:00
Noel Cower
590975d08d
Also un-ignore libs dir under plugins.
...
The configure script isn't smart enough to check if there are
un-ignored files in a directory, so this fixes that.
2014-11-17 08:26:23 -08:00
zhangbin
365e09e5db
Merge branch 'v3' into support-wp8
2014-11-17 16:01:12 +08:00
zhangbin
534570075b
Update the reference of submodule cocos2d-console.
2014-11-17 15:57:49 +08:00
Noel Cower
fbdf0201c6
Permit plugin-x plugins to ship third-party libraries.
...
Ignoring the libs directory's .jar files is strange. I'm not sure
whoever put the total block over libs/ knew that this is the standard
Android library directory and not just for NDK-compiled assets.
More granular ignores over libs/ contents would be better in the
future, but this fixes the odd sdk/ directory hack plugins currently
use and lets the Android build system auto-link libraries that're
shipped with plugins instead of forcing Cocos developers to manually
sift through a plugin's Android dependencies and include them by hand.
2014-11-13 09:20:09 -08:00
yangxiao
4d74e7f19f
skip getMeshArrayByName
2014-10-29 10:38:13 +08:00
samuele3hu
042969ce35
Remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
2014-10-20 16:14:24 +08:00
minggo
8218804c52
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
...
[LUA]Add New AudioEngine on window
2014-10-18 15:11:29 +08:00
samuele3hu
3348f8300e
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
2014-10-18 00:13:22 +08:00
Dhilan007
81a8e80496
[LUA]Add New AudioEngine on window
2014-10-17 17:53:33 +08:00
samuele3hu
936510411b
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
2014-10-17 15:04:16 +08:00
samuele3hu
4593b55e1a
Update bindings-generator submodule
2014-10-17 14:32:24 +08:00
samuele3hu
dd2ad66e41
Update bindings-generator submodule
2014-10-17 14:23:58 +08:00
samuele3hu
7198ae509c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 20:35:43 +08:00
samuele3hu
079df20541
Update lua bindings for Spine and related test case
2014-10-16 20:23:58 +08:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
samuele3hu
8b5f6ae52a
Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:04:09 +08:00
samuele3hu
b4c91f0712
Update the related cocosstudio lua test cases
2014-10-16 15:51:01 +08:00
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
Huabing.Xu
c12f88d63c
lua compiles ok-need to make it works later
2014-10-15 17:33:58 +08:00
samuele3hu
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
minggo
0787124710
Merge pull request #8697 from andyque/fixJenkinsSql
...
add back
2014-10-15 01:53:34 +08:00
andyque
49b974ae42
add back
2014-10-15 01:45:44 +08:00
minggo
73ea855a79
Merge pull request #8696 from andyque/fixJenkinsSql
...
fix sql syntax error
2014-10-15 01:45:02 +08:00
andyque
05c204622e
add backslash
2014-10-15 01:37:13 +08:00
andyque
bd37d62026
fix sql syntax error
2014-10-15 01:04:00 +08:00
samuele3hu
4a67963420
Update CSLoader lua-bindings and adjust project config
2014-10-14 23:37:00 +08:00
minggo
19d408748c
Merge pull request #8687 from andyque/fixJenkinSqlTableName
...
fix jenkins sql table name
2014-10-14 20:09:30 +08:00
andyque
9e538fce48
fix jenkins sql table name
2014-10-14 17:31:53 +08:00
zhangbin
131c60fd20
Update the reference of submodule cocos2d-console.
2014-10-14 16:29:49 +08:00
andyque
8a6b78c510
fix lua bindings
2014-10-14 11:24:45 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
minggo
d5658a69d5
Merge pull request #8621 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2014-10-10 16:31:01 +08:00
zhangbin
72ebd715b3
Update the reference of submodule cocos2d-console.
2014-10-10 16:28:03 +08:00
pipu
d699b5809b
Modifying libprotocolbuf.a as protocolbuffer.a
2014-10-10 12:52:42 +08:00
samuele3hu
f97a7ae52d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-10-10 09:52:29 +08:00
samuele3hu
115d81574c
Add CameraTest、OBBTest and related lua bindings
2014-10-10 09:49:25 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
zhangbin
bce62aef82
Update the reference of submodule cocos2d-console.
2014-10-08 15:53:01 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
samuele3hu
6ea43a60b0
Update cocos2dx.ini to skip Node::setAdditionalTransform
2014-09-29 10:19:32 +08:00
samuele3hu
f00187d3bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-09-29 09:48:35 +08:00
samuele3hu
99e1c6640e
Add BillBoardTest and update related bindings files
2014-09-29 09:43:22 +08:00
samuele3hu
6b2acf88fc
Modify CameraTest and update related lua-bindings files
2014-09-28 16:47:06 +08:00
samuele3hu
e50eaf684f
Add CameraTest and update related lua-bindings files
2014-09-28 14:31:58 +08:00
yangxiao
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
samuele3hu
2ac96ed06e
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
2014-09-26 16:39:54 +08:00
samuele3hu
691074eb7c
Add Camra3DTest and update sprite3DTest
2014-09-26 16:00:57 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
yangxiao
d69b6558c4
lua
2014-09-26 15:07:23 +08:00
Hong Liang
1c71234921
export lua function "cc.Device::getDPI()"
2014-09-26 11:52:52 +08:00
samuele3hu
2cc48d1f81
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-25 10:40:31 +08:00
andyque
a158b79fb6
add more prompt to debug
2014-09-24 12:57:47 +08:00
andyque
d066d02be5
add downloading prompt
2014-09-24 12:53:30 +08:00
andyque
f8a05c9e1e
recheck download.py
2014-09-24 12:42:53 +08:00
andyque
0267712531
uncomment 3rd part bins check
2014-09-23 10:55:34 +08:00
samuele3hu
f0608a6d70
Update lua bindings for Mesh and add a Sprite3DHitTest
2014-09-22 15:29:38 +08:00
zhangbin
3b007e0845
Update the reference of submodule cocos2d-console.
2014-09-19 17:03:34 +08:00
zhangbin
f73d015343
Update the reference of submodule cocos2d-console.
2014-09-17 18:03:49 +08:00
Dhilan007
9942206c53
move AudioEngine in cocos2d:experimental namespace
2014-09-16 10:22:25 +08:00
samuele3hu
c56c0dfd4f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
2014-09-15 18:04:08 +08:00
samuele3hu
225c3db005
Update cocos2dx_3d.ini
2014-09-15 17:59:57 +08:00
minggo
7bb391ce55
Merge pull request #8033 from Dhilan007/v3-audio903
...
Lua bindings of AudioEngine.
2014-09-15 13:43:27 +08:00
Dhilan007
56aa9c04ef
fix lua bindings
2014-09-15 10:07:14 +08:00
minggo
788f3c5c38
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
...
fix Editbox lua binding
2014-09-15 09:36:36 +08:00
Dhilan007
cf2a60898f
Lua bindings of AudioEngine.
2014-09-14 22:54:04 +08:00
andyque
02d2282b83
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
2014-09-12 17:07:06 +08:00
minggo
55783b66c2
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
...
V3 drawnode prbk
2014-09-12 15:17:49 +08:00
huangshiwu
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
yangxiao
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
huangshiwu
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
minggo
a5855baac4
Merge pull request #7976 from samuele3hu/v3_check_mat
...
Added Math SSE implementation on x86 and update bindings-generator submodule
2014-09-11 14:47:39 +08:00
yangxiao
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
samuele3hu
51879a7e39
Update lua bindings ini config files
2014-09-10 14:18:21 +08:00
zhangbin
c20caa7c35
Update the reference of submodule cocos2d-console.
2014-09-10 13:59:48 +08:00
samuele3hu
daeb51e548
Update cocos2d.ini
2014-09-09 23:02:06 +08:00
samuele3hu
3a433b2cd6
Update bindings-generator submodule
2014-09-09 16:26:06 +08:00
yangxiao
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
samuele3hu
8c2ab3a4e7
Add manual lua bindings for GLView::getAllTouches
2014-09-04 22:12:59 +08:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
yangxiao
d114e11a0b
android, linux and lua
2014-09-04 16:45:42 +08:00
minggo
99f3b371ed
Merge pull request #7744 from lite3/customguireader
...
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
2014-09-04 10:53:00 +08:00
andyque
2deeee2109
remove extension luabindings
2014-09-02 01:11:50 -07:00
lite3
74d8bf6f27
fix
2014-09-02 10:51:17 +08:00
minggo
88a80495df
Merge pull request #7923 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2014-09-02 09:41:41 +08:00
zhangbin
3e1053aa2a
Update the reference of submodule cocos2d-console.
2014-09-02 09:31:23 +08:00
samuele3hu
b58ccc5961
Update bindings-generators submodule
2014-09-01 14:08:02 +08:00
lite3
1846482527
skip GUIReader::registerTypeAndCallBack for lua bindings
2014-08-30 00:46:38 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
minggo
0701fe1dfb
Merge pull request #7853 from super626/v3
...
Better reskin model support
2014-08-22 19:18:47 +08:00
yangxiao
70661b0ff4
lua bind
2014-08-22 14:25:00 +08:00
andyque
13003fe0a6
add deprecated options for ui, add Scale9Sprite bindings
2014-08-22 11:56:13 +08:00
zhangbin
97a4258cd6
Update the reference of submodule cocos2d-console.
2014-08-21 14:10:36 +08:00
zhangbin
8034b5429e
Update the reference of submodule cocos2d-console.
2014-08-20 13:45:01 +08:00
zhangbin
8f30a7eeff
Update the reference of submodule cocos2d-console.
2014-08-20 11:41:58 +08:00
zhangbin
dab6e5fb70
Update the reference of submodule cocos2d-console.
2014-08-19 15:21:43 +08:00
samuele3hu
e3149ce41a
Split lua bindings for 3D from cocos2d
2014-08-18 15:00:40 +08:00
yangxiao
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
zhangbin
77c7ed9896
Update the reference of submodule cocos2d-console.
2014-08-14 15:13:43 +08:00
zhangbin
c8ad850d68
Update the reference of submodule cocos2d-console.
2014-08-13 10:06:22 +08:00
zhangbin
88382994b9
Modify the gen-prebuilt tools for the lua-bindings modules.
2014-08-12 09:37:51 +08:00
zhangbin
e493c0b3c8
Merge branch 'v3' into gen-prebuilt-script
2014-08-11 15:09:06 +08:00
yangxiao
fd314261b7
Merge branch 'newcode' into obb
2014-08-11 13:21:44 +08:00
yangxiao
754a78bd26
can not export aabb obb ray
2014-08-09 00:03:11 +08:00
heliclei
4fd2d2082a
[ci skip][jenkins]Add script to track android built libs size
2014-08-08 17:28:44 +08:00