CocosRobot
|
fd9ed15d6d
|
[AUTO]: updating luabinding automatically
|
2014-09-29 01:25:31 +00:00 |
minggo
|
9511f0deb5
|
Merge pull request #8130 from yestein/v3
Add Cocostudio Armature getOffsetPoints API for Lua
|
2014-09-28 16:48:37 +08:00 |
samuele3hu
|
6b2acf88fc
|
Modify CameraTest and update related lua-bindings files
|
2014-09-28 16:47:06 +08:00 |
samuele3hu
|
e50eaf684f
|
Add CameraTest and update related lua-bindings files
|
2014-09-28 14:31:58 +08:00 |
CocosRobot
|
021d21a2a7
|
[AUTO]: updating luabinding automatically
|
2014-09-26 15:37:17 +00:00 |
samuele3hu
|
2ac96ed06e
|
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
|
2014-09-26 16:39:54 +08:00 |
samuele3hu
|
691074eb7c
|
Add Camra3DTest and update sprite3DTest
|
2014-09-26 16:00:57 +08:00 |
CocosRobot
|
963c02eb3d
|
[AUTO]: updating luabinding automatically
|
2014-09-26 05:45:33 +00:00 |
samuele3hu
|
38530772ae
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 15:26:03 +08:00 |
samuele3hu
|
3e5638fe91
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua
|
2014-09-25 15:17:55 +08:00 |
samuele3hu
|
23fb2062c9
|
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
|
2014-09-25 15:05:42 +08:00 |
CocosRobot
|
7192681618
|
[AUTO]: updating luabinding automatically
|
2014-09-25 06:50:06 +00:00 |
samuele3hu
|
2cc48d1f81
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 10:40:31 +08:00 |
yestein
|
b19b2c5786
|
replace tab to 4 spaces
|
2014-09-24 15:14:47 +08:00 |
yestein
|
72c5d77273
|
Add Cocostudio Armature getOffsetPoints API for Lua
|
2014-09-24 11:20:36 +08:00 |
Dhilan007
|
077ffb2b43
|
update lua binding
|
2014-09-22 15:54:35 +08:00 |
samuele3hu
|
f0608a6d70
|
Update lua bindings for Mesh and add a Sprite3DHitTest
|
2014-09-22 15:29:38 +08:00 |
CocosRobot
|
7920ff425b
|
[AUTO]: updating luabinding automatically
|
2014-09-18 03:05:04 +00:00 |
CocosRobot
|
9b5d47c61e
|
[AUTO]: updating luabinding automatically
|
2014-09-17 03:35:46 +00:00 |
CocosRobot
|
b37659a448
|
[AUTO]: updating luabinding automatically
|
2014-09-16 09:16:17 +00:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
CocosRobot
|
526c28bea9
|
[AUTO]: updating luabinding automatically
|
2014-09-15 15:21:18 +00:00 |
minggo
|
7bb391ce55
|
Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
|
2014-09-15 13:43:27 +08:00 |
CocosRobot
|
8c7eb81271
|
[AUTO]: updating luabinding automatically
|
2014-09-15 01:50:32 +00:00 |
minggo
|
788f3c5c38
|
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
|
2014-09-15 09:36:36 +08:00 |
Dhilan007
|
51c19d4b06
|
update project for lua bindings of AudioEngine
|
2014-09-14 23:17:39 +08:00 |
Dhilan007
|
cf2a60898f
|
Lua bindings of AudioEngine.
|
2014-09-14 22:54:04 +08:00 |
andyque
|
02d2282b83
|
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
|
2014-09-12 17:07:06 +08:00 |
andyque
|
d4b2e8d154
|
remove deprecated warning
|
2014-09-12 17:06:13 +08:00 |
CocosRobot
|
29f9cbfd6a
|
[AUTO]: updating luabinding automatically
|
2014-09-12 08:15:54 +00:00 |
huangshiwu
|
8922121ed1
|
Deprecate DrawPrimitives and enhance DrawNode --make some modify
|
2014-09-12 07:33:34 +08:00 |
huangshiwu
|
d9634057ab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
|
2014-09-11 16:41:54 +08:00 |
huangshiwu
|
fb1d47900c
|
Deprecate DrawPrimitives and enhance DrawNode
|
2014-09-11 15:39:56 +08:00 |
CocosRobot
|
434d4fbfdd
|
[AUTO]: updating luabinding automatically
|
2014-09-11 07:11:40 +00:00 |
Ricardo Quesada
|
e46fa14be9
|
Fixes Xcode 6 warnings
|
2014-09-10 12:01:35 -07:00 |
CocosRobot
|
0e49107514
|
[AUTO]: updating luabinding automatically
|
2014-09-10 01:52:43 +00:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
andyque
|
6a4397a3eb
|
change toolset from 12.0 to 4.0
|
2014-09-09 15:57:21 +08:00 |
CocosRobot
|
ed8835d262
|
[AUTO]: updating luabinding automatically
|
2014-09-09 06:43:49 +00:00 |
minggo
|
2ba6e73212
|
Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097
[AUTO]: updating luabinding automatically
|
2014-09-09 14:20:16 +08:00 |
minggo
|
9373d096e8
|
Merge pull request #7969 from andyque/fixUI
deprecated ui::TextField getStringValue and setText, use getString and
|
2014-09-09 14:18:07 +08:00 |
andyque
|
83e14259ad
|
deprecated ui::TextField getStringValue and setText, use getString and
setString instead
|
2014-09-09 13:59:35 +08:00 |
CocosRobot
|
a2dcb71a24
|
[AUTO]: updating luabinding automatically
|
2014-09-09 02:53:20 +00:00 |
CocosRobot
|
af6b6bb7b9
|
[AUTO]: updating luabinding automatically
|
2014-09-09 02:32:49 +00:00 |
Ricardo Quesada
|
33a4cd396d
|
Adds missing xcshared data for missing projects
|
2014-09-05 14:32:14 -07:00 |
samuele3hu
|
6209530e66
|
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
|
2014-09-05 09:39:43 +08:00 |
samuele3hu
|
8c2ab3a4e7
|
Add manual lua bindings for GLView::getAllTouches
|
2014-09-04 22:12:59 +08:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +08:00 |
minggo
|
99f3b371ed
|
Merge pull request #7744 from lite3/customguireader
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
|
2014-09-04 10:53:00 +08:00 |
samuele3hu
|
45f08d54cb
|
Fix the member name error in the `vec4_to_luaval `
|
2014-09-03 15:07:31 +08:00 |
andyque
|
2e27a6865f
|
update project to vs2013
|
2014-09-03 14:10:38 +08:00 |
CocosRobot
|
ffb36d577e
|
[AUTO]: updating luabinding automatically
|
2014-09-03 03:29:43 +00:00 |
minggo
|
eee9ac626a
|
Merge pull request #7815 from andyque/mergeExtensionEditBox
merge extension EditBox to ui module
|
2014-09-03 11:25:10 +08:00 |
lite3
|
6ff1289aed
|
fix compile error on Xcode
|
2014-09-02 20:26:21 +08:00 |
andyque
|
dafbf28283
|
fix release mode compile error
|
2014-09-02 16:42:23 +08:00 |
andyque
|
fadfa87afd
|
fix vs2013 compile error
|
2014-09-02 16:42:04 +08:00 |
andyque
|
a429959e65
|
fix lua compile error
|
2014-09-02 01:31:02 -07:00 |
lite3
|
5d935c2cea
|
fix compile error on android
|
2014-09-02 16:16:36 +08:00 |
CocosRobot
|
dc15287ac3
|
[AUTO]: updating luabinding automatically
|
2014-09-02 05:45:07 +00:00 |
lite3
|
74d8bf6f27
|
fix
|
2014-09-02 10:51:17 +08:00 |
lite3
|
6d462c5013
|
fix ccs.CustomGUIReader not in ccs table
|
2014-08-30 12:23:03 +08:00 |
Ricardo Quesada
|
2c068cd1f5
|
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
Adds MARK: TODO: FIXME: in code
|
2014-08-29 12:55:14 -07:00 |
Ricardo Quesada
|
c149bfca00
|
Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
|
2014-08-29 12:54:24 -07:00 |
lite3
|
3872ee9b59
|
add CustomGUIReader for lua
|
2014-08-29 18:50:21 +08:00 |
CocosRobot
|
cdc41711f6
|
[AUTO]: updating luabinding automatically
|
2014-08-29 10:38:25 +00:00 |
minggo
|
826e1018cb
|
fix conflict
|
2014-08-29 16:55:09 +08:00 |
CocosRobot
|
3b3747d518
|
[AUTO]: updating luabinding automatically
|
2014-08-29 08:12:40 +00:00 |
minggo
|
1dcdbca4e0
|
revert lua-bindings
|
2014-08-29 15:54:20 +08:00 |
minggo
|
e4920ffdea
|
fix conflict
|
2014-08-29 15:45:21 +08:00 |
minggo
|
3679d66c8e
|
remove unneeded includes
|
2014-08-29 15:39:52 +08:00 |
CocosRobot
|
ebe75e702a
|
[AUTO]: updating luabinding automatically
|
2014-08-28 08:58:52 +00:00 |
CocosRobot
|
31a9997922
|
[AUTO]: updating luabinding automatically
|
2014-08-28 02:15:00 +00:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
minggo
|
7ece79e7d3
|
Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963
[AUTO]: updating luabinding automatically
|
2014-08-25 11:01:27 +08:00 |
CocosRobot
|
5db16cdc23
|
[AUTO]: updating luabinding automatically
|
2014-08-25 02:34:32 +00:00 |
samuele3hu
|
c495e5266a
|
Remove useless win32 module project and adjust the related project setting
|
2014-08-25 09:59:50 +08:00 |
samuele3hu
|
1126e950b2
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
|
2014-08-25 09:52:48 +08:00 |
samuele3hu
|
281da9f1d7
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
|
2014-08-25 09:51:08 +08:00 |
samuele3hu
|
25aab05b1f
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform
|
2014-08-25 09:48:14 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
CocosRobot
|
899e0a4182
|
[AUTO]: updating luabinding automatically
|
2014-08-22 11:25:33 +00:00 |
samuele3hu
|
70cba1f64a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
cocos/Android.mk
|
2014-08-22 14:01:17 +08:00 |
samuele3hu
|
2f60e610a2
|
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
|
2014-08-22 13:49:21 +08:00 |
andyque
|
13003fe0a6
|
add deprecated options for ui, add Scale9Sprite bindings
|
2014-08-22 11:56:13 +08:00 |
minggo
|
cdd67be77a
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
CocosRobot
|
4236e89245
|
[AUTO]: updating luabinding automatically
|
2014-08-18 15:26:32 +00:00 |
CocosRobot
|
85d505b427
|
[AUTO]: updating luabinding automatically
|
2014-08-18 14:47:35 +00:00 |
samuele3hu
|
91fd40dd3a
|
Add a newline for some files
|
2014-08-18 15:27:54 +08:00 |
samuele3hu
|
2d8ae3a917
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
|
2014-08-18 15:08:04 +08:00 |
samuele3hu
|
e0168c373c
|
Add manual lua bindings for 3d and adjust related test case on different platform
|
2014-08-18 15:04:32 +08:00 |
CocosRobot
|
bdfc48b127
|
[AUTO]: updating luabinding automatically
|
2014-08-15 07:44:57 +00:00 |
CocosRobot
|
24f0e8aada
|
[AUTO]: updating luabinding automatically
|
2014-08-15 07:23:17 +00:00 |
minggo
|
3f2fccb999
|
Merge pull request #7771 from samuele3hu/v3_3_module
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 18:33:53 +08:00 |
samuele3hu
|
85ad4241a0
|
Modify Xcode project setting
|
2014-08-14 11:10:52 +08:00 |
CocosRobot
|
6467dcaa57
|
[AUTO]: updating luabinding automatically
|
2014-08-14 02:17:25 +00:00 |
minggo
|
d76724b6aa
|
Merge pull request #7773 from CocosRobot/update_lua_bindings_1407980273
[AUTO]: updating luabinding automatically
|
2014-08-14 09:43:08 +08:00 |
CocosRobot
|
7a99220aad
|
[AUTO]: updating luabinding automatically
|
2014-08-14 01:39:44 +00:00 |
minggo
|
f1ae73bf30
|
Merge pull request #7766 from samuele3hu/v3_3_fix
Add release_print lua binding
|
2014-08-14 09:35:16 +08:00 |
samuele3hu
|
032f5ea781
|
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 00:06:28 +08:00 |
CocosRobot
|
df7c0ae1cb
|
[AUTO]: updating luabinding automatically
|
2014-08-13 06:42:14 +00:00 |
samuele3hu
|
8ab7647b54
|
Add release_print lua bindings
|
2014-08-13 10:27:06 +08:00 |
CocosRobot
|
cbbe7b9c60
|
[AUTO]: updating luabinding automatically
|
2014-08-12 02:08:16 +00:00 |
minggo
|
43a3603a8b
|
Merge pull request #7720 from samuele3hu/v3_module
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
|
2014-08-11 15:01:28 +08:00 |
samuele3hu
|
3c3c05204f
|
Split files in lua-bindings/script into different module and adjust related project
|
2014-08-11 12:54:30 +08:00 |
samuele3hu
|
47c034af5d
|
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
|
2014-08-11 10:25:40 +08:00 |
CocosRobot
|
3d222ab73a
|
[AUTO]: updating luabinding automatically
|
2014-08-11 01:31:04 +00:00 |
samuele3hu
|
2dacbf6f26
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-08-08 16:59:33 +08:00 |
samuele3hu
|
8919ebc011
|
Add build all lualibs target for iOS and Mac
|
2014-08-08 16:08:24 +08:00 |
CocosRobot
|
aa68a63757
|
[AUTO]: updating luabinding automatically
|
2014-08-08 02:49:17 +00:00 |
samuele3hu
|
201b33b465
|
Set intermediate directory for related lua bindings projects on win32 platform
|
2014-08-08 09:40:13 +08:00 |
samuele3hu
|
53eb0345a5
|
Remove useless library for cocos2d_lua_bindings
|
2014-08-07 16:15:42 +08:00 |
CocosRobot
|
91b297b085
|
[AUTO]: updating luabinding automatically
|
2014-08-07 02:40:46 +00:00 |
CocosRobot
|
f47d11cce0
|
[AUTO]: updating luabinding automatically
|
2014-08-06 09:14:13 +00:00 |
samuele3hu
|
497847f7e8
|
Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files.
|
2014-08-06 14:46:30 +08:00 |
samuele3hu
|
0daa30419b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
|
2014-08-06 00:37:19 +08:00 |
samuele3hu
|
6f763917a7
|
Delte liblua project for win32 and adjust cocos2d-win32 project
|
2014-08-06 00:26:02 +08:00 |
samuele3hu
|
4d4d5374df
|
Delete Android.mk for cocos_lua_static
|
2014-08-06 00:18:56 +08:00 |
samuele3hu
|
99c52f0102
|
Split module for Linux on Lua and adjust related test cases
|
2014-08-06 00:15:44 +08:00 |
samuele3hu
|
d86a37110d
|
Split module for win32 and adjust related test cases
|
2014-08-05 19:46:13 +08:00 |
CocosRobot
|
24da61e443
|
[AUTO]: updating luabinding automatically
|
2014-08-05 05:35:12 +00:00 |
samuele3hu
|
da18657f4f
|
Add module Android.mk config and adjust related test cases
|
2014-08-05 13:29:54 +08:00 |
CocosRobot
|
f3e2ebf215
|
[AUTO]: updating luabinding automatically
|
2014-08-05 03:57:51 +00:00 |
CocosRobot
|
8dd1be5172
|
[AUTO]: updating luabinding automatically
|
2014-08-05 02:05:02 +00:00 |
samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
samuele3hu
|
e5f9c1b488
|
Adjust common script and related test cases
|
2014-08-04 15:22:07 +08:00 |
samuele3hu
|
6f4cafcc1b
|
Add module register functions and adjust iOS and Mac test cases
|
2014-08-04 09:39:42 +08:00 |
CocosRobot
|
fda11428bf
|
[AUTO]: updating luabinding automatically
|
2014-08-01 07:53:19 +00:00 |
CocosRobot
|
26c76f5cf1
|
[AUTO]: updating luabinding automatically
|
2014-08-01 04:02:13 +00:00 |
samuele3hu
|
a47e52b5bc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-07-31 15:22:46 +08:00 |
samuele3hu
|
9666f1ad7f
|
Split luabindings module to some independent modules
|
2014-07-31 15:20:23 +08:00 |
CocosRobot
|
095d4ed3c5
|
[AUTO]: updating luabinding automatically
|
2014-07-31 05:49:25 +00:00 |
andyque
|
98ef180ca8
|
add default value to luaval_to_ulong
|
2014-07-29 15:59:49 +08:00 |
andyque
|
cfe7e57561
|
fix binding generator can nott regonize unsigned long arguments
|
2014-07-29 15:48:12 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
minggo
|
bf6e706ab9
|
fix xcode project setting
|
2014-07-28 15:37:00 +08:00 |
CocosRobot
|
12042bfd9d
|
[AUTO]: updating luabinding automatically
|
2014-07-28 03:38:12 +00:00 |
minggo
|
31af102f26
|
Merge pull request #7532 from lite3/object_to_luaval
replace dynamic_cast to std::is_base_of
|
2014-07-25 23:11:55 +08:00 |
samuele3hu
|
1d055fe6e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_retain
|
2014-07-25 09:44:52 +08:00 |
samuele3hu
|
e51cb57c53
|
Fix the a error in the `ccmap_string_key_to_luaval` functions
|
2014-07-25 09:44:17 +08:00 |
CocosRobot
|
8cc0a2eea3
|
[AUTO]: updating luabinding automatically
|
2014-07-24 14:23:49 +00:00 |
CocosRobot
|
283d727b76
|
[AUTO]: updating luabinding automatically
|
2014-07-23 06:21:31 +00:00 |
samuele3hu
|
0a6af2f758
|
Add more useful tip for error log
|
2014-07-23 13:44:57 +08:00 |
samuele3hu
|
6d678ce443
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion
|
2014-07-23 11:57:56 +08:00 |
samuele3hu
|
91fc288fbe
|
Add more useful tip for error log
|
2014-07-23 11:57:17 +08:00 |
CocosRobot
|
c8c17b68df
|
[AUTO]: updating luabinding automatically
|
2014-07-22 09:11:18 +00:00 |