pandamicro
|
b19bf82170
|
Merge pull request #14108 from loadrunner/label2
Changed label font size type to float
|
2015-10-13 11:55:14 +08:00 |
pandamicro
|
5e43cfa129
|
Merge pull request #14107 from loadrunner/label1
Removed scale factor for label shadow
|
2015-10-13 11:54:14 +08:00 |
pandamicro
|
5b35796093
|
Merge pull request #14091 from yangws/v3
Fix textfield input Chinese error with specific IME on Android.
|
2015-10-12 14:54:56 +08:00 |
pandamicro
|
ef04ebe6bc
|
Merge pull request #14118 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
|
2015-10-12 14:22:35 +08:00 |
zhangbin
|
f25b62b4b5
|
Update the reference of submodule cocos2d-console.
|
2015-10-12 14:16:18 +08:00 |
pandamicro
|
547e2f15a1
|
Merge pull request #14115 from mogemimi/fix-typo
Fix typo in UIEditBox
|
2015-10-12 13:45:47 +08:00 |
mogemimi
|
daa29752db
|
Fix typo in UIEditBox
|
2015-10-12 13:57:50 +09:00 |
pandamicro
|
f2e3a0c071
|
Merge pull request #14104 from xiaofeng11/v3_bugfix
Bug fix
|
2015-10-12 10:14:26 +08:00 |
pandamicro
|
3dde02ba93
|
Merge pull request #14106 from loadrunner/tilemap
TMXLayer cast bug
|
2015-10-11 18:43:24 +08:00 |
Danut Chereches
|
471c23930c
|
added line spacing/leading
|
2015-10-10 19:15:45 +03:00 |
Danut Chereches
|
019b549a20
|
changed font size type to float
|
2015-10-10 19:15:22 +03:00 |
Danut Chereches
|
aeb268f3cd
|
cast tile coordinates to int before calculating index
|
2015-10-10 19:05:51 +03:00 |
WenhaiLin
|
05c235f9fe
|
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory"
|
2015-10-10 17:55:05 +08:00 |
XiaoFeng
|
aee3244ad3
|
Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2
|
2015-10-10 17:50:48 +08:00 |
pandamicro
|
cff1a8ed50
|
Merge pull request #14103 from xiaofeng11/v3_bugfix
Bug fix
|
2015-10-10 17:20:07 +08:00 |
XiaoFeng
|
4df211fa0b
|
Fix particle test under lua test project display different in different platform
Fix cocostudio 3d test under lua test project crash bug
|
2015-10-10 14:51:14 +08:00 |
pandamicro
|
fe4759e71d
|
Merge pull request #14102 from CocosRobot/update_cocosfiles_1444448681
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-10-10 11:44:58 +08:00 |
CocosRobot
|
fda99182da
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-10-10 03:44:43 +00:00 |
pandamicro
|
f64105b3dc
|
Merge pull request #14047 from liamcindy/v3.9
update for light3d reader
|
2015-10-10 11:43:05 +08:00 |
pandamicro
|
376180c1d6
|
Merge pull request #14093 from cpascal/fix_audioplayer
Fixed AudioPlayer crash in Win32
|
2015-10-10 11:32:46 +08:00 |
pandamicro
|
c2571f950c
|
Merge pull request #14003 from zilongshanren/fixWebViewCallback
fix ui::WebView callback operate OpenGL issue.
|
2015-10-10 11:32:02 +08:00 |
pandamicro
|
8b0a6a6c29
|
Merge pull request #14099 from pandamicro/v3
[ci skip]Sync with CCBoot for web
|
2015-10-10 10:16:16 +08:00 |
pandamicro
|
5ae2812bf8
|
Sync with CCBoot for web
|
2015-10-10 10:15:36 +08:00 |
pandamicro
|
bf35655ce3
|
Merge pull request #14100 from CocosRobot/update_lua_bindings_1444440864
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-10 09:44:51 +08:00 |
pandamicro
|
ee3399a4a4
|
Merge pull request #14097 from TheCodez/patch-1
Add missing getChildByTag<>() api
|
2015-10-10 09:43:46 +08:00 |
CocosRobot
|
216438fb9b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-10 01:40:55 +00:00 |
pandamicro
|
5a4ccf25dd
|
Merge pull request #14094 from xiaofeng11/v3
Fix Enable_Bitcode compile error under xCode 7
|
2015-10-10 09:40:32 +08:00 |
pandamicro
|
db0d23ede4
|
Merge pull request #14087 from geron-cn/v3
fix code error, redundant interface
|
2015-10-10 09:39:35 +08:00 |
pandamicro
|
27fc6b24ee
|
Merge pull request #14080 from 1scaR1/v3
Fixed enabling of scale9 background in ccui.Layout
|
2015-10-10 09:39:09 +08:00 |
pandamicro
|
7d4988f43f
|
Merge pull request #14095 from mogemimi/fix-typo
Fix typos
|
2015-10-10 09:29:53 +08:00 |
Michael Kösel
|
493d95c3f6
|
Add missing getChildByTag<>() api
|
2015-10-10 00:08:38 +02:00 |
pandamicro
|
bc9b59b7f7
|
Merge pull request #14096 from pandamicro/v3
[ci skip]Add opacity/color cascade test case for Scale9Sprite
|
2015-10-09 21:07:27 +08:00 |
pandamicro
|
0ea54868e2
|
Add opacity/color cascade test case for Scale9Sprite
|
2015-10-09 21:01:49 +08:00 |
mogemimi
|
5993304e06
|
Fix typos
|
2015-10-09 17:59:11 +09:00 |
XiaoFeng
|
b90beaabe9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-10-09 15:37:09 +08:00 |
XiaoFeng
|
13a5673485
|
Fix Enable_Bitcode compile error under xCode 7
|
2015-10-09 15:36:40 +08:00 |
pandamicro
|
87677cdbd1
|
Merge pull request #14088 from chengstory/Fix#23321
Fix Bug #23321
|
2015-10-09 15:27:56 +08:00 |
cpascal
|
13c1258f9d
|
Fixed AudioPlayer crash in Win32
|
2015-10-09 15:03:05 +09:00 |
Vincent Yang
|
90ef4be103
|
Fix textfield input chinese error with specific IME on Android.
|
2015-10-09 12:06:22 +08:00 |
子龙山人
|
cdf6fa8a54
|
Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
|
2015-10-09 08:27:18 +08:00 |
pandamicro
|
4b66caaed8
|
Merge pull request #14084 from super626/v3
correct spot light init value
|
2015-10-08 17:15:03 +08:00 |
Liam
|
68f25f65c4
|
update submodule
|
2015-10-08 14:59:48 +08:00 |
zhangcheng
|
77062acfa7
|
Fix Bug #23321
|
2015-10-08 14:48:38 +08:00 |
geron-cn
|
6b9890472b
|
fix code error, redundant interface
|
2015-10-08 14:14:49 +08:00 |
pandamicro
|
d6bb62beee
|
Merge pull request #14083 from chengstory/Fix#23337
Fix Bug #23337
|
2015-10-08 11:54:07 +08:00 |
pandamicro
|
f730a38db6
|
Merge pull request #14086 from CocosRobot/update_lua_bindings_1444275958
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-08 11:51:04 +08:00 |
pandamicro
|
2d73bbd9d4
|
Merge pull request #14056 from Dimon4eg/fix-crash-if-csb-file-is-missing
fix crash if csb file is broken
|
2015-10-08 11:50:40 +08:00 |
CocosRobot
|
1919d1a679
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-08 03:50:33 +00:00 |
zilongshanren
|
7fd2ad7548
|
remove unneeded final temp string
|
2015-10-08 11:47:11 +08:00 |
pandamicro
|
a68d07b968
|
Merge pull request #14075 from TheCodez/getname_byref
Node::getName() now returns string by reference
|
2015-10-08 11:43:03 +08:00 |