CocosRobot
|
725440fe3f
|
[AUTO]: updating luabinding automatically
|
2014-03-11 02:52:22 +00:00 |
boyu0
|
23f42da548
|
closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
|
2014-03-11 05:09:08 +08:00 |
minggo
|
5e7f2dee8f
|
Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed
Develop nutty modify framework for315 crash fixed
|
2014-03-10 21:49:22 +08:00 |
minggo
|
2aa5c7aadd
|
Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug
closed #4315: fixed clippingNode alphaTest Bug
|
2014-03-10 21:45:47 +08:00 |
CocosRobot
|
8aa11f005b
|
[AUTO]: updating luabinding automatically
|
2014-03-10 11:27:21 +00:00 |
James Chen
|
63292b5ba6
|
Merge pull request #5544 from heliclei/node-string-tag
CCNode:Add String tag, to support runtime manipulation
|
2014-03-10 18:26:51 +08:00 |
heliclei
|
83c4d5b479
|
fix comments
|
2014-03-10 18:21:53 +08: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
|
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 |
CaiWenzhi
|
f2197cea6f
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 16:19:27 +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 |
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 |
James Chen
|
650a88a8b1
|
Re-add lua bindings codes.
|
2014-03-10 14:04:58 +08:00 |
CaiWenzhi
|
083872f65c
|
Fixed bug of setting anchor point
|
2014-03-10 12:02:49 +08:00 |
CaiWenzhi
|
f78d05c85f
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 11:49:15 +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 |
CaiWenzhi
|
8d3f33bb30
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-10 09:58:26 +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 |
黄梦龙
|
8b737d8aab
|
Update CCNode.cpp
removeAllChildrenWithCleanup() not remove PhysicsBody
|
2014-03-08 17:42:35 +08:00 |
CaiWenzhi
|
80d97bb107
|
Modify action
|
2014-03-07 21:49:24 +08:00 |
minggo
|
c291cb32a0
|
Merge pull request #5624 from Dhilan007/develop_label
label:fixed vertical alignment is incorrect.
|
2014-03-07 21:07:09 +08:00 |
James Chen
|
84a76db060
|
Merge pull request #5622 from pandamicro/MotionStreakFix
closed #4294: Added unimplemented position getter/setter in MotionStreak.
|
2014-03-07 19:10:02 +08:00 |
pandamicro
|
2427314a65
|
Issue #4294: MotionStreak: Improve position setters
|
2014-03-07 19:06:51 +08:00 |
Dhilan007
|
4905acfa0b
|
label:fixed vertical alignment is incorrect.
|
2014-03-07 18:31:33 +08:00 |
pandamicro
|
e94cd2357d
|
Issue #4294: Add override declaration
|
2014-03-07 18:11:37 +08:00 |
CaiWenzhi
|
0c4bca9bb2
|
Merge branch 'develop' into develop_nutty_modify_framework_for315
|
2014-03-07 16:42:38 +08:00 |
pandamicro
|
a005fa1dce
|
Issue #4294: Add unimplemented position getter/setter in MotionStreak
|
2014-03-07 16:32:00 +08:00 |
minggo
|
07c0fac44f
|
Merge pull request #5620 from Dhilan007/develop_label
closed #4301:Label support vertical alignment and assign dimensions.
|
2014-03-07 16:12:21 +08:00 |
Dhilan007
|
ac944cd42b
|
fixed incorrect display when the size of label not enough to support display all text.
|
2014-03-07 15:58:49 +08:00 |
minggo
|
4251bcf425
|
Merge pull request #5469 from natural-law/issue3991
Add method to reload cached texture & update the nodes used the texture.
|
2014-03-07 15:58:17 +08:00 |
heliclei
|
600c661acb
|
remove script support
|
2014-03-07 15:12:46 +08:00 |
Dhilan007
|
c233b636cd
|
closed #4301:Label support vertical alignment and assign dimensions.
|
2014-03-07 14:58:44 +08:00 |
CaiWenzhi
|
5ee35be0ad
|
Merge branch 'develop' into develop_nutty_modify_framework_for315
|
2014-03-07 14:41:32 +08:00 |
James Chen
|
9b0c0ab44e
|
Merge pull request #5616 from dumganhar/glview-refactor
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
|
2014-03-07 14:15:20 +08:00 |
James Chen
|
e0e9e1723c
|
Merge pull request #5612 from Dhilan007/develop_label
fixed #4300:fixed Label:draw location and BBOX is incorrect.
|
2014-03-07 14:09:39 +08:00 |
James Chen
|
1cfd14f27d
|
Tab -> 4 spaces, remove unused spaces for CCGLView.h
|
2014-03-07 14:03:57 +08:00 |
James Chen
|
ae2f7a4a7d
|
updateDesignResolution -> updateDesignResolutionSize.
|
2014-03-07 14:01:30 +08:00 |
James Chen
|
d699f62193
|
Tab -> 4 spaces, remove unused spaces.
|
2014-03-07 13:59:56 +08:00 |
James Chen
|
49223fe50c
|
Compilation error fixes for linux port (clang compiler).
|
2014-03-07 13:52:54 +08:00 |
James Chen
|
8b359dd90e
|
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
|
2014-03-07 13:51:12 +08:00 |
CaiWenzhi
|
58db7b5c75
|
Some widgets would be default enabled touch
|
2014-03-07 12:34:19 +08:00 |
CaiWenzhi
|
1606671224
|
Fixed bug of Text
|
2014-03-07 12:05:33 +08:00 |
Dhilan007
|
f0119ef62f
|
fixed horizontal kerning is incorrect.
|
2014-03-07 12:03:45 +08:00 |
CaiWenzhi
|
51a6eb6d64
|
Fixed bug of Action Manger Ex
|
2014-03-07 12:01:51 +08:00 |