minggo
|
7ef217ee4d
|
Merge pull request #7168 from andyque/fixListView
fix addEventListener hidden problem
|
2014-06-23 17:20:56 +08:00 |
andyque
|
dcc650a6f8
|
fix android compile error
|
2014-06-23 17:04:59 +08:00 |
samuele3hu
|
0d7c453878
|
Fix the error that lua binding for create function of Sequence would lead to endless loop
|
2014-06-23 16:38:35 +08:00 |
andyque
|
93319f3a3b
|
fix lua ui binding compile error
|
2014-06-23 14:56:41 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
CocosRobot
|
a3bee308f6
|
[AUTO]: updating luabinding automatically
|
2014-06-19 13:24:36 +00:00 |
minggo
|
190d6d4859
|
Merge pull request #7136 from CocosRobot/update_lua_bindings_1403162482
[AUTO]: updating luabinding automatically
|
2014-06-19 20:56:10 +08:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
chuanweizhang2013
|
be8775e314
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:23:36 +08:00 |
CocosRobot
|
c638cb8816
|
[AUTO]: updating luabinding automatically
|
2014-06-19 07:22:49 +00:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
zhangbin
|
1b056b6c49
|
Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
|
2014-06-18 17:06:56 +08:00 |
CocosRobot
|
155638f2de
|
[AUTO]: updating luabinding automatically
|
2014-06-18 06:10:38 +00:00 |
CocosRobot
|
d58d36d1c8
|
[AUTO]: updating luabinding automatically
|
2014-06-18 03:44:06 +00:00 |
minggo
|
246d6f12c9
|
Merge pull request #7047 from samuele3hu/v3_keypad_fix
Resolve the compile warning for Lua bindings project
|
2014-06-18 11:29:54 +08:00 |
CocosRobot
|
22e1d69f9f
|
[AUTO]: updating luabinding automatically
|
2014-06-17 13:24:08 +00:00 |
CocosRobot
|
657b90422d
|
[AUTO]: updating luabinding automatically
|
2014-06-17 05:53:04 +00:00 |
CocosRobot
|
30c91729eb
|
[AUTO]: updating luabinding automatically
|
2014-06-16 02:49:38 +00:00 |
samuele3hu
|
9b3b6c0e53
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-13 14:39:11 +08:00 |
samuele3hu
|
5b6330d59b
|
Add more conversion functions and manual binding functions
|
2014-06-13 14:10:08 +08:00 |
chuanweizhang2013
|
2eac73cde3
|
add protobuf win32
|
2014-06-13 11:19:04 +08:00 |
samuele3hu
|
27a3a46d62
|
Modify the implemetation of `LuaStack::executeScriptFile`
|
2014-06-12 15:39:59 +08:00 |
samuele3hu
|
5bdecadd70
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-12 14:09:00 +08:00 |
samuele3hu
|
c2288936db
|
Remove `handleStudioEventListener` of LuaEngine
|
2014-06-12 13:50:52 +08:00 |
samuele3hu
|
6c7b538ee1
|
Add deprecated support for the related UI addEventListener functions
|
2014-06-12 12:02:22 +08:00 |
samuele3hu
|
379db53673
|
Reconstruct the _sendRequest function of LuaMinXmlHttpRequest
|
2014-06-12 11:24:46 +08:00 |
samuele3hu
|
5349125ad0
|
Reconstruct the addEventListener for cocostudio ui control
|
2014-06-12 10:10:37 +08:00 |
samuele3hu
|
108c0d0da9
|
Modify ini files for bindings-generator to fix the compile warning
|
2014-06-12 10:08:58 +08:00 |
CocosRobot
|
818c478224
|
[AUTO]: updating luabinding automatically
|
2014-06-11 02:30:38 +00:00 |
samuele3hu
|
4ce2d7f193
|
Update values of KeyCode used in the Lua to fix related error
|
2014-06-11 10:10:11 +08:00 |
samuele3hu
|
46e5b72827
|
Add a log
|
2014-06-10 16:56:07 +08:00 |
samuele3hu
|
5aec5d4a83
|
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
|
2014-06-10 16:47:32 +08:00 |
samuele3hu
|
5a80b4da2e
|
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
|
2014-06-10 11:30:39 +08:00 |
CocosRobot
|
e2630f915d
|
[AUTO]: updating luabinding automatically
|
2014-06-09 07:30:49 +00:00 |
CocosRobot
|
e1a43d8ac4
|
[AUTO]: updating luabinding automatically
|
2014-06-09 07:20:59 +00:00 |
CocosRobot
|
638f7f12c5
|
[AUTO]: updating luabinding automatically
|
2014-06-09 03:15:50 +00:00 |
CocosRobot
|
c604c09069
|
[AUTO]: updating luabinding automatically
|
2014-06-09 01:46:34 +00:00 |
CocosRobot
|
b749d0b5ca
|
[AUTO]: updating luabinding automatically
|
2014-06-05 07:06:07 +00:00 |
samuele3hu
|
373d4dfb1a
|
Replace `log` with `CCLOG`
|
2014-06-05 14:49:02 +08:00 |
minggo
|
366beedbb2
|
Merge pull request #6955 from samuele3hu/v3_fix
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-05 11:49:40 +08:00 |
CocosRobot
|
0010ed2e44
|
[AUTO]: updating luabinding automatically
|
2014-06-05 03:01:43 +00:00 |
Ricardo Quesada
|
0c2f8ed401
|
Lua compiles and runs
|
2014-06-04 09:26:39 -07:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |
minggo
|
700b0f7320
|
Merge pull request #6966 from kicktheken/v3
fix layout constant syntax error
|
2014-06-04 14:12:52 +08:00 |
minggo
|
b174481645
|
Merge pull request #6967 from ntotani/fix-lua-binding-release-build
fix lua-binding release build
|
2014-06-04 14:06:29 +08:00 |
CocosRobot
|
a70d6628a7
|
[AUTO]: updating luabinding automatically
|
2014-06-04 05:58:29 +00:00 |
samuele3hu
|
c785d64ba1
|
Adjust the xxtea directory structure and modify configs files for platforms
|
2014-06-04 11:50:04 +08:00 |
Kenneth Chan
|
d7fcf39386
|
fix layout constant syntax error
|
2014-06-03 20:26:59 -07:00 |
Naoyuki Totani
|
c7597e5396
|
surround tolua_isnumber with debug flug
|
2014-06-04 12:17:43 +09:00 |
samuele3hu
|
e1310e2660
|
Adjust the xxtea directory structure and modify some grammar expressions
|
2014-06-04 09:59:29 +08:00 |
samuele3hu
|
b91d8255bd
|
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-03 09:55:57 +08:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
CocosRobot
|
e1ab346e70
|
[AUTO]: updating luabinding automatically
|
2014-05-27 06:31:18 +00:00 |
CocosRobot
|
9e9cab9e53
|
[AUTO]: updating luabinding automatically
|
2014-05-27 02:21:22 +00:00 |
CocosRobot
|
3245aeedd4
|
[AUTO]: updating luabinding automatically
|
2014-05-26 05:44:22 +00:00 |
CocosRobot
|
bff5fdfdda
|
[AUTO]: updating luabinding automatically
|
2014-05-26 01:58:46 +00:00 |
minggo
|
399571f542
|
Merge pull request #6892 from samuele3hu/v3_fix
Update the OpenGL lua binding and related test case
|
2014-05-23 07:37:49 -05:00 |
samuele3hu
|
3bd196f077
|
Update the openGL lua binding and related test case
|
2014-05-23 19:12:30 +08:00 |
cocoscodeide
|
5e198aaae2
|
Merge pull request #26 from cocos2d/v3
update cocos2d-x
|
2014-05-23 12:46:42 +08:00 |
CocosRobot
|
293ced84c2
|
[AUTO]: updating luabinding automatically
|
2014-05-23 03:12:39 +00:00 |
CocosRobot
|
0ab8624d2f
|
[AUTO]: updating luabinding automatically
|
2014-05-22 08:08:54 +00:00 |
chuanweizhang2013
|
111840f37b
|
add play ui
|
2014-05-22 11:52:49 +08:00 |
CocosRobot
|
f734cc3f7b
|
[AUTO]: updating luabinding automatically
|
2014-05-20 11:46:42 +00:00 |
samuele3hu
|
a2ebe428da
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-20 18:11:28 +08:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08:00 |
CocosRobot
|
33d8973277
|
[AUTO]: updating luabinding automatically
|
2014-05-20 06:44:06 +00:00 |
CocosRobot
|
2c47eae1a0
|
[AUTO]: updating luabinding automatically
|
2014-05-20 04:10:28 +00:00 |
CocosRobot
|
9f9b0bc426
|
[AUTO]: updating luabinding automatically
|
2014-05-19 03:16:40 +00:00 |
CocosRobot
|
a7485bb4e9
|
[AUTO]: updating luabinding automatically
|
2014-05-18 22:18:07 +00:00 |
CocosRobot
|
844cc9bcef
|
[AUTO]: updating luabinding automatically
|
2014-05-17 03:20:49 +00:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |
minggo
|
e3f2c3985d
|
Merge pull request #6777 from boyu0/physics_rollback_for_lua
Roll back lua PhysicsTest.
|
2014-05-16 21:55:52 +08:00 |
minggo
|
bf2250a67a
|
Merge pull request #6738 from cocoscodeide/v3
update template project lua
|
2014-05-16 18:10:10 +08:00 |
boyu0
|
74335a92f7
|
Roll back lua PhysicsTest.
|
2014-05-16 17:19:02 +08:00 |
samuele3hu
|
6f6cfba21b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-15 16:57:08 +08:00 |
samuele3hu
|
cde4e4811b
|
Update some GuiConstants and resubmission pr#6361.
|
2014-05-15 16:54:55 +08:00 |
CocosRobot
|
44c6c4d542
|
[AUTO]: updating luabinding automatically
|
2014-05-15 08:18:44 +00:00 |
samuele3hu
|
5a14b1d67b
|
fix compile error and synchronizate the UI change for Lua
|
2014-05-15 15:39:15 +08:00 |
CocosRobot
|
7b45fc90a8
|
[AUTO]: updating luabinding automatically
|
2014-05-14 17:16:02 +00:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
CocosRobot
|
6f6d233ea5
|
[AUTO]: updating luabinding automatically
|
2014-05-14 09:52:20 +00:00 |
samuele3hu
|
ee4e5e4800
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-14 14:45:15 +08:00 |
samuele3hu
|
534ad2aafb
|
fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
|
2014-05-14 14:43:10 +08:00 |
CocosRobot
|
20c50ef189
|
[AUTO]: updating luabinding automatically
|
2014-05-14 02:03:18 +00:00 |
cocoscodeide
|
0b301d6602
|
Merge pull request #5 from cocos2d/v3
update cocos2d-x
|
2014-05-13 17:59:18 +08:00 |
CocosRobot
|
7ad48b632a
|
[AUTO]: updating luabinding automatically
|
2014-05-13 07:03:12 +00:00 |
CocosRobot
|
bf6ed6eb8b
|
[AUTO]: updating luabinding automatically
|
2014-05-13 03:39:46 +00:00 |
CocosRobot
|
16b31e3157
|
[AUTO]: updating luabinding automatically
|
2014-05-12 08:14:14 +00:00 |
CocosRobot
|
5c735e5277
|
[AUTO]: updating luabinding automatically
|
2014-05-12 05:44:32 +00:00 |
Huabing.Xu
|
bbac0be9a6
|
add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS
|
2014-05-09 22:04:19 -07:00 |
CocosRobot
|
f0c240f885
|
[AUTO]: updating luabinding automatically
|
2014-05-10 03:47:56 +00:00 |
Ricardo Quesada
|
77c03fcf11
|
ShaderCache -> GLProgramCache
|
2014-05-09 18:39:25 -07:00 |
chuanweizhang2013
|
d502e41af4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
|
2014-05-09 14:28:14 +08:00 |
Ricardo Quesada
|
51f498fc94
|
fixed deprecation warnings
|
2014-05-08 16:42:36 -07:00 |
Ricardo Quesada
|
8f2ba467ff
|
Yeahhhhhh
it is working
|
2014-05-08 12:34:26 -07:00 |
cocoscodeide
|
6efaa2fe8f
|
Merge pull request #2 from chuanweizhang2013/v3luaruntime
modify luadebug and adjust code file
|
2014-05-08 22:09:06 +08:00 |
chuanweizhang2013
|
8f7cb74dd1
|
fixed debug
|
2014-05-08 16:02:55 +08:00 |
minggo
|
a8d728ffc9
|
Merge pull request #6610 from zawasp/vs2013project
upgrade win32 projects for Visual Studio 2013
|
2014-05-08 15:40:02 +08:00 |
CocosRobot
|
119ef29a87
|
[AUTO]: updating luabinding automatically
|
2014-05-08 06:03:37 +00:00 |
CocosRobot
|
7aff750381
|
[AUTO]: updating luabinding automatically
|
2014-05-08 03:19:36 +00:00 |
Mircea Rila
|
b66b4c6f1d
|
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
remove C4005 warnings after upgrading projects
|
2014-05-07 17:41:04 +03:00 |
CocosRobot
|
36843196c5
|
[AUTO]: updating luabinding automatically
|
2014-05-07 08:30:46 +00:00 |
cocoscodeide
|
04600227ae
|
Merge pull request #1 from chuanweizhang2013/v3luaruntime
V3luaruntime
|
2014-05-07 11:34:35 +08:00 |
samuele3hu
|
fb60b9f65a
|
issue #5032:A potential crash bug of Lua binding
|
2014-05-07 10:09:54 +08:00 |
CocosRobot
|
db99518c80
|
[AUTO]: updating luabinding automatically
|
2014-05-06 00:46:16 +00:00 |
Ricardo Quesada
|
afaa701cff
|
math cocos2d fixes
|
2014-05-05 17:42:11 -07:00 |
CocosRobot
|
5db3fa8df0
|
[AUTO]: updating luabinding automatically
|
2014-05-05 23:58:54 +00:00 |
chuanweizhang2013
|
cd7ea468e8
|
modify lua_debugger.c
|
2014-05-05 21:18:33 +08:00 |
James Chen
|
8cbcf17163
|
issue #4674: Re-added deleted source files.
|
2014-05-04 14:37:55 +08:00 |
James Chen
|
3b3c1c4dbb
|
issue #4674: Removed large files and updated .gitignore
|
2014-05-04 14:36:16 +08:00 |
CocosRobot
|
cdd04ee11f
|
[AUTO]: updating luabinding automatically
|
2014-05-02 01:12:32 +00:00 |
Ricardo Quesada
|
b67f3008a5
|
Lua compiles again
|
2014-05-01 18:07:25 -07:00 |
CocosRobot
|
d75a7c51a3
|
[AUTO]: updating luabinding automatically
|
2014-05-02 00:37:21 +00:00 |
Ricardo Quesada
|
32f3fedb37
|
Moves cocos/2d/Android.mk to cocos/Android.mk
Easier to find Android.mk
|
2014-05-01 14:09:26 -07:00 |
CocosRobot
|
7cb5f4c418
|
[AUTO]: updating luabinding automatically
|
2014-05-01 02:25:38 +00:00 |
Ricardo Quesada
|
7b2e558bb0
|
Merge pull request #6531 from ricardoquesada/fix_builder_squash
Fixes linux build
|
2014-04-30 19:10:12 -07:00 |
Ricardo Quesada
|
40fe815ab9
|
Squashed commit of the following:
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
|
2014-04-30 19:09:13 -07:00 |
CocosRobot
|
94e01a2e81
|
[AUTO]: updating luabinding automatically
|
2014-05-01 00:58:35 +00:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
samuele3hu
|
58a9e40b82
|
Modify some functions return value from `bool` to `int`
|
2014-04-29 17:17:18 +08:00 |
samuele3hu
|
4eaec951b6
|
use `new` and `CC_SAFE_DELETE_ARRAY` to replace `malloc` and `free`
|
2014-04-29 16:04:08 +08:00 |
samuele3hu
|
ae488e5afa
|
Replace `vec2s` with `points`
|
2014-04-29 14:39:19 +08:00 |
samuele3hu
|
84c1f9281e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-28 16:28:44 +08:00 |
samuele3hu
|
d729a161a4
|
Add some deprecated functions and replace the Point related to Vector2
|
2014-04-28 16:28:15 +08:00 |
CocosRobot
|
78a7c98b26
|
[AUTO]: updating luabinding automatically
|
2014-04-28 07:01:59 +00:00 |
samuele3hu
|
d3670644bf
|
Fix compile error for Lua
|
2014-04-28 14:04:37 +08:00 |
Ricardo Quesada
|
81c2d92355
|
yeah... love in includes
<3
|
2014-04-26 10:35:57 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
Huabing.Xu
|
feec24e3ef
|
Merge branch 'v3' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
|
2014-04-25 16:20:24 +08:00 |
James Chen
|
1b82cd7f08
|
Merge pull request #6093 from dplusic/develop
fixed cc.pGetAngle not using absolute value
|
2014-04-25 13:41:41 +08:00 |
CocosRobot
|
e9b51a2a42
|
[AUTO]: updating luabinding automatically
|
2014-04-25 04:00:21 +00:00 |
James Chen
|
cd6fe294b8
|
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
closed #4771: Move PhysicsWorld to Layer
|
2014-04-25 11:52:32 +08:00 |
Huabing.Xu
|
7a38050e09
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-21 17:47:34 +08:00 |
CocosRobot
|
77130708c2
|
[AUTO]: updating luabinding automatically
|
2014-04-21 06:45:09 +00:00 |
minggo
|
0a5b92c56f
|
Merge pull request #6305 from samuele3hu/developAudio
fix the bug that exit layer can’t end the SimpleAudioEngine
|
2014-04-21 14:40:40 +08:00 |
Huabing.Xu
|
3b83d52f95
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
|
2014-04-19 00:30:34 +08:00 |
samuele3hu
|
7e81f32016
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText
|
2014-04-18 11:55:30 +08:00 |
samuele3hu
|
914516a4e0
|
fix the compile error about luabindings and add the `RichText` test cases.
|
2014-04-18 11:54:57 +08:00 |
CocosRobot
|
a78a1090c3
|
[AUTO]: updating luabinding automatically
|
2014-04-18 02:51:14 +00:00 |
samuele3hu
|
1331fff62c
|
fix the bug that exit layer can’t end SimpleAudioEngine
|
2014-04-17 10:36:08 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
CocosRobot
|
4f9387447d
|
[AUTO]: updating luabinding automatically
|
2014-04-15 03:41:34 +00:00 |
CocosRobot
|
daccbdb2bf
|
[AUTO]: updating luabinding automatically
|
2014-04-14 06:55:48 +00:00 |
Huabing.Xu
|
ec5398e7c6
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
|
2014-04-14 14:08:19 +08:00 |
James Chen
|
c44e2f9bc8
|
Merge pull request #6211 from chuanweizhang2013/luaruntime
update lua template runtime
|
2014-04-11 15:08:15 +08:00 |
samuele3hu
|
5b2cf595a2
|
fix the crash invoked by calling the `glGetUniformfv`
|
2014-04-11 14:31:44 +08:00 |
Huabing.Xu
|
1670e07300
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-04-11 11:18:13 +08:00 |
chuanweizhang2013
|
41933a6fd0
|
Merge pull request #23 from cocos2d/develop
update cocos2d-x
|
2014-04-11 09:55:51 +08:00 |
samuele3hu
|
f136108037
|
fix compile error
|
2014-04-11 09:52:09 +08:00 |
chuanweizhang2013
|
337bc2f2e8
|
Merge pull request #22 from cocos2d/develop
update cocos2d-x
|
2014-04-11 09:33:04 +08:00 |
samuele3hu
|
70dec15e76
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 23:38:57 +08:00 |
samuele3hu
|
c687b97c6e
|
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-10 23:36:25 +08:00 |
CocosRobot
|
431f843773
|
[AUTO]: updating luabinding automatically
|
2014-04-10 08:20:27 +00:00 |
samuele3hu
|
249163c32d
|
Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
|
2014-04-10 15:52:51 +08:00 |
samuele3hu
|
c4c4358708
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 15:05:41 +08:00 |
samuele3hu
|
2800133c99
|
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 14:54:14 +08:00 |
CocosRobot
|
3f1e8c83a4
|
[AUTO]: updating luabinding automatically
|
2014-04-10 06:19:59 +00:00 |
James Chen
|
599e14efaa
|
Merge pull request #6207 from CocosRobot/update_lua_bindings_1397100218
[AUTO]: updating luabinding automatically
|
2014-04-10 11:27:04 +08:00 |
CocosRobot
|
782bdd90f5
|
[AUTO]: updating luabinding automatically
|
2014-04-10 03:24:38 +00:00 |
Huabing.Xu
|
07ac817a7c
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-10 10:52:15 +08:00 |
chuanweizhang2013
|
91e42a17f5
|
Merge pull request #21 from cocos2d/develop
update cocos2d-x
|
2014-04-10 10:28:12 +08:00 |
James Chen
|
890dd64d38
|
issue #4729: some warning fixes and compilation error fixes on win32.
|
2014-04-10 01:29:13 +08:00 |
James Chen
|
5615717617
|
issue #4729: NULL -> nullptr in constructor or setXXX(NULL)
|
2014-04-10 00:36:43 +08:00 |
James Chen
|
2fc6c0150c
|
issue #4729: iOS/Mac works fine
|
2014-04-10 00:36:41 +08:00 |
samuele3hu
|
b6579aa322
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 16:25:44 +08:00 |
samuele3hu
|
1c124f52ad
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 14:29:04 +08:00 |
samuele3hu
|
dbd01051d8
|
close #4721:clone for EventListeners of lua didn't clone the related property
|
2014-04-09 14:26:05 +08:00 |
shujunqiao
|
2c2876698d
|
add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp.
|
2014-04-09 14:20:02 +08:00 |
chuanweizhang2013
|
c75466f555
|
Merge pull request #20 from cocos2d/develop
update cocos2d-x
|
2014-04-09 09:43:01 +08:00 |
Huabing.Xu
|
3837c23ebe
|
draw() using Matrix instead of kmMat4
|
2014-04-08 22:07:35 +08:00 |
mgcL
|
d9e0124ff8
|
delete _scriptHandlerMgr in destruct will cause stack overflow
|
2014-04-05 21:26:56 +08:00 |
mgcL
|
a5da6d71b4
|
add destroyInstance for ScriptHandlerMgr
|
2014-04-05 21:09:49 +08:00 |
CocosRobot
|
cd33967dc4
|
[AUTO]: updating luabinding automatically
|
2014-04-04 10:45:34 +00:00 |
cw
|
c0fe791aae
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime
Conflicts:
templates/lua-template-runtime/src/main.lua
|
2014-04-04 18:17:54 +08:00 |
CocosRobot
|
c72f256d01
|
[AUTO]: updating luabinding automatically
|
2014-04-03 10:12:05 +00:00 |
CocosRobot
|
279b371031
|
[AUTO]: updating luabinding automatically
|
2014-04-03 09:46:03 +00:00 |
samuele3hu
|
b68f6bf65e
|
fix the error about `draw` of GLNode and modify the related test cases
|
2014-04-03 17:02:14 +08:00 |
CocosRobot
|
9799fbdf27
|
[AUTO]: updating luabinding automatically
|
2014-04-02 10:42:38 +00:00 |
CocosRobot
|
59db1f300d
|
[AUTO]: updating luabinding automatically
|
2014-04-02 09:58:03 +00:00 |
dplusic
|
1aac5c6934
|
fixed cc.pGetAngle not using absolute value
|
2014-04-01 17:13:59 +09:00 |
CocosRobot
|
55b87dbad0
|
[AUTO]: updating luabinding automatically
|
2014-04-01 03:33:06 +00:00 |
CocosRobot
|
ce10ddd84b
|
[AUTO]: updating luabinding automatically
|
2014-04-01 02:09:55 +00:00 |
CocosRobot
|
cf59264dfe
|
[AUTO]: updating luabinding automatically
|
2014-03-31 08:52:27 +00:00 |
samuele3hu
|
c38388cc62
|
ccvector_to_luaval would lead to memory leak because call the `retain`
|
2014-03-31 12:04:47 +08:00 |
James Chen
|
1c5cff089e
|
Merge pull request #6050 from CocosRobot/update_lua_bindings_1396001378
[AUTO]: updating luabinding automatically
|
2014-03-28 18:11:59 +08:00 |
CocosRobot
|
494321a674
|
[AUTO]: updating luabinding automatically
|
2014-03-28 10:11:08 +00:00 |
James Chen
|
581ef454eb
|
Merge pull request #6047 from samuele3hu/develop_test
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 18:04:12 +08:00 |
samuele3hu
|
7ca207f993
|
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 17:18:41 +08:00 |
CocosRobot
|
07d1a54a92
|
[AUTO]: updating luabinding automatically
|
2014-03-28 08:20:29 +00:00 |
CocosRobot
|
bb1b6f96fb
|
[AUTO]: updating luabinding automatically
|
2014-03-28 06:17:06 +00:00 |
CocosRobot
|
ceda1b9a9a
|
[AUTO]: updating luabinding automatically
|
2014-03-28 03:33:44 +00:00 |
CocosRobot
|
e5ff0912a7
|
[AUTO]: updating luabinding automatically
|
2014-03-27 08:43:46 +00:00 |
CocosRobot
|
8cec6b83d9
|
[AUTO]: updating luabinding automatically
|
2014-03-27 07:35:51 +00:00 |
CocosRobot
|
7a3e40dd8e
|
[AUTO]: updating luabinding automatically
|
2014-03-27 06:55:35 +00:00 |
CocosRobot
|
33d6b04fb4
|
[AUTO]: updating luabinding automatically
|
2014-03-27 05:55:07 +00:00 |
CocosRobot
|
b1859a4cac
|
[AUTO]: updating luabinding automatically
|
2014-03-27 03:10:37 +00:00 |
CocosRobot
|
8efb9ad4e0
|
[AUTO]: updating luabinding automatically
|
2014-03-26 12:09:41 +00:00 |
CocosRobot
|
ebc09373e3
|
[AUTO]: updating luabinding automatically
|
2014-03-26 10:42:58 +00:00 |
CocosRobot
|
6e86e65038
|
[AUTO]: updating luabinding automatically
|
2014-03-26 10:25:55 +00:00 |
CocosRobot
|
0140d6d3f7
|
[AUTO]: updating luabinding automatically
|
2014-03-26 06:03:04 +00:00 |
CocosRobot
|
c5d6e83673
|
[AUTO]: updating luabinding automatically
|
2014-03-25 09:30:11 +00:00 |
CocosRobot
|
bdcd6ea198
|
[AUTO]: updating luabinding automatically
|
2014-03-25 08:13:42 +00:00 |
CocosRobot
|
86f69a0b4e
|
[AUTO]: updating luabinding automatically
|
2014-03-25 07:39:29 +00:00 |
CocosRobot
|
5d2906ad8b
|
[AUTO]: updating luabinding automatically
|
2014-03-25 05:50:20 +00:00 |
chuanweizhang2013
|
1254bf8f1e
|
Merge pull request #19 from cocos2d/develop
update cocos2d-x
|
2014-03-24 12:00:30 +08:00 |
James Chen
|
832ab120aa
|
Merge pull request #5862 from samuele3hu/develop_script_mgr
closed #4452: Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
|
2014-03-21 16:48:53 +08:00 |
CocosRobot
|
3bd000b236
|
[AUTO]: updating luabinding automatically
|
2014-03-21 08:38:19 +00:00 |
CocosRobot
|
4721306fef
|
[AUTO]: updating luabinding automatically
|
2014-03-21 07:01:27 +00:00 |
CocosRobot
|
566c014060
|
[AUTO]: updating luabinding automatically
|
2014-03-21 06:26:33 +00:00 |
samuele3hu
|
e2ed17f69c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-21 11:28:39 +08:00 |
samuele3hu
|
71f3cb7862
|
close #4452:Make `addCustomHandler` more distinct
|
2014-03-21 11:24:24 +08:00 |
James Chen
|
d5e8bde89e
|
Merge pull request #5889 from samuele3hu/develop_socket
close #4400: Use the latest version of LuaSocket and modify the related project config
|
2014-03-21 10:52:38 +08:00 |
James Chen
|
b3cfc693ca
|
Merge pull request #5887 from andyque/fix_tests_warnings
Fix warnings in cpp-tests.
|
2014-03-20 18:24:10 +08:00 |
samuele3hu
|
21a21c2d3d
|
close #4400: Update the anrroid.mk for lua-bindings
|
2014-03-20 18:09:52 +08:00 |
samuele3hu
|
11bbeb4a30
|
close #4452:Using better spelling format
|
2014-03-20 17:56:33 +08:00 |
samuele3hu
|
977ef0092b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-20 17:43:28 +08:00 |
samuele3hu
|
4b25c9f62e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
|
2014-03-20 17:07:33 +08:00 |
samuele3hu
|
d3487d2d3c
|
close #4400: Use the newest version of LuaSocket for lua
|
2014-03-20 17:04:54 +08:00 |
andyque
|
cf86fd619f
|
fix lua bindings warnings
|
2014-03-20 16:48:12 +08:00 |
CocosRobot
|
0f22720da5
|
[AUTO]: updating luabinding automatically
|
2014-03-20 07:25:03 +00:00 |
andyque
|
ae3310bffb
|
Merge branch 'develop' into fix_warnings
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
|
2014-03-20 14:50:02 +08:00 |
CocosRobot
|
4b7f729154
|
[AUTO]: updating luabinding automatically
|
2014-03-20 02:21:28 +00:00 |
andyque
|
d7b3737605
|
fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings
|
2014-03-20 10:14:25 +08:00 |
samuele3hu
|
0afcf59539
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-20 09:56:06 +08:00 |
samuele3hu
|
0026fc2b2a
|
close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
|
2014-03-20 09:54:38 +08:00 |
CocosRobot
|
0a57a5be11
|
[AUTO]: updating luabinding automatically
|
2014-03-19 10:32:42 +00:00 |
chuanweizhang2013
|
aef2ccac11
|
Merge commit 'refs/pull/5871/head' of https://github.com/cocos2d/cocos2d-x into luamerage
|
2014-03-19 18:09:06 +08:00 |
samuele3hu
|
a1ca3195ce
|
Rename `addConsoleHandler` to `addCustomHandler`
|
2014-03-19 17:28:23 +08:00 |
CocosRobot
|
f0fdcb22d3
|
[AUTO]: updating luabinding automatically
|
2014-03-19 06:14:23 +00:00 |
samuele3hu
|
a432f488bd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-19 10:51:42 +08:00 |
samuele3hu
|
a91994f242
|
Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest.
|
2014-03-19 10:50:11 +08:00 |
CocosRobot
|
781ff463a2
|
[AUTO]: updating luabinding automatically
|
2014-03-19 01:56:50 +00:00 |
CocosRobot
|
fc5a34e500
|
[AUTO]: updating luabinding automatically
|
2014-03-18 07:55:30 +00:00 |
cw
|
1e551f8ca4
|
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
Conflicts:
templates/lua-template-runtime/src/main.lua
|
2014-03-15 10:37:26 +08:00 |
cw
|
ea9a9bceb2
|
update lua debugger
|
2014-03-15 10:34:21 +08:00 |
boyu0
|
f23db68151
|
build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.
|
2014-03-15 01:19:06 +08:00 |
CocosRobot
|
c9259bb800
|
[AUTO]: updating luabinding automatically
|
2014-03-13 13:17:32 +00:00 |
CocosRobot
|
b1becd3fae
|
[AUTO]: updating luabinding automatically
|
2014-03-13 06:51:53 +00:00 |
CocosRobot
|
6d8bc4e616
|
[AUTO]: updating luabinding automatically
|
2014-03-13 03:45:57 +00:00 |
CocosRobot
|
e93feaa068
|
[AUTO]: updating luabinding automatically
|
2014-03-12 11:41:17 +00:00 |
James Chen
|
9c980dfcfe
|
Merge pull request #5706 from dumganhar/rename-tests
Rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. And compilation error fix after changing folder name from 'gui' to 'ui'
|
2014-03-12 15:48:29 +08:00 |
James Chen
|
eae6880599
|
Adds 'ui' include path in liblua.vcxproj
|
2014-03-12 15:44:56 +08:00 |
CocosRobot
|
31b304af26
|
[AUTO]: updating luabinding automatically
|
2014-03-12 07:43:13 +00:00 |
CocosRobot
|
41c689c545
|
[AUTO]: updating luabinding automatically
|
2014-03-12 03:31:17 +00:00 |
andyque
|
2c2a5ee38e
|
rename gui to ui
|
2014-03-12 10:46:49 +08:00 |
andyque
|
4ed33fa4c8
|
fix lua bindings
|
2014-03-11 21:36:00 +08:00 |
andyque
|
f6a9824df1
|
fix win32 compile error
|
2014-03-11 20:59:35 +08:00 |
andyque
|
df7aa27b8b
|
fix mac lua
|
2014-03-11 18:48:28 +08:00 |
andyque
|
026ef95b07
|
add lua ui binding
|
2014-03-11 18:48:27 +08:00 |
andyque
|
dcc98ef79f
|
rename cocos2dx_gui to cocos2dx_ui
|
2014-03-11 18:48:27 +08:00 |
samuele3hu
|
9a30984783
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
|
2014-03-11 17:36:43 +08:00 |
samuele3hu
|
5c33155bc9
|
fix:Remove some warning about lua.
|
2014-03-11 17:35:09 +08:00 |
CocosRobot
|
b6ebd84534
|
[AUTO]: updating luabinding automatically
|
2014-03-11 08:38:10 +00:00 |
CocosRobot
|
725440fe3f
|
[AUTO]: updating luabinding automatically
|
2014-03-11 02:52:22 +00:00 |
CocosRobot
|
8aa11f005b
|
[AUTO]: updating luabinding automatically
|
2014-03-10 11:27:21 +00:00 |
James Chen
|
479579fadc
|
Update CMakeLists.txt, lua-tests works ok on linux now.
|
2014-03-10 02:39:54 -07:00 |
James Chen
|
e39dcd9974
|
[Linux] Updates CMakeLists.txt to re-add lua scripting support.
|
2014-03-10 17:10:08 +08:00 |
James Chen
|
fd44277e7c
|
lua-tests works again for Win32.
|
2014-03-10 17:05:35 +08:00 |
James Chen
|
6deadf34b8
|
lua-tests works again for Android.
|
2014-03-10 16:04:46 +08:00 |
James Chen
|
69bbda688b
|
lua-tests works ok for iOS / Mac, luabindings has its own project.
|
2014-03-10 15:32:48 +08:00 |
James Chen
|
650a88a8b1
|
Re-add lua bindings codes.
|
2014-03-10 14:04:58 +08:00 |