Ricardo Quesada
|
616feadda1
|
More fixes and "tiles" is an uint32 (GID)
|
2014-02-07 18:11:17 -08:00 |
James Chen
|
6cc22ac0b0
|
issue #3900: Fixes wrong include.
|
2014-02-07 17:26:28 +08:00 |
James Chen
|
f0418a17d3
|
issue #3900: Include fix. jsapi.h and jsfriendapi.h should be included before cocos2d.h, otherwise it will cause char16_t redefinition on windows.
|
2014-02-07 17:04:44 +08:00 |
James Chen
|
c25787e575
|
issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG .
|
2014-02-07 16:01:57 +08:00 |
James Chen
|
03292f44e2
|
issue #3900: TestJavascript could run on Mac platform with spidermonkey v27.
|
2014-02-07 13:09:38 +08:00 |
James Chen
|
e4366e3e00
|
issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
|
2014-02-07 11:16:13 +08:00 |
James Chen
|
408c3fdda9
|
issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
|
2014-02-07 11:15:05 +08:00 |
CocosRobot
|
3198bd85ef
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-31 03:37:29 +00:00 |
boyu0
|
a5863aafb3
|
closed #3716: edit lua support
|
2014-01-28 17:06:37 +08:00 |
CocosRobot
|
a2fc1cf970
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-27 09:50:08 +00:00 |
samuele3hu
|
46ce35c0bd
|
fix:Resolve the compile error of the cast_type on vs
|
2014-01-26 22:30:26 +08:00 |
samuele3hu
|
d3824c9592
|
issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation
|
2014-01-26 22:27:37 +08:00 |
samuele3hu
|
d2cc2d4065
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-26 17:22:49 +08:00 |
samuele3hu
|
2d66419394
|
close #3802: Add the createWithTTF(text, ...) lua binding to support 3.0beta0
|
2014-01-26 17:21:36 +08:00 |
CocosRobot
|
8fa44baa2e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-26 09:12:47 +00:00 |
James Chen
|
351ac4a5d7
|
[LUA] Adds missing cc prefix for lua classes.
|
2014-01-26 17:05:35 +08:00 |
James Chen
|
a4a010465c
|
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
|
2014-01-26 16:41:35 +08:00 |
CocosRobot
|
4862bbbd86
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-26 08:30:04 +00:00 |
samuele3hu
|
cf684bc3f4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-26 15:16:02 +08:00 |
CocosRobot
|
8260a2a5c1
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-26 06:56:11 +00:00 |
James Chen
|
d2893c1e1e
|
Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
|
2014-01-25 22:46:56 -08:00 |
James Chen
|
6ecc8d37c5
|
Fix a typo, this._is_nativeObj -> this.__nativeObj.
|
2014-01-26 14:45:45 +08:00 |
James Chen
|
26125f4e26
|
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
Please refer to http://www.cocos2d-x.org/issues/3858.
|
2014-01-26 14:41:27 +08:00 |
James Chen
|
6f45d9ca27
|
Merge pull request #5227 from dumganhar/iss3856-remote-debug-crash-mac
closed #3856: Crash when Firefox connects to JSB application.
|
2014-01-25 21:55:34 -08:00 |
James Chen
|
04f2cc48a2
|
closed #3856: Crash when Firefox connects to JSB application.
|
2014-01-26 13:54:48 +08:00 |
minggo
|
b7d5d430a4
|
Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
|
2014-01-25 20:37:31 -08:00 |
boyu0
|
682a6819cb
|
issue #3401: change getContactData function return value back to pointer.
|
2014-01-26 12:02:42 +08:00 |
samuele3hu
|
48498f726e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
Conflicts:
cocos/scripting/lua/bindings/CCLuaStack.cpp
|
2014-01-26 11:59:54 +08:00 |
James Chen
|
5b9f1697d3
|
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.
|
2014-01-26 11:16:25 +08:00 |
Dhilan007
|
c7e9cee835
|
updated vs project[Lua]:
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
|
2014-01-26 10:25:49 +08:00 |
samuele3hu
|
7a8ecb108c
|
issue #3837:Add the debug support for Mac
|
2014-01-26 09:42:07 +08:00 |
minggo
|
cdae60b6c8
|
Merge pull request #5212 from samuele3hu/developBug
Add luasocket's support for lua
|
2014-01-24 02:00:15 -08:00 |
CocosRobot
|
8c3af04b72
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-24 09:48:11 +00:00 |
samuele3hu
|
e2325924e4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-24 17:24:46 +08:00 |
samuele3hu
|
58eab72d26
|
issue:Add luasocket's support for lua
|
2014-01-24 17:24:10 +08:00 |
CocosRobot
|
e19c6e2caa
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-24 07:38:34 +00:00 |
samuele3hu
|
402d0cf7b1
|
issue #3822:Update the test cases which are related with touch using the `EventListenerTouchAllAtOnce` or `EventListenerTouchOneByOne`
|
2014-01-23 22:26:14 +08:00 |
samuele3hu
|
a91d9161c7
|
issue #3822:Update the KeypadTest using the new event-dispatcher
|
2014-01-23 16:17:24 +08:00 |
CocosRobot
|
5edc28c849
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-23 05:58:35 +00:00 |
CocosRobot
|
b0c828b471
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-23 03:56:45 +00:00 |
pandamicro
|
913360e526
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-01-22 22:32:44 +08:00 |
pandamicro
|
d6df71cc11
|
Fixed #3806: Change parameters to const &
|
2014-01-22 22:31:26 +08:00 |
CocosRobot
|
e900504e8b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 10:03:04 +00:00 |
James Chen
|
1b89a058fa
|
Merge pull request #5160 from samuele3hu/developBugFix
fix:Update the some test cases for lua
|
2014-01-22 01:21:50 -08:00 |
samuele3hu
|
e1476c8d60
|
fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()
|
2014-01-22 17:09:33 +08:00 |
CocosRobot
|
f9615d891e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 08:57:36 +00:00 |
samuele3hu
|
e848167b25
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
|
2014-01-22 15:44:33 +08:00 |
samuele3hu
|
c4d2f1d83c
|
fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case
|
2014-01-22 15:41:46 +08:00 |
CocosRobot
|
97b473731d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 04:20:57 +00:00 |
CocosRobot
|
4efb5bd686
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 03:41:19 +00:00 |
pandamicro
|
3de7ed93f9
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
|
2014-01-21 18:18:32 +08:00 |
pandamicro
|
a467fe3244
|
Fixed #3806: SAXParser supported with manual binding in JSB
|
2014-01-21 18:12:12 +08:00 |
samuele3hu
|
77b5d4c772
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
|
2014-01-21 17:52:13 +08:00 |
samuele3hu
|
2338d773dc
|
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
|
2014-01-21 17:51:49 +08:00 |
samuele3hu
|
88be8606b9
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf
|
2014-01-21 16:46:28 +08:00 |
samuele3hu
|
da8e208f47
|
close #3802: Add some manual lua-binding functions for the Lable and update the related test cases
|
2014-01-21 16:36:29 +08:00 |
Dhilan007
|
b8adba4c64
|
fix crash cause by string(null).
|
2014-01-21 11:59:43 +08:00 |
James Chen
|
e5f723774d
|
Updates jsbindings and localStorage.
|
2014-01-20 22:45:40 +08:00 |
CocosRobot
|
47c8243812
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-18 19:53:43 +00:00 |
edwardzhou
|
86e102ab16
|
fix namespace in spine lua manual binding
|
2014-01-18 10:58:17 +08:00 |
James Chen
|
3c74044929
|
Merge pull request #5117 from samuele3hu/test-rebase
close #3626:Add the “override “ keyword
|
2014-01-17 18:49:33 -08:00 |
samuele3hu
|
9d040ff09c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase
|
2014-01-17 22:23:57 +08:00 |
samuele3hu
|
85539e7548
|
issue #3626:Add the “override “ keyword
|
2014-01-17 22:20:21 +08:00 |
CocosRobot
|
d485ade977
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-17 14:14:30 +00:00 |
James Chen
|
8eca8e25cb
|
Merge pull request #5099 from samuele3hu/test-rebase
close #3626:Make lua bindings-generator support the namespace binding
|
2014-01-17 06:07:45 -08:00 |
CocosRobot
|
0c777b0d85
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-17 06:11:22 +00:00 |
Ricardo Quesada
|
d0dbf34319
|
removes "include "cocos2d.h" from cocos2d files
|
2014-01-16 21:35:58 -08:00 |
samuele3hu
|
cf857aade2
|
issue #3626:Modify some files that skipped some modifications because of merge
|
2014-01-17 11:22:03 +08:00 |
samuele3hu
|
d086f7a259
|
issue #3626:Add the deprecated support for the tolua.cast
|
2014-01-17 10:19:57 +08:00 |
samuele3hu
|
31339d10e5
|
issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script
|
2014-01-17 10:19:57 +08:00 |
samuele3hu
|
d49e28610b
|
issue #3626:Resolve the error that the lua binding of the EventListenerAcceleration and the EventListenerCustom have been bound two times
|
2014-01-17 10:19:56 +08:00 |
samuele3hu
|
35d031ea06
|
issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module
|
2014-01-17 10:19:56 +08:00 |
samuele3hu
|
de698aaea7
|
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
|
2014-01-17 10:19:55 +08:00 |
samuele3hu
|
811aa69d39
|
issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases
|
2014-01-17 10:19:55 +08:00 |
samuele3hu
|
fdac224a7b
|
issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace
|
2014-01-17 10:19:55 +08:00 |
samuele3hu
|
510fce7b12
|
issue #3626:Add namespace’s support for manual lua binding of functions about physics
|
2014-01-17 10:19:55 +08:00 |
samuele3hu
|
b72f309076
|
issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases
|
2014-01-17 10:19:54 +08:00 |
CocosRobot
|
beb7015d7e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-16 02:43:13 +00:00 |
James Chen
|
2e7516c582
|
Merge pull request #5041 from Dhilan007/develop_label
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
|
2014-01-15 18:37:40 -08:00 |
Dhilan007
|
68eddf3cd7
|
fix compiling error
|
2014-01-15 17:29:07 +08:00 |
boyu0
|
a5c26b7da9
|
issue #3401: add physics action and pump test for lua.
|
2014-01-15 13:52:24 +08:00 |
CocosRobot
|
3b208337fe
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-15 02:39:20 +00:00 |
CocosRobot
|
82797d8434
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-15 01:37:15 +00:00 |
boyu0
|
de30a9cfea
|
issue #3401: add lua physics slide test, add more banding code, and fix some bugs.
|
2014-01-14 15:48:44 +08:00 |
CocosRobot
|
c49aa1f125
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-13 23:07:44 +00:00 |
Dhilan007
|
69c004108b
|
issue#3630:Adjust some method for more easily create and change type.
|
2014-01-11 22:33:07 +08:00 |
CocosRobot
|
b10783972f
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-11 04:39:03 +00:00 |
CocosRobot
|
f76fcf7f2a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-11 04:06:53 +00:00 |
Ricardo Quesada
|
c88f81481b
|
JSB compiles OK
|
2014-01-10 19:22:04 -08:00 |
CocosRobot
|
8b350cb20a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-10 03:14:18 +00:00 |
James Chen
|
2ce23dca2a
|
Merge pull request #5015 from samuele3hu/developNewUI
closed #3643:Lua websocket can't receive more than 64 bytes of data
|
2014-01-09 02:12:49 -08:00 |
samuele3hu
|
2cbe502113
|
issue #3643:Lua websocket can't receive more than 64 bytes of data
|
2014-01-09 17:23:22 +08:00 |
CocosRobot
|
c60681c556
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 09:17:11 +00:00 |
CocosRobot
|
ce0b86e7fe
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 06:56:48 +00:00 |
CocosRobot
|
2945322b97
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 04:50:38 +00:00 |
CocosRobot
|
746a360176
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 03:37:44 +00:00 |
CocosRobot
|
e66468025d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 02:59:53 +00:00 |
minggo
|
6529380b77
|
Merge pull request #4988 from dumganhar/develop
If this.ctor was not found, output a log.
|
2014-01-07 06:41:53 -08:00 |
James Chen
|
65b5a7c031
|
If this.ctor was not found, output a log.
|
2014-01-07 22:39:14 +08:00 |
James Chen
|
20f2f7255e
|
Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 06:28:04 -08:00 |
CocosRobot
|
a650ddf88b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 14:27:34 +00:00 |
samuele3hu
|
a61f9fce27
|
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
|
2014-01-07 22:16:07 +08:00 |
CocosRobot
|
6fd72db513
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 13:28:43 +00:00 |
James Chen
|
54cbfe938b
|
Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 02:41:53 -08:00 |
CocosRobot
|
ab84228037
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 10:40:28 +00:00 |
James Chen
|
18963b46f5
|
Merge pull request #4971 from Dhilan007/develop_crash
update liblua vs project for add miss file.
|
2014-01-07 02:31:58 -08:00 |
Dhilan007
|
ba4833e070
|
update liblua vs project for add miss file.
|
2014-01-07 18:30:12 +08:00 |
James Chen
|
ac3697db19
|
fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS?
|
2014-01-07 18:28:46 +08:00 |
James Chen
|
5391024399
|
Adds override keyword.
|
2014-01-07 18:27:04 +08:00 |
CocosRobot
|
6967caeff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:47:05 +00:00 |
CocosRobot
|
7e142d79f7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:05:07 +00:00 |
James Chen
|
d733556270
|
Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 00:00:19 -08:00 |
James Chen
|
49ca35fc3d
|
Merge pull request #4956 from dumganhar/move-temp-obj
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
|
2014-01-06 23:58:42 -08:00 |
CocosRobot
|
f8e7f570f3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 07:54:58 +00:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
James Chen
|
2a3481f20c
|
Moves temp files to CURRENT_BINARY_DIR.
|
2014-01-06 23:44:36 -08:00 |
Zhe Wang
|
9b6027d284
|
Merge pull request #4947 from walzer/develop
udpate copyrights for the new year 2014 and Chukong.
|
2014-01-06 19:50:18 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
CocosRobot
|
641255e3ef
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 03:25:39 +00:00 |
boyu0
|
f7c88a8134
|
issue #3401: update cmake project set
|
2014-01-07 11:09:40 +08:00 |
boyu0
|
8e64ef6d6d
|
issue #3401: add physics lua auto generate to android.mk
|
2014-01-07 10:20:59 +08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
samuele3hu
|
c553fd2b73
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 10:10:17 +08:00 |
samuele3hu
|
01013195d3
|
Fix:Resolve the release lua test sample compile error
|
2014-01-07 10:08:58 +08:00 |
boyu0
|
eaa3041a97
|
issue #3401: physical lua banding script, add testlua->physics test
|
2014-01-06 22:19:40 +08:00 |
James Chen
|
1bd0f90437
|
Warning fix in js_manual_conversions.cpp/h
|
2014-01-06 20:02:01 +08:00 |
CocosRobot
|
cc4bee319c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-05 10:43:05 +00:00 |
CocosRobot
|
5f8d4f867c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-05 05:52:52 +00:00 |
CocosRobot
|
f44775b581
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 14:05:19 +00:00 |
CocosRobot
|
0b2926cb70
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 11:09:00 +00:00 |
samuele3hu
|
362c1dc0ea
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 18:37:34 +08:00 |
samuele3hu
|
465aba951c
|
Fix:Remove the ScollView and TableView of extension gui lua binding
|
2014-01-04 18:36:33 +08:00 |
CocosRobot
|
c793f2e0fc
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 10:19:07 +00:00 |
samuele3hu
|
70ee13e2e1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 15:46:27 +08:00 |
samuele3hu
|
0550ec33ad
|
Fix:Resolve the bugs that some lua test cases can’t run
|
2014-01-04 15:46:04 +08:00 |
CocosRobot
|
ad11468b7b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 07:40:50 +00:00 |
James Chen
|
98346474b8
|
Merge pull request #4863 from Dhilan007/develop_crash
fix compiling error and miss file on vs.
|
2014-01-03 20:41:19 -08:00 |
Dhilan007
|
35246b0810
|
fix compiling error and miss file on vs.
|
2014-01-04 12:25:12 +08:00 |
CocosRobot
|
e42f721c6b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 04:22:17 +00:00 |
CocosRobot
|
d29cdb5b52
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 03:58:44 +00:00 |
CocosRobot
|
0ed307a583
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 02:58:59 +00:00 |
James Chen
|
f3eb21e748
|
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
|
2014-01-03 18:51:16 -08:00 |
James Chen
|
61af958976
|
closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings.
|
2014-01-04 10:32:04 +08:00 |
James Chen
|
baeacaddfc
|
closed #3579: Bug fix in setTouchEnabledForLayer for luabindings.
Also fixed lua module error.
|
2014-01-04 10:30:11 +08:00 |
CocosRobot
|
54ee3392fc
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 01:40:17 +00:00 |
Dhilan007
|
e017609fc4
|
fix compiling error in jsb_cocos2dx_studio_manual.cpp on android.
|
2014-01-03 23:59:05 +08:00 |
Dhilan007
|
b6e676caa4
|
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
|
2014-01-03 23:03:48 +08:00 |
Dhilan007
|
b4d392dc38
|
update js binding for studio change.
|
2014-01-03 21:33:48 +08:00 |
CocosRobot
|
126c315673
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-03 11:32:54 +00:00 |
CocosRobot
|
37c8b03253
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-03 08:37:25 +00:00 |
James Chen
|
5346677a47
|
Merge pull request #4825 from samuele3hu/developNewUI
Update the lua test cases about the armature
|
2014-01-03 00:29:24 -08:00 |
Dhilan007
|
8e2c51d31e
|
update vs project for split spine binding.
|
2014-01-03 15:29:50 +08:00 |
samuele3hu
|
a72cf0428c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 14:53:15 +08:00 |
samuele3hu
|
2b19da00df
|
Update the lua test cases about the armature
|
2014-01-03 14:51:36 +08:00 |
CocosRobot
|
0661d87cdb
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-03 05:02:28 +00:00 |
samuele3hu
|
53f2415fcf
|
Resolve the android compile error
|
2014-01-03 11:29:56 +08:00 |
samuele3hu
|
51e3e3fd1b
|
Resolve the android and linux compile error
|
2014-01-03 11:15:46 +08:00 |
samuele3hu
|
bfc7441453
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 10:51:05 +08:00 |
samuele3hu
|
cdc82d6e8c
|
Add a newline
|
2014-01-03 10:50:06 +08:00 |
samuele3hu
|
c4588722dd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 10:41:03 +08:00 |
samuele3hu
|
07a3efb585
|
Update the lua test cases about the GUI
|
2014-01-03 10:39:19 +08:00 |
James Chen
|
04760f2508
|
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
|
2014-01-03 10:30:55 +08:00 |
James Chen
|
831e0b08e0
|
Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
|
2014-01-02 06:46:25 -08:00 |
CocosRobot
|
c120394cae
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 14:20:27 +00:00 |
James Chen
|
e337fb35fc
|
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
|
2014-01-02 21:59:47 +08:00 |
minggo
|
d345139a08
|
fix compiling errors
|
2014-01-02 21:53:18 +08:00 |
minggo
|
674b38beef
|
no in header file
|
2014-01-02 21:43:27 +08:00 |
minggo
|
2b5be1bacf
|
Merge pull request #4801 from minggo/namespace
fix compiling errors because of new namespace of network module
|
2014-01-02 04:03:03 -08:00 |
minggo
|
9124f189c3
|
fix compiling errors because of new namespace of network module
|
2014-01-02 19:44:46 +08:00 |
CocosRobot
|
1c5638ad4f
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 11:36:25 +00:00 |
James Chen
|
c29e328490
|
Merge pull request #4779 from samuele3hu/DispatcherBak1
Develop branch adds lua trigger for CocoStudio
|
2014-01-02 00:29:30 -08:00 |
James Chen
|
67c5ba8dfb
|
closed #3565: Adds missing `lua_pop`to prevent lua stack issues.
|
2014-01-02 16:21:35 +08:00 |
Kenneth Chan
|
80df88d2cf
|
Add missing bindings to setBlendFunc for various classes
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
|
2014-01-02 16:21:35 +08:00 |
samuele3hu
|
d802518413
|
Rename Cocos2dStudio.lua to CocoStudio.lua
|
2014-01-02 15:51:25 +08:00 |
samuele3hu
|
a2b706c87c
|
Rename some common script files to keep consistent
|
2014-01-02 15:18:32 +08:00 |
CocosRobot
|
c6425172b7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 06:58:15 +00:00 |
CocosRobot
|
ada5eb82ec
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 06:49:06 +00:00 |
James Chen
|
dd54e906f0
|
ccs.XXX —> ccui.XXX for gui js bindings.
|
2014-01-02 14:21:24 +08:00 |
samuele3hu
|
b8d4010ae5
|
Develop branch adds lua trigger for CocoStudio
|
2014-01-02 12:00:37 +08:00 |
boyu0
|
0a06d93328
|
issue #3401: physical lua banding script and auto script
|
2014-01-02 11:45:11 +08:00 |
CocosRobot
|
ff550bf865
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-01 13:49:57 +00:00 |
James Chen
|
8c1c9fef15
|
Bug fix in cc.VisibleRect
|
2013-12-31 18:17:20 +08:00 |
James Chen
|
74a7f68dc1
|
[JSB] Adds cc.VisibleRect.
|
2013-12-31 18:12:42 +08:00 |
CocosRobot
|
2555318c13
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-31 03:36:47 +00:00 |
CocosRobot
|
674804f1b4
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-30 13:49:19 +00:00 |
James Chen
|
1d8ee016e5
|
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
closed #2050: fix tilemap firstgid bug
|
2013-12-30 05:42:19 -08:00 |
James Chen
|
edb2ad0933
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
Conflicts:
cocos/editor-support/cocostudio/TriggerMng.cpp
|
2013-12-30 21:06:57 +08:00 |
James Chen
|
165e6c2a78
|
Adds an empty LuaEngine::parseConfig function.
|
2013-12-30 21:04:00 +08:00 |
James Chen
|
1edf748dc3
|
[JSB] Adds trigger bindings for CocoStudio.
|
2013-12-30 20:57:46 +08:00 |
minggo
|
714af52e0c
|
Merge pull request #4732 from Dhilan007/update_vs_project
fix compiling error on liblua VS 2012 project
|
2013-12-29 23:24:01 -08:00 |
Dhilan007
|
30b3a6f8c3
|
fix compiling error on liblua VS 2012 project
|
2013-12-30 14:21:32 +08:00 |
CocosRobot
|
a269fba371
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-30 05:58:34 +00:00 |
boyu0
|
1f72fafd08
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
|
2013-12-30 12:30:59 +08:00 |
CocosRobot
|
203b0f183e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-28 06:59:45 +00:00 |
CocosRobot
|
2051041df7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-27 13:12:17 +00:00 |
James Chen
|
0d16f7bc3b
|
Merge pull request #4712 from dumganhar/cocostudio-test
Merge PR #4672: We need to replace trigger system by EventDispatcher in future.
|
2013-12-27 05:05:41 -08:00 |
James Chen
|
b03c8259b1
|
Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test
Conflicts:
cocos/scripting/auto-generated
|
2013-12-27 20:18:58 +08:00 |
samuele3hu
|
aa0eb36071
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
|
2013-12-27 20:08:09 +08:00 |
samuele3hu
|
30439e4689
|
Improve the coding style
|
2013-12-27 20:07:00 +08:00 |
James Chen
|
bf881f3ac0
|
Merge pull request #4691 from samuele3hu/DispatcherBak1
Reconstruct the operation of handling lua script event
|
2013-12-27 03:58:08 -08:00 |
CocosRobot
|
0116866e58
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-27 10:16:22 +00:00 |
CocosRobot
|
68cf83ee7d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-27 09:55:01 +00:00 |
chengstory
|
faaf6d3f2b
|
fixed #3457 fixes some bug.
|
2013-12-27 17:21:13 +08:00 |
samuele3hu
|
ee7aa0f077
|
Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug
|
2013-12-27 12:05:12 +08:00 |
samuele3hu
|
d51440f62a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
|
2013-12-27 11:17:11 +08:00 |
samuele3hu
|
6d9e865f15
|
Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong
|
2013-12-27 10:35:44 +08:00 |
CocosRobot
|
edeeae4ff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 14:48:08 +00:00 |
James Chen
|
17ff6ef764
|
Renames: IntValueMap —> ValueMapIntKey
|
2013-12-26 22:07:20 +08:00 |
James Chen
|
93ed5a4f0f
|
long --> ssize_t for TableView callback.
|
2013-12-26 04:09:24 -08:00 |
samuele3hu
|
756a72cbca
|
Reconstruct the operation of handling lua script event
|
2013-12-26 19:43:49 +08:00 |
CocosRobot
|
50a379b8f0
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 09:04:04 +00:00 |
CocosRobot
|
09996ea82c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 08:20:26 +00:00 |
James Chen
|
5dfb7f321a
|
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
|
2013-12-26 16:03:30 +08:00 |
CocosRobot
|
e6727ea087
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 02:50:37 +00:00 |
CocosRobot
|
6492f61691
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 10:34:46 +00:00 |
samuele3hu
|
7c3978bdd8
|
Add missing file for linux lua binding
|
2013-12-25 17:42:59 +08:00 |
samuele3hu
|
a2c5881699
|
Add include_directories for spine
|
2013-12-25 17:22:14 +08:00 |
samuele3hu
|
1075a711e0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 16:58:19 +08:00 |
samuele3hu
|
9cf45a292b
|
Delete some annotated statement about spine and add some reserve manual lua binding functions
|
2013-12-25 16:42:40 +08:00 |
CocosRobot
|
c71cd5a407
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 06:39:38 +00:00 |
samuele3hu
|
9fd64df099
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 13:48:10 +08:00 |
samuele3hu
|
45cfe00ec4
|
Modify iOS project set and some manual lua binding
|
2013-12-25 13:47:22 +08:00 |
CocosRobot
|
9aa48cac37
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 03:49:23 +00:00 |
James Chen
|
0ff85852cc
|
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
|
2013-12-24 18:08:40 +08:00 |
CocosRobot
|
c3b7406b43
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 09:00:04 +00:00 |
James Chen
|
d33b2c41c7
|
Merge branch 'develop' into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-24 16:24:17 +08:00 |
samuele3hu
|
e497f823ea
|
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
|
2013-12-24 16:14:10 +08:00 |
CocosRobot
|
3875d89ce6
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 07:31:29 +00:00 |
James Chen
|
451d76f6b0
|
Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
|
2013-12-23 22:55:58 -08:00 |
CocosRobot
|
4775b4c4d8
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 06:33:43 +00:00 |
CocosRobot
|
c170559759
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 05:59:50 +00:00 |
samuele3hu
|
7f4e384886
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-24 13:43:57 +08:00 |
samuele3hu
|
98e4e802f4
|
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
|
2013-12-24 13:42:32 +08:00 |
Edward Zhou
|
4082c86070
|
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
|
2013-12-24 11:55:53 +08:00 |
CocosRobot
|
e50b6b616b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 03:45:37 +00:00 |
James Chen
|
325f2e21a7
|
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
|
2013-12-24 10:41:45 +08:00 |
CocosRobot
|
d22f2aaf67
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 02:28:17 +00:00 |
CocosRobot
|
a9d8a64e63
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 14:10:01 +00:00 |
James Chen
|
05f6a5b09b
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
|
2013-12-23 22:05:20 +08:00 |
James Chen
|
44f9009a5d
|
Merge pull request #4610 from dumganhar/lastest-js-test
Updates JS-test to the latest version and some binding fixes
|
2013-12-23 06:04:49 -08:00 |
James Chen
|
3327614a99
|
Binds Node::setAnchorPoint manually.
|
2013-12-23 21:54:02 +08:00 |
CocosRobot
|
cc7aa1ee0d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 13:45:59 +00:00 |
James Chen
|
6b73fa570e
|
Merge pull request #4601 from samuele3hu/toluaerror
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
|
2013-12-23 05:40:15 -08:00 |
samuele3hu
|
b1dd233a04
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-23 20:30:33 +08:00 |
samuele3hu
|
48a95cfa55
|
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
|
2013-12-23 20:29:05 +08:00 |
James Chen
|
cafebe7295
|
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-12-23 20:28:51 +08:00 |
James Chen
|
3096c34311
|
Removes unneeded binding glue codes, Sprite::setPosition.
|
2013-12-23 20:25:46 +08:00 |
CocosRobot
|
2efe4b7420
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 12:14:14 +00:00 |
CocosRobot
|
509d4513eb
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 11:48:15 +00:00 |
James Chen
|
eb9cb237d5
|
Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
closed #3480: Removes unneeded codes of override function.
|
2013-12-23 03:43:27 -08:00 |