CocosRobot
|
8aac938531
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-01 07:42:11 +00:00 |
CocosRobot
|
6eb6809b2c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-01 06:52:31 +00:00 |
James Chen
|
db6bce4cf0
|
Merge pull request #4023 from samuele3hu/developHttp
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-31 20:40:29 -07:00 |
James Chen
|
3a8c052ae5
|
Merge pull request #4039 from dumganhar/spv25
issue #2826: Bug fix of 'js::IsInRequest'
|
2013-10-31 19:56:09 -07:00 |
James Chen
|
baccf828f3
|
closed #2826: Removing js::IsInRequest in ScriptingCore.cpp for win32.
|
2013-11-01 10:45:01 +08:00 |
James Chen
|
074f688d95
|
Merge pull request #4030 from dumganhar/spv25
[sp v25] Updating SpiderMonkey library to FFv25.
|
2013-10-31 07:08:09 -07:00 |
samuelhu
|
4031556398
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
|
2013-10-31 21:57:24 +08:00 |
samuelhu
|
5891f00967
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-31 21:52:28 +08:00 |
James Chen
|
8884c58ac1
|
issue #2826: Updating ScriptingCore.cpp. runScript small fix.
|
2013-10-31 21:03:06 +08:00 |
samuelhu
|
7c45ddafe2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-31 17:22:14 +08:00 |
James Chen
|
4b2429186c
|
closed #3093: The last test of OpenglTest crashes on Windows.
|
2013-10-31 16:27:00 +08:00 |
samuelhu
|
de4b4dcc73
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge
|
2013-10-31 15:23:25 +08:00 |
samuelhu
|
faf3b30e9b
|
issue #3069:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:20:53 +08:00 |
James Chen
|
f478e2d2a5
|
issue #2826: Bug fixes for win32.
|
2013-10-31 15:15:52 +08:00 |
James Chen
|
6f978c5cbd
|
issue #2826: Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro.
|
2013-10-31 15:13:49 +08:00 |
dingpinglv
|
7e8faed7af
|
fixed #3048: rename some comments
|
2013-10-31 14:36:17 +08:00 |
dingpinglv
|
f172abbc14
|
fixed #3048: add some comments for cc.rect
|
2013-10-31 14:31:25 +08:00 |
dingpinglv
|
c116d070d3
|
Closed #3048: cc.rect can receiving different type parameters now
|
2013-10-31 14:16:42 +08:00 |
James Chen
|
0f7a99f898
|
[sp v25] Don't use 'using namespace std;' to make android build happy.
|
2013-10-31 11:15:18 +08:00 |
James Chen
|
541a0478ac
|
[sp v25] Removing unused comments in main.js
|
2013-10-31 11:15:18 +08:00 |
James Chen
|
d2fc29dbfa
|
[sp v25] Updating Debugger script.
|
2013-10-31 11:15:17 +08:00 |
James Chen
|
a81998ccf6
|
[sp v25] Debugger script, loading file is ok.
|
2013-10-31 11:15:17 +08:00 |
James Chen
|
d1b88b0a78
|
[sp v25] Updating auto-generated and bindings-generated submodules.
|
2013-10-31 11:15:17 +08:00 |
James Chen
|
3b86d6398f
|
[sp v25] Fixing complication errors after updating Spidermonkey to v25.
|
2013-10-31 11:15:17 +08:00 |
samuelhu
|
1f07a659a6
|
issue #3069:Modify layer lua register and add some compatible lua binding functions
|
2013-10-31 09:49:04 +08:00 |
samuelhu
|
c08a09a7e0
|
#3049:Add LICENSE_JSON4LUA and some constant values.
|
2013-10-30 10:52:04 +08:00 |
samuelhu
|
471bbb8af9
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 18:21:15 +08:00 |
samuelhu
|
b611177a65
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
|
2013-10-29 17:58:00 +08:00 |
samuelhu
|
70082ddc29
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 17:54:35 +08:00 |
James Chen
|
bb568e84e8
|
Updating auto generated binding codes.
|
2013-10-29 15:09:13 +08:00 |
samuelhu
|
3508213615
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-29 11:45:19 +08:00 |
samuelhu
|
a4d028e905
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 11:40:41 +08:00 |
James Chen
|
48ce5e39fe
|
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
|
2013-10-26 15:04:01 +08:00 |
James Chen
|
1339ef7ecb
|
[JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer.
|
2013-10-25 15:20:06 +08:00 |
James Chen
|
a56475e872
|
Updating jsb.
|
2013-10-25 10:53:46 +08:00 |
Dhilan007
|
56ef197146
|
update the reference to cocos2d-x repo.
|
2013-10-24 18:36:36 +08:00 |
Dhilan007
|
fd993e2fa2
|
issues #2905:split jsbinding module
|
2013-10-24 17:54:57 +08:00 |
samuelhu
|
d7689073e0
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-24 11:12:21 +08:00 |
samuelhu
|
26caaa0a36
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-23 09:57:21 +08:00 |
minggo
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +08:00 |
minggo
|
6a664d480a
|
issue #2905:samples build ok on linux
|
2013-10-22 18:01:56 +08:00 |
samuelhu
|
5f769b2313
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-22 16:52:44 +08:00 |
James Chen
|
feee6ca84b
|
Merge pull request #3978 from HoGarfield/cc.RESOLUTION_POLICY
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
|
2013-10-22 01:34:44 -07:00 |
samuelhu
|
be1f17ca0f
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-22 16:14:49 +08:00 |
garfield_ho
|
55d45081f6
|
Fixed name
|
2013-10-22 15:41:43 +08:00 |
Dhilan007
|
232f0d598b
|
issues #2905:add new vs project
|
2013-10-21 22:21:11 +08:00 |
Dhilan007
|
f11dba586a
|
issue #2905:modification vs-project for folder structure change
|
2013-10-21 22:09:21 +08:00 |
garfield_ho
|
54ac8f3537
|
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
|
2013-10-19 16:44:14 +08:00 |
dualface
|
8f2f524f2d
|
fix tolua_fix, cleanup peertable after object deleted
|
2013-10-18 11:30:28 +08:00 |
James Chen
|
39afa3b8df
|
Merge pull request #3967 from dumganhar/change-url
Changing the submodule URL for 'auto-generated'.
|
2013-10-17 19:00:36 -07:00 |
James Chen
|
8c0d7e151c
|
Updating the submodule reference of 'auto-generated'.
|
2013-10-18 10:02:47 +08:00 |
minggo
|
9c3cac759c
|
issue #2905:simple game and assets manager build ok on android
|
2013-10-17 18:39:37 +08:00 |
minggo
|
e50f9fc43b
|
issue #2905: jsbinding samples and lua binding samples build ok on android
|
2013-10-17 15:04:30 +08:00 |
minggo
|
8f9756f030
|
issue #2905:TestJavascript build ok on Android
|
2013-10-17 11:28:57 +08:00 |
James Chen
|
afe2b8e0c1
|
Update auto-generated submodule manually.
|
2013-10-16 17:37:34 +08:00 |
James Chen
|
225738ecc5
|
issue #2905: [iOS Mac] HelloLua and TestLua work now.
|
2013-10-16 17:19:02 +08:00 |
James Chen
|
352d1f6768
|
issue #2905: Renaming lua/cocos2dx_support to lua/bindings.
|
2013-10-16 16:40:07 +08:00 |
James Chen
|
6fba0dd5db
|
issue #2905: [iOS Mac] TestJavascript works now.
|
2013-10-16 15:43:59 +08:00 |
James Chen
|
f6275667bf
|
Removing unused ios projects.
|
2013-10-12 15:02:28 +08:00 |
James Chen
|
7de6646213
|
Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.
|
2013-10-12 14:56:40 +08:00 |
minggo
|
5acbe663e0
|
issue #2905: add missing files
|
2013-10-12 13:44:57 +08:00 |
minggo
|
ad6325b0dd
|
fix conflicts
|
2013-10-12 11:31:32 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |