James Chen
13cf67747a
Update CHANGELOG [ci skip]
2014-01-02 09:58:05 +08:00
James Chen
3f4236dda0
Update AUTHORS [ci skip]
2014-01-02 09:57:21 +08:00
James Chen
d1ad635ad8
Merge pull request #4497 from zhiqiangxu/develop
...
closed #3559 : Useless conversion in ScrollView::onTouchBegan
2014-01-01 17:55:41 -08:00
James Chen
e5389ddb31
Merge pull request #4765 from heliclei/develop
...
Add exception handling
2014-01-01 06:00:50 -08:00
James Chen
579f81fb61
Update AUTHORS [ci skip]
2014-01-01 21:56:51 +08:00
James Chen
aff08adc66
Update CHANGELOG [ci skip]
2014-01-01 21:55:58 +08:00
James Chen
0ec2738ce5
Merge pull request #4720 from zarelaky/develop
...
closed #3556 : openal context not destroy correctly on mac and ios
2014-01-01 05:55:03 -08:00
James Chen
b09d93d09e
Merge pull request #4767 from CocosRobot/updategeneratedsubmodule_1388584195
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-01 05:51:36 -08:00
CocosRobot
ff550bf865
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-01 13:49:57 +00:00
James Chen
2abb152c01
Merge pull request #4766 from dumganhar/gui-rename
...
Merge PR #4761 , GUI class name renaming
2014-01-01 05:44:23 -08:00
James Chen
591740253d
[GUI] Updates scripting binding configure file.
2014-01-01 21:32:54 +08:00
James Chen
71d21d2e10
Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename
2013-12-31 19:13:59 +08:00
heliclei
1c0fc7859b
1.Add exception handling
...
2.Correct pull request action name
3.Enlarge description text
2013-12-31 18:29:32 +08:00
James Chen
168b131fcb
Merge pull request #4764 from dumganhar/develop
...
[JSB] Adds cc.VisibleRect and updates JS-Test submodule
2013-12-31 02:28:14 -08:00
James Chen
8c1c9fef15
Bug fix in cc.VisibleRect
2013-12-31 18:17:20 +08:00
James Chen
f793ff01b2
Updates JS-test submodule.
2013-12-31 18:15:47 +08:00
James Chen
74a7f68dc1
[JSB] Adds cc.VisibleRect.
2013-12-31 18:12:42 +08:00
James Chen
c8c37ac63c
Updates JS-Test submodule
2013-12-31 17:25:14 +08:00
CaiWenzhi
e825d255bd
Merge branch 'develop' into develop_nutty_modify_framework_ModifyLabelClassName
2013-12-31 16:38:11 +08:00
James Chen
7f2dc5197e
Updates travis-script, don't build template proj.
...
Since we are supporting create project anywhere, to test template projects, projects should be created firstly.Therefore, disable building template for travis-ci.
2013-12-31 16:37:05 +08:00
CaiWenzhi
81bdfac795
Modify class name Label LabelBMFont LabelAtlas
2013-12-31 16:36:33 +08:00
Dhilan007
ebf3faadc3
fix crash related to not support the z length modifier for size_t on vs
2013-12-31 16:32:16 +08:00
James Chen
db475fb43c
Merge pull request #4757 from dumganhar/develop
...
Adds execute permission for create_project.pyw
2013-12-31 00:11:22 -08:00
James Chen
75d28a3114
Adds execute permission for create_project.pyw
2013-12-31 16:10:55 +08:00
James Chen
940c673278
Merge pull request #4657 from chuanweizhang2013/develop
...
closed #2860 : Project creator supports creating project at any folder and supports UI
2013-12-31 00:07:03 -08:00
minggo
da2487f653
Merge pull request #4754 from dabingnn/develop_RenderTextureBug
...
Develop render texture bug
2013-12-30 23:23:16 -08:00
chuanweizhang
6b5b49bb0b
solve linux can't build
2013-12-31 15:08:21 +08:00
chuanweizhang
2579573b7e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-31 14:58:37 +08:00
Huabing.Xu
b2934d32bc
Merge branch 'develop' into develop_RenderTextureBug
...
* develop: (32 commits)
fix align text error in label
Update the JS binding code & samples for latest cocos2d engine.
[AUTO] : updating submodule reference to latest autogenerated bindings
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
Updates nativeactivity.cpp.
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
remove other non-functional jenkins scripts
[AUTO] : updating submodule reference to latest autogenerated bindings
move ghprb.py to tools/jenkins-scripts/
issue #2050 : commit resources
add github pull request builder for Jenkins
Adds an empty LuaEngine::parseConfig function.
[JSB] Adds trigger bindings for CocoStudio.
update cocos2d-x version string
update describe for support translucency on android
update describe for support translucency on android
update describe for support translucency on android
recover java activity on android.
remove draw increment
migrate ShaderTestSprite to new renderer
...
2013-12-31 14:58:11 +08:00
Huabing.Xu
8d9f62731e
fix RenderTextureTestDepthStencil test sample
2013-12-31 14:48:07 +08:00
minggo
a80c9dd625
Merge pull request #4752 from Dhilan007/label_distanceField
...
fix align text error in label
2013-12-30 22:27:55 -08:00
James Chen
999d46301c
Merge pull request #4750 from natural-law/develop
...
Update the JS binding code & samples for latest cocos2d engine.
2013-12-30 22:15:53 -08:00
Dhilan007
b51efbd654
fix align text error in label
2013-12-31 14:13:26 +08:00
zhangbin
06dba7fc69
Update the JS binding code & samples for latest cocos2d engine.
2013-12-31 14:07:45 +08:00
yinkaile
c88f098a66
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-31 13:18:27 +08:00
James Chen
07fa18807d
Merge pull request #4747 from CocosRobot/updategeneratedsubmodule_1388461005
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 20:02:23 -08:00
Huabing.Xu
bc9f0311f4
migrate render texture test sample to new renderer
2013-12-31 11:49:46 +08:00
Huabing.Xu
bf1f5dd0e0
fix rendertexture bug
2013-12-31 11:48:51 +08:00
CocosRobot
2555318c13
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-31 03:36:47 +00:00
minggo
2b54e5e296
Merge pull request #3864 from dumganhar/iss2865-deprecate-ccnotification
...
closed #2865:Deprecates NotificationCenter, uses new EventDispatcher instead.
2013-12-30 19:31:34 -08:00
James Chen
8145bf903e
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
2013-12-31 11:02:01 +08:00
James Chen
973adc6b2f
Updates nativeactivity.cpp.
2013-12-31 10:55:59 +08:00
James Chen
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
chuanweizhang
a4e3968f39
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
2013-12-31 10:06:59 +08:00
James Chen
fe97fecc74
Merge pull request #4745 from heliclei/develop
...
move ghprb.py to tools/jenkins-scripts, delete other non-functional scripts
2013-12-30 06:30:55 -08:00
heliclei
62a0828f5b
remove other non-functional jenkins scripts
2013-12-30 22:03:22 +08:00
James Chen
bc0d094b94
Merge pull request #4746 from CocosRobot/updategeneratedsubmodule_1388411356
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 05:57:53 -08:00
CocosRobot
674804f1b4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 13:49:19 +00:00
James Chen
1d8ee016e5
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
...
closed #2050 : fix tilemap firstgid bug
2013-12-30 05:42:19 -08:00
heliclei
7696a5f2cc
move ghprb.py to tools/jenkins-scripts/
2013-12-30 21:40:28 +08:00