heliclei
|
83c4d5b479
|
fix comments
|
2014-03-10 18:21:53 +08:00 |
James Chen
|
9c18c804f5
|
Typo fix.
|
2014-03-10 18:20:51 +08:00 |
James Chen
|
124b18f53a
|
Re-add CocosRobot send bindings glue codes to cocos2d-x repo.
|
2014-03-10 18:13:39 +08:00 |
Huabing.Xu
|
f0ae3fd4dc
|
Merge branch 'develop' into develop_RenderTextureImprovement
|
2014-03-10 18:11:55 +08:00 |
CocosRobot
|
8f18803959
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-03-10 09:49:16 +00:00 |
James Chen
|
2147a711ba
|
Merge pull request #5650 from dumganhar/re-add-lua
Re-add lua bindings support
|
2014-03-10 17:47:52 +08:00 |
James Chen
|
0f9ff45778
|
Re-add bindings-generator submodule.
|
2014-03-10 17:46:30 +08:00 |
Huabing.Xu
|
e15d0a9d20
|
RenderTexture saveToFile will return true
|
2014-03-10 17:42:27 +08: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 |
lm
|
bdd66ee0fd
|
[Jenkins] fix the crash in comment trigger
|
2014-03-10 16:35:55 +08:00 |
CaiWenzhi
|
f2197cea6f
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 16:19:27 +08:00 |
minggo
|
931246b148
|
Merge pull request #5647 from boyu0/bug4324_physicscontact_memory_leak
closed #4324: fix PhysicsContact::generateContactData() memory leak.
|
2014-03-10 16:14:53 +08:00 |
James Chen
|
6deadf34b8
|
lua-tests works again for Android.
|
2014-03-10 16:04:46 +08:00 |
James Chen
|
705ab115b8
|
Reuse the resources in cpp-tests.
|
2014-03-10 15:40:48 +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 |
Huabing.Xu
|
f8f2373c2a
|
closed #4315: fixed clippingNode alphaTest Bug
|
2014-03-10 15:12:44 +08:00 |
CaiWenzhi
|
26b3013f77
|
Format codes
|
2014-03-10 15:08:42 +08:00 |
boyu0
|
d5031f950a
|
closed #4324: fix PhysicsContact::generateContactData() memory leak.
|
2014-03-10 14:51:26 +08:00 |
CaiWenzhi
|
888b328fd0
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 14:38:43 +08:00 |
James Chen
|
650a88a8b1
|
Re-add lua bindings codes.
|
2014-03-10 14:04:58 +08:00 |
James Chen
|
66c9323a51
|
Merge pull request #5644 from CocosRobot/update_cocosfiles_1394431347
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-03-10 14:03:09 +08:00 |
CocosRobot
|
c8da2c04ce
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-03-10 06:02:28 +00:00 |
James Chen
|
c7502844f1
|
Merge pull request #5642 from dumganhar/re-add-lua
Refactor folder structure, move 'tests' to 'samples/cpp-tests'
|
2014-03-10 14:00:52 +08:00 |
James Chen
|
7841bceb2b
|
[jenkins ci] Updates jenkins script
|
2014-03-10 13:50:14 +08:00 |
James Chen
|
a5f668a0bf
|
[travis ci] Build testcpp only.
|
2014-03-10 12:06:33 +08:00 |
CaiWenzhi
|
083872f65c
|
Fixed bug of setting anchor point
|
2014-03-10 12:02:49 +08:00 |
James Chen
|
286ebb349f
|
[jenkins] Don't gen jsb bindings.
|
2014-03-10 12:02:29 +08:00 |
James Chen
|
2e473027c1
|
Re-add xcode 'scheme' files.
|
2014-03-10 11:58:33 +08:00 |
James Chen
|
ab1b10169e
|
Compilation error fixes for Linux and Android.
|
2014-03-10 11:54:26 +08:00 |
CaiWenzhi
|
f78d05c85f
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 11:49:15 +08:00 |
James Chen
|
218dc822e1
|
Updates win32 project configuration.
|
2014-03-10 11:23:35 +08:00 |
lihex
|
3b2a7328d3
|
update submodule
|
2014-03-10 11:14:11 +08:00 |
James Chen
|
f800597541
|
Update AUTHORS [ci skip]
|
2014-03-10 10:57:36 +08:00 |
James Chen
|
eca0bce1be
|
Merge pull request #5633 from huangml/patch-1
closed #4319: Node::removeAllChildrenWithCleanup() does not remove PhysicsBody.
|
2014-03-10 10:55:54 +08:00 |
James Chen
|
11dc78a57b
|
cocos2d_tests -> cocos2d_samples
|
2014-03-10 10:46:44 +08:00 |
James Chen
|
f9ecaa3274
|
Deletes xcode xcschemes temporarily.
|
2014-03-10 10:30:48 +08:00 |
James Chen
|
4475209277
|
Renames 'cocos2d_tests.xcodeproj' to 'cocos2d_samples.xcodeproj'
|
2014-03-10 10:27:16 +08:00 |
James Chen
|
9926910c91
|
Adds lua-hello folder.
|
2014-03-10 10:25:31 +08:00 |
James Chen
|
956344f10f
|
Adds empty folder, 'cpp-hello', 'lua-tests'.
|
2014-03-10 10:24:38 +08:00 |
James Chen
|
5354980d75
|
Rename 'tests' folder to 'samples', adds 'cpp-tests' folder.
|
2014-03-10 10:22:33 +08:00 |
CaiWenzhi
|
8d3f33bb30
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 09:58:26 +08:00 |
minggo
|
763e255fee
|
Merge pull request #5639 from lihex/develop
add build-cfg.json for cocos2d-console to build android.
|
2014-03-09 15:50:57 +08:00 |
lihex
|
3c9b4778b4
|
add build-cfg.json for cocos2d-console to build android.
|
2014-03-09 11:58:08 +08:00 |
James Chen
|
2784955845
|
Merge pull request #5636 from dumganhar/iss3290-onenter-order
closed #3290: The order of onEnter / onExit work correctly on JSB and LuaBindings.
|
2014-03-08 22:35:09 +08:00 |
James Chen
|
7aec578b35
|
closed #3290: The order of onEnter works correctly on JSB and LuaBindings.
|
2014-03-08 22:07:55 +08:00 |
andyque
|
82fcf939d0
|
fix ease elastic action error
|
2014-03-08 21:51:17 +08:00 |
Zhe Wang
|
c34064fae1
|
remove unsupported platforms from readme.md
|
2014-03-08 19:57:29 +08:00 |
Zhe Wang
|
9488667283
|
Merge pull request #5634 from walzer/develop
remove script related submodules from .gitmodules file
|
2014-03-08 18:07:28 +08:00 |