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
|
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 |
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 |
samuele3hu
|
c785d64ba1
|
Adjust the xxtea directory structure and modify configs files for platforms
|
2014-06-04 11:50:04 +08: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 |
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 |
chuanweizhang2013
|
111840f37b
|
add play ui
|
2014-05-22 11:52:49 +08:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08: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
|
cde4e4811b
|
Update some GuiConstants and resubmission pr#6361.
|
2014-05-15 16:54:55 +08:00 |
samuele3hu
|
5a14b1d67b
|
fix compile error and synchronizate the UI change for Lua
|
2014-05-15 15:39:15 +08: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 |
cocoscodeide
|
0b301d6602
|
Merge pull request #5 from cocos2d/v3
update cocos2d-x
|
2014-05-13 17:59:18 +08: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 |
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 |
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 |
Ricardo Quesada
|
afaa701cff
|
math cocos2d fixes
|
2014-05-05 17:42:11 -07: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 |
Ricardo Quesada
|
b67f3008a5
|
Lua compiles again
|
2014-05-01 18:07:25 -07: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 |
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 |
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
|
d729a161a4
|
Add some deprecated functions and replace the Point related to Vector2
|
2014-04-28 16:28:15 +08: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
|
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
|
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
|
914516a4e0
|
fix the compile error about luabindings and add the `RichText` test cases.
|
2014-04-18 11:54:57 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08: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
|
c687b97c6e
|
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-10 23:36:25 +08: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
|
2800133c99
|
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 14:54:14 +08: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 |
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 |
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 |
samuele3hu
|
b68f6bf65e
|
fix the error about `draw` of GLNode and modify the related test cases
|
2014-04-03 17:02:14 +08:00 |
samuele3hu
|
c38388cc62
|
ccvector_to_luaval would lead to memory leak because call the `retain`
|
2014-03-31 12:04:47 +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 |
chuanweizhang2013
|
1254bf8f1e
|
Merge pull request #19 from cocos2d/develop
update cocos2d-x
|
2014-03-24 12:00:30 +08: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 |
samuele3hu
|
11bbeb4a30
|
close #4452:Using better spelling format
|
2014-03-20 17:56: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 |
samuele3hu
|
0026fc2b2a
|
close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
|
2014-03-20 09:54:38 +08:00 |
samuele3hu
|
a1ca3195ce
|
Rename `addConsoleHandler` to `addCustomHandler`
|
2014-03-19 17:28:23 +08:00 |
samuele3hu
|
a91994f242
|
Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest.
|
2014-03-19 10:50:11 +08:00 |
cw
|
ea9a9bceb2
|
update lua debugger
|
2014-03-15 10:34:21 +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
|
5c33155bc9
|
fix:Remove some warning about lua.
|
2014-03-11 17:35:09 +08:00 |
James Chen
|
650a88a8b1
|
Re-add lua bindings codes.
|
2014-03-10 14:04:58 +08:00 |