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 |
CocosRobot
|
0a57a5be11
|
[AUTO]: updating luabinding automatically
|
2014-03-19 10:32:42 +00:00 |
CocosRobot
|
f0fdcb22d3
|
[AUTO]: updating luabinding automatically
|
2014-03-19 06:14:23 +00: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 |
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 |