James Chen
|
ac547cedca
|
Merge pull request #4999 from CocosRobot/updategeneratedsubmodule_1389238661
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-08 19:38:18 -08:00 |
CocosRobot
|
746a360176
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 03:37:44 +00:00 |
James Chen
|
23dec543b3
|
Merge pull request #4995 from Dhilan007/develop_crash
amendment incorrect use of macro
|
2014-01-08 19:30:29 -08:00 |
James Chen
|
29cbd2bcc8
|
Update CHANGELOG [ci skip]
|
2014-01-09 11:29:36 +08:00 |
James Chen
|
630bd32192
|
Update AUTHORS [ci skip]
|
2014-01-09 11:28:54 +08:00 |
James Chen
|
811271e5a1
|
Merge pull request #4997 from dumganhar/iss3619
Merge PR #4085: Fix of ControlButton doesn't support to set scale ratio of touchdown state
|
2014-01-08 19:27:24 -08:00 |
James Chen
|
46009e5daf
|
Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619
Conflicts:
extensions/GUI/CCControlExtension/CCControlButton.cpp
|
2014-01-09 11:16:44 +08:00 |
James Chen
|
526ac4c69a
|
Merge pull request #4996 from CocosRobot/updategeneratedsubmodule_1389236390
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-08 19:00:24 -08:00 |
CocosRobot
|
e66468025d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 02:59:53 +00:00 |
James Chen
|
8f12490df6
|
Update CHANGELOG [ci skip]
|
2014-01-09 10:52:19 +08:00 |
James Chen
|
33a7dba909
|
Update AUTHORS [ci skip]
|
2014-01-09 10:51:40 +08:00 |
James Chen
|
d4ff0ff7b8
|
Merge pull request #4075 from v1ctor/fix-extensions-slider
closed #3615: ControlSlider doesn't support setting selected thumb sprite
|
2014-01-08 18:50:34 -08:00 |
James Chen
|
c43baaa2df
|
Update AUTHORS [ci skip]
|
2014-01-09 10:02:52 +08:00 |
Dhilan007
|
3a235f1ffc
|
amendment incorrect use of macro
|
2014-01-09 09:50:02 +08:00 |
Dhilan007
|
fe7d5cbdfb
|
update If Construct
|
2014-01-09 09:46:17 +08:00 |
minggo
|
cca7ce2774
|
Merge pull request #4994 from Dhilan007/develop_crash
fix issue#3611:addImageAsync bad judgment of generate image for the first ImageFile.
|
2014-01-08 17:45:20 -08:00 |
Dhilan007
|
d18da42695
|
fix addImageAsync bad judgment of generate image for the first ImageFile.
|
2014-01-08 23:42:54 +08:00 |
James Chen
|
2de06a9655
|
Merge pull request #4993 from heliclei/develop
add auto generate bindings
|
2014-01-08 01:55:10 -08:00 |
heliclei
|
6cbf69306c
|
remove unnessesary chmod and ls command
|
2014-01-08 16:51:37 +08:00 |
heliclei
|
13fab57ce2
|
remove debug print
|
2014-01-08 16:27:08 +08:00 |
heliclei
|
f7a0e7da1a
|
add auto generate bindings
|
2014-01-08 16:21:11 +08:00 |
James Chen
|
ec7c9d1524
|
Merge pull request #4992 from dumganhar/develop
Updates CHANGELOG [ci skip]
|
2014-01-07 18:57:59 -08:00 |
James Chen
|
df18e86d86
|
Updates CHANGELOG [ci skip]
|
2014-01-08 10:57:27 +08:00 |
James Chen
|
3e7a21a367
|
Update AUTHORS [ci skip]
|
2014-01-08 10:51:34 +08:00 |
James Chen
|
c964451f5f
|
Merge pull request #4991 from dumganhar/iss3597-particle-plist
closed #3597: Merge PR #4846
|
2014-01-07 18:49:24 -08:00 |
James Chen
|
eb8f621ab0
|
closed #3597: Uses !xxx.empty() instead of xxx.size() > 0.
|
2014-01-08 10:47:27 +08:00 |
James Chen
|
685b80796b
|
Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist
|
2014-01-08 10:36:51 +08:00 |
minggo
|
6529380b77
|
Merge pull request #4988 from dumganhar/develop
If this.ctor was not found, output a log.
|
2014-01-07 06:41:53 -08:00 |
James Chen
|
65b5a7c031
|
If this.ctor was not found, output a log.
|
2014-01-07 22:39:14 +08:00 |
James Chen
|
20f2f7255e
|
Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 06:28:04 -08:00 |
CocosRobot
|
a650ddf88b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 14:27:34 +00:00 |
minggo
|
ac8a7b4ce1
|
Merge pull request #4983 from dabingnn/develop_layerColorBug
fix layerColor occlude sprite bug on android
|
2014-01-07 06:25:59 -08:00 |
James Chen
|
32809bfcaa
|
Merge pull request #4985 from samuele3hu/developNewUI
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua[ci skip]
|
2014-01-07 06:25:15 -08:00 |
samuele3hu
|
643ef73fad
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 22:20:03 +08:00 |
James Chen
|
2fde6db026
|
Merge pull request #4984 from dumganhar/develop
JSB TableView Fixes
|
2014-01-07 06:18:47 -08:00 |
James Chen
|
b07acb6c12
|
[JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell.
|
2014-01-07 22:17:22 +08:00 |
James Chen
|
e93b567000
|
ScrollView::intWithView supports be invoked several times.
|
2014-01-07 22:16:24 +08:00 |
samuele3hu
|
a61f9fce27
|
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
|
2014-01-07 22:16:07 +08:00 |
James Chen
|
4bb091067f
|
Adds empty constructor for TableView and TableViewCell.
|
2014-01-07 22:15:20 +08:00 |
Huabing.Xu
|
b1d9d5e55e
|
fix layerColor occlude sprite bug on android
|
2014-01-07 22:08:00 +08:00 |
James Chen
|
01745f5ba6
|
Merge pull request #4980 from CocosRobot/updategeneratedsubmodule_1389101321
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 05:46:08 -08:00 |
James Chen
|
93b4ed9b10
|
Merge pull request #4981 from dumganhar/develop
[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.
|
2014-01-07 05:42:31 -08:00 |
James Chen
|
1d852788e2
|
[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.
|
2014-01-07 21:40:06 +08:00 |
CocosRobot
|
6fd72db513
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 13:28:43 +00:00 |
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 |