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 |