XiaoFeng
72d21ff810
Update reader, add BlendFrame supporting to Skeleton Animation
...
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
2015-08-17 13:05:29 +08:00
江龙
06ab98b0ac
improve the comment
2015-08-15 17:04:32 +08:00
jianglong0156
ae8332eb85
add NodeGrid bind
2015-08-14 17:46:34 +08:00
CocosRobot
9b003c9cfc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-14 03:34:30 +00:00
Ricardo Quesada
7047e0fbdb
Merge branch 'v3' into downloader_decouple_squash
2015-08-13 11:07:49 -07:00
CocosRobot
2de6b4ed4c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 09:11:00 +00:00
Ricardo Quesada
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
2015-08-13 00:14:10 -07:00
CocosRobot
9fd18f987e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 02:53:50 +00:00
andyque
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
CocosRobot
ef41cb27ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 08:02:58 +00:00
CocosRobot
aa6ac72405
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 01:58:29 +00:00
pandamicro
1471936c2f
Merge pull request #13249 from pandamicro/v3
...
Made SocketIO events correctly fired when compile in release mode
2015-08-10 13:32:09 +08:00
CocosRobot
8c76a194fa
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-09 02:32:59 +00:00
CocosRobot
eb9d1ea205
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-07 22:55:48 +00:00
jianglong0156
2c3b9009cb
fix the node color property can not use
...
code example:
````
node.color = xxxx // fix it
````
2015-08-07 17:26:35 +08:00
XiaoFeng
91c88ec535
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 18:12:08 +08:00
pandamicro
a170b1caf1
Made SocketIO events correctly fired when compile in release mode
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248
Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.
Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.
I also did the following in this commit:
- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
2015-08-06 17:20:04 +08:00
子龙山人
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
jianglong0156
9a257d8136
fix lua pai error
2015-08-05 16:15:22 +08:00
jianglong0156
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
pandamicro
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
jianglong0156
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
VisualSj
b9b565e64a
Update JSON parser
2015-08-04 16:04:35 +08:00
pandamicro
744fa0b565
Merge pull request #13194 from VisualSJ/v3-boneTest
...
[ci skip] Update JSON parser
2015-08-04 15:35:27 +08:00
VisualSj
04465ac4f4
Update JSON parser
2015-08-04 15:15:46 +08:00
jianglong0156
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
CocosRobot
3e71ce33c8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 10:09:10 +00:00
CocosRobot
dbb8792630
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 07:46:25 +00:00
CocosRobot
167f9adca8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 05:09:11 +00:00
pandamicro
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
andyque
2427c15b60
modify vertical scroll direction
2015-08-03 11:38:23 +08:00
CocosRobot
c281630fa6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 00:13:29 +00:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
CocosRobot
29208156d9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 13:23:21 +00:00
jianglong0156
5d281d45ef
recover the physics3DShape initHeightfield api
2015-08-01 18:29:48 +08:00
andyque
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
jianglong0156
69040ef472
add Physics3DHingeConstraint support constructor
...
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
CocosRobot
90d578c6e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 02:16:33 +00:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
jianglong0156
dcda083efa
rename the initTerrain to initWithTerrainData
2015-07-31 18:35:47 +08:00
jianglong0156
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
CocosRobot
0851363532
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-31 02:06:41 +00:00
CocosRobot
c0d6ec1946
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 16:30:01 +00:00
pandamicro
34724e41b2
Merge pull request #13092 from pandamicro/audioengine
...
Add AudioEngine js bindings
2015-07-31 00:22:04 +08:00
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
yinjimmy
bdac739541
Fix: executeScriptFile can not load .luac file when .lua is not exist
2015-01-09 04:18:41 +08:00
CocosRobot
6b67f55ab5
[AUTO]: updating luabinding automatically
2015-01-08 06:32:36 +00:00
CocosRobot
822c38b129
[AUTO]: updating luabinding automatically
2015-01-08 02:40:40 +00:00
Huabing.Xu
b5f8666caf
Merge pull request #9855 from huangshiwu/v3_XmlHttpRequest
...
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 10:28:34 +08:00
htl
240b43891a
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-08 10:20:56 +08:00
Huabing.Xu
0f0e54a00b
Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile
...
Compatibility code for executeScriptFile
2015-01-08 09:26:47 +08:00
yinjimmy
70e0874add
Compatibility code for executeScriptFile
2015-01-08 09:01:39 +08:00
huangshiwu
be02233815
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 00:23:27 +08:00
CocosRobot
9253ae99bc
[AUTO]: updating luabinding automatically
2015-01-07 09:50:54 +00:00
minggo
c229ee0060
Merge pull request #9831 from CocosRobot/update_lua_bindings_1420600634
...
[AUTO]: updating luabinding automatically
2015-01-07 17:24:14 +08:00
htl
66dd8bb449
modify float convert to unsigned int
2015-01-07 16:03:46 +08:00
yinjimmy
7d430742f1
Merge branch 'bugfix_executeScriptFile' into combine
2015-01-07 15:33:15 +08:00
yinjimmy
cbf9741dfd
Compatibility code for executeScriptFile
2015-01-07 15:23:58 +08:00
htl
3d2aa30aa7
modify trans lua value to fontdefinition error
2015-01-07 15:18:56 +08:00
htl
194fa09f30
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-07 14:14:52 +08:00
htl
e1fd472df1
modify texture format name
2015-01-07 14:11:48 +08:00
CocosRobot
54c75337c5
[AUTO]: updating luabinding automatically
2015-01-07 03:19:27 +00: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
CocosRobot
f83daed2cf
[AUTO]: updating luabinding automatically
2015-01-07 02:27:01 +00: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
htl
c4cc6b5c34
modify event register function name
2015-01-05 14:19:27 +08:00
htl
f82404f9c9
modify node register event interface
2015-01-05 14:02:29 +08:00
dualface
432bdf3541
fix framework on iOS
2014-12-31 18:01:03 +08:00
minggo
bbfa7a9183
Merge pull request #9753 from samuele3hu/v3_4_httpclient
...
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:48:33 +08:00
samuele3hu
54d376db01
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:28:14 +08:00
CocosRobot
2e1d8b4e42
[AUTO]: updating luabinding automatically
2014-12-31 08:15:01 +00:00
CocosRobot
3614f716ae
[AUTO]: updating luabinding automatically
2014-12-31 06:23:33 +00:00
samuele3hu
6bad549285
Resolve the require file errror
2014-12-31 13:43:47 +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
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
CocosRobot
5b8492770e
[AUTO]: updating luabinding automatically
2014-12-30 07:49:45 +00:00
CocosRobot
ed7823c08b
[AUTO]: updating luabinding automatically
2014-12-30 03:52:26 +00:00
minggo
3c1978fcc3
Merge pull request #9611 from super626/quaternion
...
Rotation With Quaternion
2014-12-30 10:09:08 +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
dualface
40acc98f14
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates
2014-12-29 10:58:42 +08:00
dualface
954f170e9e
remove chinese comments
2014-12-29 10:44:16 +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
CocosRobot
4172e7ad7f
[AUTO]: updating luabinding automatically
2014-12-29 01:49:00 +00:00
minggo
b01b25e17e
Merge pull request #9558 from super626/frustum
...
Frustum Culling
2014-12-29 09:43:14 +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
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
CocosRobot
f8b1b34025
[AUTO]: updating luabinding automatically
2014-12-26 08:10:13 +00: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
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
CocosRobot
a30d606fe6
[AUTO]: updating luabinding automatically
2014-12-26 02:40:22 +00:00
CocosRobot
ff37578611
[AUTO]: updating luabinding automatically
2014-12-26 01:32:36 +00:00
lvlong
75d2deb2c8
revert
2014-12-25 15:25:19 +08:00
lvlong
3f91957e79
revert
2014-12-25 15:21:53 +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
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
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
CocosRobot
381be0f6f0
[AUTO]: updating luabinding automatically
2014-12-24 09:41:09 +00:00
lvlong
4d1ca0966c
lua binding
2014-12-24 15:09:26 +08:00
CocosRobot
a5d3e8361b
[AUTO]: updating luabinding automatically
2014-12-24 06:42:09 +00: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
yinjimmy
24648db2b5
execute script with full file path
2014-12-24 02:18:29 +08:00
CocosRobot
864b924dfb
[AUTO]: updating luabinding automatically
2014-12-23 06:49:30 +00:00
CocosRobot
facf9a1a66
[AUTO]: updating luabinding automatically
2014-12-23 04:05:21 +00:00
CocosRobot
34e1bce6c3
[AUTO]: updating luabinding automatically
2014-12-22 08:02:05 +00:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
CocosRobot
9ffacb3f78
[AUTO]: updating luabinding automatically
2014-12-17 10:38:03 +00:00
samuele3hu
5c20885ad1
Synchronize the KeyCode Enum to Lua
2014-12-17 11:27:01 +08:00
CocosRobot
189e386846
[AUTO]: updating luabinding automatically
2014-12-16 10:44:15 +00:00
CocosRobot
3d327deb6d
[AUTO]: updating luabinding automatically
2014-12-16 02:14:01 +00:00
samuele3hu
5d3008d6ac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
2014-12-11 09:51:18 +08:00
samuele3hu
4b43fab3e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-12-09 21:03:01 +08:00
CocosRobot
b0aacdc287
[AUTO]: updating luabinding automatically
2014-12-09 10:34:49 +00:00
samuele3hu
7e8da62ebc
Add Websocket support for Mac platform
2014-12-09 18:29:20 +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
CocosRobot
e510f24663
[AUTO]: updating luabinding automatically
2014-12-08 10:14:41 +00:00
youyou
04f870edb5
update head file
2014-12-05 10:08:48 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
CocosRobot
0c54f8f7a0
[AUTO]: updating luabinding automatically
2014-12-04 02:11:58 +00:00
kaile.yin
b4612447f3
change tab to 4 space
2014-12-03 16:12:44 +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
minggo
0d1baf4037
Merge pull request #9327 from samuele3hu/v3_manual_bindings
...
Add more useful trace back info when got invalid arguments by calling functions
2014-12-03 14:17:16 +08:00
samuele3hu
1da44b0897
Add more useful trace back info when got invalid arguments by calling functions
2014-12-01 15:53:41 +08:00
samuele3hu
802ba311d6
Fix the error that SpritePerformanceTest lua does’t work
2014-11-28 11:54:38 +08:00
CocosRobot
f0c31172b8
[AUTO]: updating luabinding automatically
2014-11-27 13:39:15 +00:00
minggo
dcc517e8d4
Merge pull request #9267 from samuele3hu/v3_strip
...
Adjust binding structure to decrease the package size of lua_empty_test
2014-11-27 20:21:06 +08:00
samuele3hu
ed573149dd
Resolve the project setting error on the platforms
2014-11-27 19:42:32 +08:00
CocosRobot
36a5a170d2
[AUTO]: updating luabinding automatically
2014-11-27 02:55:33 +00:00
samuele3hu
dc00158d72
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-27 10:44:56 +08:00
CocosRobot
3ed78b820e
[AUTO]: updating luabinding automatically
2014-11-27 02:02:29 +00:00
samuele3hu
9fbf87c6db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-26 21:59:57 +08:00
samuele3hu
222f2cbd51
Decrease the package size of lua_empty_test
2014-11-26 21:54:18 +08:00
minggo
51b4736740
Merge pull request #9149 from samuele3hu/v3_compile_binary
...
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-26 20:05:21 +08:00
CocosRobot
39c2c8a2cb
[AUTO]: updating luabinding automatically
2014-11-26 03:20:28 +00:00
CocosRobot
0f14dee924
[AUTO]: updating luabinding automatically
2014-11-26 02:56:12 +00:00
Vladimir Timofeev
a562c70c73
Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes
...
* origin/v3:
Update CHANGELOG
Update AUTHORS
fixed typo
Updates definition of Complete.
[AUTO][ci skip]: updating cocos2dx_files.json
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
Skip binding nodeWithFlatBuffers of CSLoader for lua
2014-11-25 15:24:07 +03:00
Shrimpz
ac666d1e6d
fixed typo
2014-11-25 15:51:25 +08:00
Vladimir Timofeev
782e3bcd01
cmake: Add correct _POSIX_C_SOURCE and _BSD_SOURCE (linux) defines when build luasocket, so all types and func properly defined
2014-11-24 17:24:45 +03:00
Vladimir Timofeev
3dadcf4aea
As we have --std=c99 in CMAKE_C_FLAGS, to expose some macros and functions we should declare feature-check-marco...
...
Define _DARWIN_C_SOURCE should enable all mac os non standard extensions.
2014-11-24 17:24:11 +03:00
CocosRobot
7dc623fcab
[AUTO]: updating luabinding automatically
2014-11-24 07:24:39 +00:00
Vladimir Timofeev
9dfa26e0ec
Quick and dirty fix after my error. This defines fix build on linux with fresh gcc, but broke on mac
2014-11-20 23:20:02 +03:00
Vladimir Timofeev
012a152406
Fix build of luasocket on linux
2014-11-20 13:49:59 +03:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
CocosRobot
e52ee603ac
[AUTO]: updating luabinding automatically
2014-11-20 03:41:28 +00:00
Vladimir Timofeev
2bf77c10e8
Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code.
2014-11-19 03:28:41 +03:00
samuele3hu
78ef234e8f
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-18 16:02:38 +08:00
samuele3hu
02f46b46e3
Merge branch 'v3' of https://github.com/dantezhu/cocos2d-x into v3_compile_binary
2014-11-18 13:58:14 +08:00
Vladimir Timofeev
b5266e95bf
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
2014-11-17 01:42:04 +03:00
minggo
906316df62
Merge pull request #8985 from samuele3hu/v3_new_spine
...
Fix error that the type judgment of lua value would parse string —> int or int —> string
2014-11-13 18:59:19 +08:00
samuele3hu
a3dbd010db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-11-13 13:42:46 +08:00
samuele3hu
1d1d004c3a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-11-12 17:46:13 +08:00
dantezhu
e8d234a32a
fix lua http download binary data's bug
2014-11-10 17:11:30 +08:00
CocosRobot
a908c391b0
[AUTO]: updating luabinding automatically
2014-11-09 15:33:08 +00:00
minggo
e7d5e79e88
Merge pull request #8998 from aeonmine/v3
...
fix memory leak cocos studiov2.0 engine v3.3
2014-11-09 23:24:16 +08:00
CocosRobot
aae2fd9e2a
[AUTO]: updating luabinding automatically
2014-11-07 02:38:01 +00:00
samuele3hu
76ab86674e
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android
2014-11-06 14:32:03 +08:00
CocosRobot
13f9073e22
[AUTO]: updating luabinding automatically
2014-11-05 05:44:02 +00:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
samuele3hu
08d6b0dcff
Fix the type judgment of lua value would parse string —> int or int —> string
2014-10-31 17:50:59 +08:00
CocosRobot
9592b1f661
[AUTO]: updating luabinding automatically
2014-10-31 02:44:25 +00:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
CocosRobot
0ef3887497
[AUTO]: updating luabinding automatically
2014-10-24 13:55:25 +00:00
James Chen
dd6bb0b3eb
Uses reference in for loop inside ccvector_std_string_to_luaval
2014-10-23 10:18:09 +08:00
samuele3hu
2f9dbb7142
Update cocos2d basic lua files and LabelTestNew.lua
2014-10-21 15:56:38 +08:00
minggo
65f007f5ff
Merge pull request #8857 from zhongfq/patch-2
...
fix memory leak when add listener to ui object
2014-10-21 13:57:07 +08:00
minggo
6313f9a622
Merge pull request #8868 from samuele3hu/v3_new_spine
...
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
2014-10-21 09:33:40 +08:00
CocosRobot
e02558e391
[AUTO]: updating luabinding automatically
2014-10-20 10:17:27 +00:00
samuele3hu
20bcafa143
Fix the bug that callbacks aren’t triggered when response failed
2014-10-20 17:43:04 +08:00
samuele3hu
38b462100b
Update LuaMinXmlHttpRequest.h/.cpp
2014-10-20 16:05:13 +08:00
CocosRobot
5e09b1e3b1
[AUTO]: updating luabinding automatically
2014-10-20 06:06:43 +00:00
Eric Zhong
2206e4edb8
fix memory leak when add listener to ui object
2014-10-20 11:20:53 +08:00
samuele3hu
1195960ea7
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
2014-10-20 10:22:44 +08:00
minggo
c1128a227d
Merge pull request #8847 from samuele3hu/v3_new_spine
...
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 20:10:12 +08:00
samuele3hu
634d42775e
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 17:00:05 +08:00
CocosRobot
96d709aff3
[AUTO]: updating luabinding automatically
2014-10-18 07:36:54 +00: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
Dhilan007
5ca3483dd8
fixed compile error
2014-10-18 13:44:19 +08:00
Dhilan007
c9bc80f831
Fix compile error
2014-10-18 13:03:28 +08:00
samuele3hu
6502beaf95
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-18 00:14:53 +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
CocosRobot
20781825f2
[AUTO]: updating luabinding automatically
2014-10-17 14:56:22 +00:00
Dhilan007
81a8e80496
[LUA]Add New AudioEngine on window
2014-10-17 17:53:33 +08:00
minggo
d241e568b0
Merge pull request #8788 from samuele3hu/v3_new_spine
...
Update the deprecated Func and update bindings-generator
2014-10-17 16:35:51 +08:00
samuele3hu
936510411b
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
2014-10-17 15:04:16 +08:00
samuele3hu
14f91ea9f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 14:38:07 +08:00
CocosRobot
e8373e9b41
[AUTO]: updating luabinding automatically
2014-10-17 06:28:36 +00:00
samuele3hu
066d94530c
Update the Deprecated Func
2014-10-17 14:15:30 +08:00
minggo
7138933344
Merge pull request #8760 from samuele3hu/v3_new_spine
...
Update lua bindings for Spine and related test case
2014-10-17 13:43:26 +08:00
samuele3hu
71f7520732
Fix win32 compile error
2014-10-17 10:19:41 +08:00
minggo
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
samuele3hu
4d75c977ca
Remove useless binding code for SkeletonAnimation
2014-10-16 20:53:40 +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
c5f19c20ca
Add SpineConstants.lua
2014-10-16 20:24:47 +08:00
samuele3hu
079df20541
Update lua bindings for Spine and related test case
2014-10-16 20:23:58 +08:00
CocosRobot
4a084a4ebc
[AUTO]: updating luabinding automatically
2014-10-16 09:55:07 +00:00
minggo
064f0d9042
Merge pull request #8708 from dabingnn/v3_updateSpine
...
V3 update spine
2014-10-16 17:50:07 +08:00
CocosRobot
c4985c45e4
[AUTO]: updating luabinding automatically
2014-10-16 08:55:11 +00: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
CocosRobot
2bfad920ce
[AUTO]: updating luabinding automatically
2014-10-16 04:01:10 +00:00
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
Anton Sokolchenko
4f1430d25d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2014-10-15 16:36:18 +03:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
Huabing.Xu
c12f88d63c
lua compiles ok-need to make it works later
2014-10-15 17:33:58 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +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
samuele3hu
a95e391756
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-15 11:24:27 +08:00
samuele3hu
70aa62a365
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-10-15 02:09:12 +08:00
CocosRobot
64a7ef9173
[AUTO]: updating luabinding automatically
2014-10-14 18:01:12 +00:00
samuele3hu
5b4e81aa3a
Update Android.mk for libluacocos2d
2014-10-15 00:25:12 +08:00
samuele3hu
3e9900c40d
Update win32 project config
2014-10-15 00:08:52 +08:00
samuele3hu
4a67963420
Update CSLoader lua-bindings and adjust project config
2014-10-14 23:37:00 +08:00
samuele3hu
735e86788e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-14 21:36:44 +08:00
samuele3hu
3b4fbd8fff
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
2014-10-14 21:34:55 +08:00
minggo
abd2687cf5
Merge pull request #8683 from dualface/update_lua_template_runtime
...
update lua-template
2014-10-14 17:01:19 +08:00
dualface
cee999ebbb
update lua-template-default, lua-template-runtime, fix same proj problems.
2014-10-14 16:55:38 +08:00
CocosRobot
51e714bdae
[AUTO]: updating luabinding automatically
2014-10-14 06:32:12 +00:00
pipu
7dc837338e
Deleting cocos/scripting/lua-bindings/script/cocostudio
2014-10-13 16:34:31 +08:00
pipu
fc8be6f0ff
Reverting cocos/scripting/lua-bindings/auto
2014-10-13 13:06:42 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
CocosRobot
971d3a6653
[AUTO]: updating luabinding automatically
2014-10-11 08:12:44 +00:00
pipu
9ba51a1909
Reverting cocos/scripting/lua-bindings/auto/*.*
2014-10-11 13:49:56 +08:00
pipu
8b61c4677f
Deleting cocos/scripting/lua-bindings/auto/*.*
2014-10-11 12:09:11 +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
dualface
20cbbfdbe5
update luabinding scripts
2014-10-11 02:51:58 +08:00
dualface
68f71b3df4
do not load deprecated Lua API from luabinding of modules
2014-10-10 23:59:41 +08:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
CocosRobot
53cde3f3b2
[AUTO]: updating luabinding automatically
2014-10-10 08:39:46 +00: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
CocosRobot
70a2195ccf
[AUTO]: updating luabinding automatically
2014-10-08 09:53:11 +00:00
SunLightJuly
763b54e5cb
added LuaStack::loadChunksFromZIP()
2014-10-08 17:30:14 +08:00
CocosRobot
a96a2a992d
[AUTO]: updating luabinding automatically
2014-09-30 07:13:25 +00:00
SunLightJuly
c108616a01
standardized codes
2014-09-30 13:17:03 +08:00
SunLightJuly
4ba19791ed
fixed bug in Cocos2dxLuaLoader
2014-09-30 13:11:39 +08:00
CocosRobot
50a06a13ad
[AUTO]: updating luabinding automatically
2014-09-29 10:11:17 +00:00
samuele3hu
87fccd7881
Remove manaul lua-bindings for Armature::getOffsetPoints
2014-09-29 10:37:19 +08:00
samuele3hu
cb38f6bd5b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-29 10:27:46 +08:00