James Chen
|
b089970308
|
Merge pull request #4978 from dumganhar/jsb-spinetest-fix
[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer...
|
2014-01-07 05:21:01 -08:00 |
James Chen
|
9387e516be
|
[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer.
|
2014-01-07 21:19:51 +08:00 |
James Chen
|
5a31680211
|
Merge pull request #4977 from dumganhar/jsb-armature-fix
Jsb armature fix
|
2014-01-07 05:18:45 -08:00 |
James Chen
|
2276887253
|
Merge pull request #4976 from samuele3hu/developNewUI
Fix:Replace the “setDisplayFrame” function with the "setSpriteFrame" function
|
2014-01-07 04:57:06 -08:00 |
James Chen
|
e25c4b5f4d
|
[JSB] Armature should be able to be extended in JS.
|
2014-01-07 20:55:07 +08:00 |
James Chen
|
7a52d2aad7
|
Small fix in ArmatureScene.cpp/.h
|
2014-01-07 20:54:34 +08:00 |
James Chen
|
c7639319ee
|
Fix Armature::init() crashes
|
2014-01-07 20:53:44 +08:00 |
samuele3hu
|
bebdfd8e55
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 20:40:17 +08:00 |
samuele3hu
|
de5c86a184
|
Fix:Replace the “setDisplayFrame” function with the “setSpriteFrame” function
|
2014-01-07 20:39:46 +08:00 |
James Chen
|
e90f35daa6
|
Merge pull request #4975 from chengstory/fix_UIAction_play_error
fixed UIAction play error.
|
2014-01-07 03:17:41 -08:00 |
zhangcheng
|
bf8187fee2
|
fixed UIAction play error.
|
2014-01-07 19:04:18 +08:00 |
James Chen
|
54cbfe938b
|
Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 02:41:53 -08:00 |
CocosRobot
|
ab84228037
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 10:40:28 +00:00 |
James Chen
|
18963b46f5
|
Merge pull request #4971 from Dhilan007/develop_crash
update liblua vs project for add miss file.
|
2014-01-07 02:31:58 -08:00 |
James Chen
|
cc69c31ad3
|
Merge pull request #4972 from dumganhar/develop
Some fixes:
|
2014-01-07 02:31:37 -08:00 |
Dhilan007
|
ba4833e070
|
update liblua vs project for add miss file.
|
2014-01-07 18:30:12 +08:00 |
James Chen
|
1aa44383b1
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
|
2014-01-07 18:29:15 +08:00 |
James Chen
|
ac3697db19
|
fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS?
|
2014-01-07 18:28:46 +08:00 |
James Chen
|
5391024399
|
Adds override keyword.
|
2014-01-07 18:27:04 +08:00 |
James Chen
|
26efb4bf5c
|
long —> ssize_t for some classes.
|
2014-01-07 18:26:31 +08:00 |
James Chen
|
5de6ab1153
|
Merge pull request #4969 from dumganhar/develop
Updates JS-Test submodule.
|
2014-01-07 02:03:42 -08:00 |
James Chen
|
a6da007e4f
|
Updates JS-Test submodule.
|
2014-01-07 18:01:22 +08:00 |
James Chen
|
c081a3b155
|
Merge pull request #4965 from CocosRobot/updategeneratedsubmodule_1389088022
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 01:49:30 -08:00 |
James Chen
|
f4256c6ee4
|
Merge pull request #4964 from dumganhar/develop
ScrollView uses new renderer now.
|
2014-01-07 01:47:24 -08:00 |
CocosRobot
|
6967caeff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:47:05 +00:00 |
James Chen
|
5c217f70d1
|
ScrollView uses new renderer now.
|
2014-01-07 17:46:24 +08:00 |
James Chen
|
849b522924
|
Merge pull request #4962 from Dhilan007/develop_crash
update bindings-generator submodule
|
2014-01-07 01:41:47 -08:00 |
Dhilan007
|
3cab3e5df3
|
update bindings-generator submodule
|
2014-01-07 17:19:29 +08:00 |
James Chen
|
ce34ef6be4
|
Merge pull request #4961 from CocosRobot/updategeneratedsubmodule_1389085505
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 01:15:54 -08:00 |
CocosRobot
|
7e142d79f7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:05:07 +00:00 |
James Chen
|
44a02ba466
|
Merge pull request #4958 from edwardzhou/rename_UIHelper
rename UIHelper to Helper for consistency
|
2014-01-07 00:57:35 -08:00 |
James Chen
|
ed1665801d
|
Merge pull request #4960 from samuele3hu/developNewUI
Fix:Resolve the android template projects’s errors
|
2014-01-07 00:56:58 -08:00 |
samuele3hu
|
b19bda1588
|
Fix:Update cocos_files.json file
|
2014-01-07 16:49:51 +08:00 |
samuele3hu
|
ca562fb405
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 16:45:31 +08:00 |
samuele3hu
|
11a5945bd3
|
Fix:Resolve the android template projects’s errors
|
2014-01-07 16:45:03 +08:00 |
James Chen
|
da17c6b05b
|
Merge pull request #4954 from heliclei/develop
[Jenkins]fix symbol link create error
|
2014-01-07 00:35:16 -08:00 |
minggo
|
feb4ac1cdb
|
Merge pull request #4959 from minggo/actionprogress-fade-tint
ActionProgress has fade and tint effect
|
2014-01-07 00:32:43 -08:00 |
minggo
|
1275d03c77
|
add override
|
2014-01-07 16:30:12 +08:00 |
heliclei
|
05f6fedd1e
|
fix windows symbol link path error
|
2014-01-07 16:27:23 +08:00 |
James Chen
|
7b6bdf40f8
|
Updates README.md for linux build
|
2014-01-07 16:25:37 +08:00 |
minggo
|
6bb4f9822a
|
ActionProgress has fade and tint effect
|
2014-01-07 16:23:58 +08:00 |
edwardzhou
|
e1c21aa9cb
|
rename UIHelper to Helper for consistency
|
2014-01-07 16:22:18 +08:00 |
James Chen
|
d733556270
|
Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 00:00:19 -08:00 |
James Chen
|
49ca35fc3d
|
Merge pull request #4956 from dumganhar/move-temp-obj
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
|
2014-01-06 23:58:42 -08:00 |
James Chen
|
1be11f8a82
|
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR for template.
|
2014-01-06 23:55:57 -08:00 |
CocosRobot
|
f8e7f570f3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 07:54:58 +00:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
James Chen
|
2a3481f20c
|
Moves temp files to CURRENT_BINARY_DIR.
|
2014-01-06 23:44:36 -08:00 |
Ricardo Quesada
|
947ed05e4c
|
Merge pull request #4953 from ricardoquesada/render_quad_material_id
RenderQuad with bigger size
|
2014-01-06 23:41:50 -08:00 |
heliclei
|
5dadbce813
|
fix symbol link create error
|
2014-01-07 15:41:18 +08:00 |