James Chen
|
de28786e6d
|
Merge pull request #5864 from CocosRobot/update_lua_bindings_1395209593
[AUTO]: updating luabinding automatically
|
2014-03-19 14:24:32 +08:00 |
CocosRobot
|
f0fdcb22d3
|
[AUTO]: updating luabinding automatically
|
2014-03-19 06:14:23 +00:00 |
James Chen
|
7061641dd8
|
Merge pull request #5860 from Dhilan007/develop_label
closed #4434: Label's color is incorrect if it's created by font name
|
2014-03-19 14:09:32 +08:00 |
James Chen
|
863272b1c8
|
Merge pull request #5855 from lmskater/fix-android-build
[Jenkins] build all samples on android
|
2014-03-19 12:01:37 +08:00 |
James Chen
|
05db740d2f
|
Merge pull request #5837 from linchaogithub/develop
[jenkins-watchdog] update
|
2014-03-19 12:01:13 +08:00 |
samuele3hu
|
a432f488bd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-19 10:51:42 +08:00 |
samuele3hu
|
a91994f242
|
Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest.
|
2014-03-19 10:50:11 +08:00 |
Dhilan007
|
bb17da8f88
|
add override for Label::updateDisplayedColor
|
2014-03-19 10:36:44 +08:00 |
Dhilan007
|
f76460aee8
|
closed issue#4434:fixed display incorrect color of label if create by font name.
|
2014-03-19 10:10:47 +08:00 |
James Chen
|
ab47c34f5f
|
Merge pull request #5859 from CocosRobot/update_lua_bindings_1395194145
[AUTO]: updating luabinding automatically[ci skip]
|
2014-03-19 10:04:36 +08:00 |
CocosRobot
|
781ff463a2
|
[AUTO]: updating luabinding automatically
|
2014-03-19 01:56:50 +00:00 |
James Chen
|
0fad41a9cc
|
Update CHANGELOG [ci skip]
|
2014-03-19 09:53:12 +08:00 |
James Chen
|
a5e9630db1
|
Merge pull request #5843 from Dhilan007/develop_label
closed #4428: fixed display incorrect of multi-line label if invoking 'getLetter'.
|
2014-03-19 09:52:14 +08:00 |
chuanweizhang2013
|
a0b8200b79
|
forget include
|
2014-03-19 09:50:06 +08:00 |
chuanweizhang2013
|
7af5060896
|
add pc args
|
2014-03-18 18:24:58 +08:00 |
Jeong YunWon
|
2f1a7ebf42
|
Elastic bounceback for ScrollView
Add iOS-like elastic bounceback.
If you scroll content of scroll view out of insets,
its content will be scrolled 0.35 of user scrolled distance.
|
2014-03-18 18:51:07 +09:00 |
lm
|
426b006bfb
|
[Jenkins] build all samples on android
|
2014-03-18 17:27:57 +08:00 |
chuanweizhang2013
|
f5688d7a5d
|
update
|
2014-03-18 17:25:21 +08:00 |
CocosRobot
|
ee0e43fcc2
|
modify android-job in autotest.py.
|
2014-03-18 16:21:41 +08:00 |
boyu0
|
c4aaaf9231
|
closed #4424: fix PhysicsBody::setGravity() doesn't work correctly sometimes.
|
2014-03-18 16:17:43 +08:00 |
James Chen
|
88849e1510
|
Merge pull request #5853 from CocosRobot/update_lua_bindings_1395129281
[AUTO]: updating luabinding automatically
|
2014-03-18 16:15:54 +08:00 |
chuanweizhang2013
|
a346d71a91
|
fixed reserlution order
|
2014-03-18 15:56:01 +08:00 |
CocosRobot
|
fc5a34e500
|
[AUTO]: updating luabinding automatically
|
2014-03-18 07:55:30 +00:00 |
James Chen
|
7a16ffff84
|
Merge pull request #5848 from samuele3hu/develop_3_fix
Update `bindings-generator` submodule and resolve a error about the return value of FileUtilsWin32::getWritablePath()
|
2014-03-18 15:52:07 +08:00 |
CocosRobot
|
e80b152045
|
ignore it.
|
2014-03-18 14:52:01 +08:00 |
CocosRobot
|
789ebb7d67
|
last version, need ignore
|
2014-03-18 14:49:49 +08:00 |
James Chen
|
2fd3e3df65
|
Merge pull request #5850 from lmskater/fix-submodule-update-fail
[Jenkins] make build fail when submodule update fail
|
2014-03-18 14:48:25 +08:00 |
lm
|
716f480eb4
|
[Jenkins] make build fail when submodule update fail
|
2014-03-18 14:37:23 +08:00 |
andyque
|
8c25fd5e8f
|
modify android-build-autotest in autotest.py.
|
2014-03-18 14:30:01 +08:00 |
andyque
|
a4bba6d03a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into autotest
|
2014-03-18 14:07:24 +08:00 |
andyque
|
761456d480
|
test android part of autotest.py.
|
2014-03-18 14:06:33 +08:00 |
Dhilan007
|
a286ed8374
|
fixed typo.
|
2014-03-18 13:48:41 +08:00 |
samuele3hu
|
76abe8d1c9
|
make FileUtilsWin32::getWritablePath() return value unified whether release or debug
|
2014-03-18 10:51:07 +08:00 |
samuele3hu
|
402b6f0f28
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix
|
2014-03-18 10:40:12 +08:00 |
samuele3hu
|
309422f791
|
update `bindings-generator` submodule
|
2014-03-18 10:36:37 +08:00 |
Dhilan007
|
d59fb25e2a
|
update test case of issue 4428.
|
2014-03-18 10:26:45 +08:00 |
Dhilan007
|
4d5c7fc634
|
Add a test case to reproduce issue 4428.
|
2014-03-18 10:20:25 +08:00 |
chuanweizhang2013
|
da26dc0138
|
Merge pull request #18 from cocos2d/develop
update cocos2d-x
|
2014-03-18 10:13:18 +08:00 |
chuanweizhang2013
|
05a5e93d04
|
fixed win32 exit
|
2014-03-18 09:41:14 +08:00 |
Sergey
|
f65ef462e5
|
getCurrentLanguageCode() for all platforms return iso 639-1 language code
iPhone template improvements(for game center support)
|
2014-03-17 22:34:21 +04:00 |
heliclei
|
fe1bc368ec
|
refactor upload:encode file with base64, detach upload from main loop
|
2014-03-18 00:46:17 +08:00 |
heliclei
|
4657b28c2d
|
refactor upload:encode file with base64, detach upload from main loop
|
2014-03-18 00:42:36 +08:00 |
chuanweizhang2013
|
6b2ce283e4
|
fixed win32 don't exit
|
2014-03-17 20:46:49 +08:00 |
Dhilan007
|
46a4c17097
|
change access specifier of SpriteBatchNode::addSpriteWithoutQuad.
|
2014-03-17 19:31:58 +08:00 |
Dhilan007
|
cc671835f8
|
closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line.
|
2014-03-17 18:33:15 +08:00 |
minggo
|
36cfd17e7b
|
Merge pull request #5834 from shujunqiao/autotest
modify autotest.py for use mac app.
|
2014-03-17 17:59:36 +08:00 |
linchaogithub
|
88232d86bd
|
[jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password']
|
2014-03-17 16:10:26 +08:00 |
minggo
|
9c92929781
|
Merge pull request #5838 from natural-law/develop
Update the reference of submodule "cocos2d-console".
|
2014-03-17 15:26:57 +08:00 |
zhangbin
|
bf68f180b4
|
Update the reference of submodule "cocos2d-console".
|
2014-03-17 15:25:07 +08:00 |
chuanweizhang2013
|
e89f20a0b3
|
update win32 prebuilt
|
2014-03-17 15:00:21 +08:00 |