James Chen
|
f12fb48eef
|
Merge pull request #5011 from Dhilan007/develop_crash
fix compiling error in CCControlSlider.cpp on vs.
|
2014-01-08 23:59:20 -08:00 |
Dhilan007
|
ccda90cab5
|
fix compiling error in CCControlSlider.cpp on vs.
|
2014-01-09 15:52:04 +08:00 |
CaiWenzhi
|
1ca7642976
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 15:51:24 +08:00 |
CaiWenzhi
|
19f0e55464
|
fixed bug of layout
|
2014-01-09 15:43:18 +08:00 |
James Chen
|
43a9c84cc2
|
Update CHANGELOG [ci skip]
|
2014-01-09 15:26:54 +08:00 |
James Chen
|
b8528351c4
|
Update AUTHORS [ci skip]
|
2014-01-09 15:26:24 +08:00 |
boyu0
|
e063755596
|
fix Image crashes in mac when load tag file
|
2014-01-09 15:26:05 +08:00 |
James Chen
|
2c8c7a7a9d
|
Merge pull request #5008 from dumganhar/iss3605-websocket-4k
Merge PR #5003: fix WebSocket cannot send/receive more than 4096 bytes of data
|
2014-01-08 23:23:42 -08:00 |
James Chen
|
f8d369248b
|
closed #3605: Websocket doesn't support send/receive data which larger than 4096 bytes, renames member variables to follow cocos2d-x coding guide line.
|
2014-01-09 15:18:06 +08:00 |
James Chen
|
ef7aea6edc
|
Merge pull request #5007 from CocosRobot/updategeneratedsubmodule_1389250605
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-08 22:59:27 -08:00 |
CocosRobot
|
ce0b86e7fe
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 06:56:48 +00:00 |
Zhe Wang
|
a5130633c6
|
Merge pull request #5005 from walzer/remove_UICCLabelAtlas
Hide default constructor of LabelAtlas into protected, and modify related invokes.
|
2014-01-08 22:50:59 -08:00 |
Huabing.Xu
|
1b339a4635
|
Add Test Case: LayerColor should not occlude sprites and labels when depth test is true
|
2014-01-09 14:50:29 +08:00 |
walzer
|
1ad14340bf
|
issue #3627, remove Hungarian Notation in LabelAtlas
|
2014-01-09 14:26:34 +08:00 |
walzer
|
8da4879560
|
issue #3627, remove lua/js doxygen mark from LabelAtals constructor & destructor.
|
2014-01-09 14:21:43 +08:00 |
James Chen
|
b0f6ae8c42
|
Merge commit 'refs/pull/5003/head' of git://github.com/cocos2d/cocos2d-x into websocket-test
|
2014-01-09 14:16:44 +08:00 |
walzer
|
d15874fdf7
|
fixed #3627, an extra benefit from adding LabelAtlas::create() is that we can hide its default constructor into protected.
|
2014-01-09 14:16:26 +08:00 |
edwardzhou
|
480a9277da
|
fix WebSocket cannot send/receive more than 4096 bytes of data
|
2014-01-09 13:29:56 +08:00 |
James Chen
|
b454bf01e3
|
Merge pull request #5002 from heliclei/develop
support [ci skip] in commit message
|
2014-01-08 20:53:19 -08:00 |
James Chen
|
d9d91b04e8
|
Merge pull request #5001 from CocosRobot/updategeneratedsubmodule_1389243030
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-08 20:52:24 -08:00 |
CocosRobot
|
2945322b97
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 04:50:38 +00:00 |
heliclei
|
007a64e50e
|
support [ci skip] command
|
2014-01-09 12:47:46 +08:00 |
Zhe Wang
|
bbd4a2b235
|
Merge pull request #5000 from walzer/remove_UICCLabelAtlas
Remove UICCLabelAtlas in GUI module
|
2014-01-08 20:45:01 -08:00 |
walzer
|
7055340ace
|
fixed #3627. There're no UICCLabelAtlas any more.
|
2014-01-09 12:43:57 +08:00 |
walzer
|
2d8fcb2c00
|
issue #3627, remove UICCLabelAtlas, add LabelAtlas::create() for GUI module
|
2014-01-09 12:40:51 +08:00 |
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 |
CaiWenzhi
|
4cadcca497
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 11:01:47 +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 |
heliclei
|
2b7aa26308
|
fix create job state
|
2014-01-09 10:56:33 +08: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 |
CaiWenzhi
|
092dd73895
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 10:48:58 +08:00 |
James Chen
|
c43baaa2df
|
Update AUTHORS [ci skip]
|
2014-01-09 10:02:52 +08:00 |
CaiWenzhi
|
dc443e36d3
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 09:59:39 +08:00 |
CaiWenzhi
|
e3667a2894
|
Fixed bugs.
|
2014-01-09 09:58:27 +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 |
Ricardo Quesada
|
dccd1b40de
|
Adds a new test that shows the problem with the Camera
Apprently the bug is in QuadCommand, since if we use CustomCommand
the camera works OK.
|
2014-01-08 16:28:18 -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 |
WuHuan
|
1cd68accc1
|
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
|
2014-01-08 17:03:44 +08:00 |