minggo
|
d80d7ed714
|
Merge pull request #7037 from boyu0/feature5537_physics_step
closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld
|
2014-08-12 13:37:29 +08:00 |
Huabing.Xu
|
6cf2e7d091
|
add CC_DLL for primitive classes
|
2014-08-12 11:56:21 +08:00 |
Huabing.Xu
|
1145859d38
|
remove commented codes
|
2014-08-12 11:44:06 +08:00 |
boyu0
|
e4bb0ad3c8
|
fix some merge errors.
|
2014-08-12 11:39:56 +08:00 |
boyu0
|
5a2564755c
|
change NULL->nullptr
|
2014-08-12 11:29:37 +08:00 |
Huabing.Xu
|
3a7b673164
|
add callback for RenderTexture::saveToFile
|
2014-08-12 10:50:57 +08:00 |
minggo
|
2601f5dba4
|
Merge pull request #7735 from natural-law/gen-prebuilt-script
Optimize the implementation of gen-prebuilt tools.
|
2014-08-12 10:41:52 +08:00 |
minggo
|
b8ce300d9b
|
Merge pull request #7737 from CocosRobot/update_lua_bindings_1407809186
[AUTO]: updating luabinding automatically
|
2014-08-12 10:41:23 +08:00 |
boyu0
|
790ef9e818
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
|
2014-08-12 10:20:34 +08:00 |
CocosRobot
|
cbbe7b9c60
|
[AUTO]: updating luabinding automatically
|
2014-08-12 02:08:16 +00:00 |
Huabing.Xu
|
e387caf763
|
add create(modelPath) interface for EffectSprite3D
|
2014-08-12 09:56:25 +08:00 |
minggo
|
bed1ccf0f3
|
Merge pull request #7733 from huangshiwu/v3_glviewfix
CCGLView modefy
|
2014-08-12 09:51:27 +08:00 |
minggo
|
e3723d8398
|
Merge pull request #7734 from 2youyouo2/v3
fixed bone rotation isn't right
|
2014-08-12 09:51:12 +08:00 |
Huabing.Xu
|
0dff45cfc2
|
adjust SkinnedEffectCode
|
2014-08-12 09:51:03 +08:00 |
minggo
|
ba092ede25
|
Merge pull request #7732 from andyque/addDLLExportToLayoutParameter
add virtual destructor
|
2014-08-12 09:49:29 +08:00 |
zhangbin
|
88382994b9
|
Modify the gen-prebuilt tools for the lua-bindings modules.
|
2014-08-12 09:37:51 +08:00 |
kaile.yin
|
358b1f6736
|
fixed bone rotation isn't right
|
2014-08-11 19:53:51 +08:00 |
Huabing.Xu
|
e66d1f6f69
|
add skinned outline effect
|
2014-08-11 18:11:15 +08:00 |
huangshiwu
|
77bc3a0e60
|
GLView modefy additional
|
2014-08-11 16:55:23 +08:00 |
minggo
|
e0ef4d16d3
|
Merge pull request #7724 from cpascal/fix_ime
Fix a correct onGLFWCharCallback
|
2014-08-11 16:18:59 +08:00 |
minggo
|
ec1864cb7a
|
Merge pull request #7731 from dabingnn/v3_add_CC_DLL_For_cocos2dVersion
add missed CC_DLL for cocos2dVersion function
|
2014-08-11 16:18:31 +08:00 |
huangshiwu
|
1177b0d545
|
CCGLView modefy
|
2014-08-11 16:15:02 +08:00 |
andyque
|
3e1f7119f9
|
add virtual destructor
|
2014-08-11 15:54:40 +08:00 |
Huabing.Xu
|
5086758063
|
add missed CC_DLL for cocos2dVersion function
|
2014-08-11 15:50:48 +08:00 |
minggo
|
b34e97cfd6
|
Merge pull request #7729 from andyque/fixCascadedColor
fixed Widget's Children reload textures change RGBA issue
|
2014-08-11 15:33:36 +08:00 |
zhangbin
|
e493c0b3c8
|
Merge branch 'v3' into gen-prebuilt-script
|
2014-08-11 15:09:06 +08:00 |
minggo
|
5016da321e
|
Merge pull request #7730 from CocosRobot/update_cocosfiles_1407740805
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-11 15:07:26 +08:00 |
CocosRobot
|
f8f15df530
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-11 07:06:46 +00:00 |
andyque
|
cdb2b9f59f
|
fixed Widget's Children reload textures change RGBA issue
|
2014-08-11 15:04:00 +08:00 |
minggo
|
43a3603a8b
|
Merge pull request #7720 from samuele3hu/v3_module
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
|
2014-08-11 15:01:28 +08:00 |
minggo
|
3704800fa5
|
Merge pull request #7728 from super626/v3_merge
Fix Camera
|
2014-08-11 14:59:31 +08:00 |
Huabing.Xu
|
c1a71453d5
|
Merge branch 'v3_renderPrimitive' into v3
|
2014-08-11 14:39:16 +08:00 |
Huabing.Xu
|
031efaf242
|
Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3
|
2014-08-11 14:37:43 +08:00 |
Huabing.Xu
|
6aff707eab
|
windows work now for renderPrimitive
|
2014-08-11 14:18:07 +08:00 |
samuele3hu
|
3c3c05204f
|
Split files in lua-bindings/script into different module and adjust related project
|
2014-08-11 12:54:30 +08:00 |
Huabing.Xu
|
2a28744dc5
|
Merge branch 'v3' into v3_renderPrimitive
|
2014-08-11 12:48:23 +08:00 |
yangxiao
|
6d15c26a61
|
move create default camera to Scene::initWithSize
|
2014-08-11 10:55:14 +08:00 |
minggo
|
e4faa4f9b1
|
[ci skip]
|
2014-08-11 10:37:23 +08:00 |
minggo
|
0f942d3417
|
Merge pull request #7719 from boyu0/physics_bitmask_fix
fix PhysicsBody bitmask bug.
|
2014-08-11 10:35:06 +08:00 |
samuele3hu
|
47c034af5d
|
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
|
2014-08-11 10:25:40 +08:00 |
minggo
|
d413acc1b7
|
Merge pull request #7721 from heliclei/libsize-tracking
[ci skip][jenkins]Add script to track android built libs size
|
2014-08-11 10:16:34 +08:00 |
minggo
|
63ec1f894b
|
[ci skip]
|
2014-08-11 09:50:46 +08:00 |
minggo
|
437257e7e6
|
Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity
Let Widget class don't support cascaded opacity and cascaded color on default.
|
2014-08-11 09:37:51 +08:00 |
minggo
|
afe41bcf44
|
Merge pull request #7727 from CocosRobot/update_cocosfiles_1407720774
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-11 09:36:06 +08:00 |
CocosRobot
|
076a2f9d1a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-11 01:32:55 +00:00 |
minggo
|
3222d89524
|
Merge pull request #7726 from CocosRobot/update_lua_bindings_1407720566
[AUTO]: updating luabinding automatically
|
2014-08-11 09:31:54 +08:00 |
CocosRobot
|
3d222ab73a
|
[AUTO]: updating luabinding automatically
|
2014-08-11 01:31:04 +00:00 |
minggo
|
00165f5fa1
|
Merge pull request #7723 from jimmystar/patch-3
Update CCScene.cpp
|
2014-08-11 09:26:48 +08:00 |
cpascal
|
5e1570e36e
|
Fix a correct onGLFWCharCallback
|
2014-08-10 01:42:21 +09:00 |
jimmystar
|
63c9780c49
|
Update CCScene.cpp
in line 157, here need to create and add camera, if not ,in the function createWithPhysics, will show black screen.
|
2014-08-09 17:37:18 +08:00 |