samuele3hu
|
e2596bce8b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
Conflicts:
tools/tojs/cocos2dx.ini
tools/tolua/cocos2dx.ini
|
2014-02-20 17:20:51 +08:00 |
CocosRobot
|
01bd61839b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-20 07:38:05 +00:00 |
James Chen
|
e2cb0e3ba5
|
Reverts auto-generated submodule.
|
2014-02-20 15:14:55 +08:00 |
James Chen
|
0af0ce9032
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1
Conflicts:
cocos/scripting/auto-generated
|
2014-02-20 15:13:40 +08:00 |
samuele3hu
|
7b85ffcb82
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-20 15:11:56 +08:00 |
samuele3hu
|
514112921f
|
close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding
|
2014-02-20 15:10:34 +08:00 |
James Chen
|
f7c8eb8de2
|
Merge pull request #5394 from samuele3hu/developEventTrigger
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
|
2014-02-20 12:44:53 +08:00 |
CocosRobot
|
66906c3f66
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-20 03:38:12 +00:00 |
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
samuele3hu
|
e1387f40eb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-19 16:57:18 +08:00 |
CocosRobot
|
1f45dd4349
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 08:27:37 +00:00 |
samuele3hu
|
d7b0efd6d7
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-19 16:27:08 +08:00 |
samuele3hu
|
ce1656fa8d
|
fix: The lua binding of getPropertiesForGID would lead to compile error
|
2014-02-19 15:47:45 +08:00 |
samuele3hu
|
52a0b906da
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-19 13:58:15 +08:00 |
CocosRobot
|
4ecd7ba58d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 05:58:15 +00:00 |
samuele3hu
|
d28e8485ec
|
issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv
|
2014-02-19 13:56:06 +08:00 |
James Chen
|
e1a256d6f1
|
Merge pull request #5319 from samuele3hu/developDynamic
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
|
2014-02-19 13:52:08 +08:00 |
CocosRobot
|
97ff6c5bdf
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-18 08:04:14 +00:00 |
samuele3hu
|
5acb556c74
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-18 13:46:21 +08:00 |
samuele3hu
|
8cb424b535
|
close #3593:Add more test cases about SceneReader of cocoStudio
|
2014-02-18 13:44:11 +08:00 |
xingsenma
|
1ec2d35631
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103
|
2014-02-17 10:12:49 +08:00 |
CocosRobot
|
a5a8ff2d87
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-14 06:22:19 +00:00 |
James Chen
|
c7b1ab4525
|
Merge pull request #5362 from ucchen/develop
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
|
2014-02-14 14:17:33 +08:00 |
ucchen
|
185ed86214
|
fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment;
|
2014-02-14 13:24:56 +08:00 |
CocosRobot
|
104e0b4b29
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-14 03:24:11 +00:00 |
James Chen
|
78163e604e
|
Merge pull request #5358 from dumganhar/merge5343
closed #4037:Exposed the missing data structures of Spine to JS
|
2014-02-14 11:17:38 +08:00 |
James Chen
|
32012ee72a
|
Adds missing files for vs.
|
2014-02-14 10:53:30 +08:00 |
James Chen
|
79e7d218cb
|
Updates Android.mk
|
2014-02-14 10:37:50 +08:00 |
James Chen
|
2078f6de57
|
Updates CMakeLists.
|
2014-02-14 10:34:28 +08:00 |
James Chen
|
acefa4e237
|
Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343
|
2014-02-14 09:33:42 +08:00 |
CocosRobot
|
498a5e5b47
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-14 01:29:48 +00:00 |
xingsenma
|
4eecc7e56b
|
#3947 Simulate 'setTimeout' and 'setInterval' in JSB.
|
2014-02-13 13:54:05 +08:00 |
ucchen
|
2c961bdfbf
|
add spine manual binding;
|
2014-02-13 11:01:54 +08:00 |
Éloi Rivard
|
8adca38efa
|
Linux javascript bindings support.
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
|
2014-02-13 01:42:14 +01:00 |
chuanweizhang2013
|
d5aee5eb04
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
|
2014-02-11 18:08:14 +08:00 |
CocosRobot
|
29bae34bc3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-11 06:34:17 +00:00 |
chuanweizhang2013
|
e9dd3d828a
|
issue #3498: commit jsruntime
|
2014-02-10 18:15:30 +08:00 |
samuele3hu
|
67a48c2a85
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
|
2014-02-10 17:41:06 +08:00 |
samuele3hu
|
ba73217667
|
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
|
2014-02-10 15:03:53 +08:00 |
CocosRobot
|
12b5fba628
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-10 06:42:10 +00:00 |
James Chen
|
51ba0cbb17
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268
|
2014-02-10 14:09:57 +08:00 |
CocosRobot
|
4f54b36127
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-10 05:58:44 +00:00 |
James Chen
|
a05cd6fbb2
|
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311
|
2014-02-10 12:53:08 +08:00 |
James Chen
|
99c20c4e30
|
Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268
Conflicts:
tests/test-javascript/tests
|
2014-02-10 11:38:56 +08:00 |
Ricardo Quesada
|
1c4321304c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
|
2014-02-09 19:01:55 -08:00 |
Ricardo Quesada
|
ceba63db8b
|
Merge branch 'develop' into fast_tmx
|
2014-02-08 09:08:33 -08:00 |
hbb
|
f5d4dd4afe
|
remove the redundant check
ccbreader can load file without the owner setting
|
2014-02-08 19:12:33 +08:00 |
CocosRobot
|
c775681767
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-08 06:09:04 +00:00 |
James Chen
|
5163f1f78d
|
issue #3900: Updates debugger codes to Firefox v27. 'step into' works now. congratulations! ;)
|
2014-02-08 10:35:03 +08:00 |
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 |