XiaoFeng
|
28264c0742
|
Fix simulator crash when add animation under a user defined lua extension
|
2015-04-27 17:42:20 +08:00 |
minggo
|
30a646f769
|
[ci skip]update CHANGELOG
|
2015-04-27 17:41:40 +08:00 |
minggo
|
5197044e8c
|
Merge pull request #10679 from loadrunner/physics_sensor
added sensor property to shapes
|
2015-04-27 17:40:08 +08:00 |
WuHao
|
597d2289c0
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
|
2015-04-27 17:31:50 +08:00 |
WuHao
|
a046f74c4d
|
fix anchor point bug
|
2015-04-27 17:30:38 +08:00 |
WenhaiLin
|
70a641e2b3
|
TransitionsTests:Fixed Transition not work when switch between test cases.
|
2015-04-27 17:22:20 +08:00 |
minggo
|
f80220cbfe
|
[ci skip]update AUTHORS
|
2015-04-27 17:19:42 +08:00 |
WuHao
|
dcf8f674bc
|
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
Conflicts:
cocos/2d/SpritePolygon.cpp
cocos/2d/SpritePolygonCache.cpp
|
2015-04-27 17:18:26 +08:00 |
minggo
|
2441e1290f
|
[ci skip]update CHANGELOG
|
2015-04-27 17:17:36 +08:00 |
minggo
|
2f43c8f146
|
Merge pull request #11611 from minggo/check-filename-case-on-windows
Check filename case on windows
|
2015-04-27 17:16:20 +08:00 |
minggo
|
454ca26653
|
[ci skip] update version
|
2015-04-27 16:47:22 +08:00 |
minggo
|
ee29888d8e
|
[ci skip] update version
|
2015-04-27 16:46:03 +08:00 |
WuHao
|
815c6a9b74
|
merge the start and end points
|
2015-04-27 16:33:54 +08:00 |
minggo
|
822dfcf61d
|
Merge pull request #11610 from CocosRobot/update_lua_bindings_1430120801
[AUTO]: updating luabinding automatically
|
2015-04-27 16:28:38 +08:00 |
minggo
|
2d2f0aac59
|
fix indent
|
2015-04-27 16:25:24 +08:00 |
minggo
|
8c4cecca0d
|
fix indent and translate Chinese comment to English
|
2015-04-27 16:22:54 +08:00 |
CocosRobot
|
09a6cc19b7
|
[AUTO]: updating luabinding automatically
|
2015-04-27 07:48:42 +00:00 |
minggo
|
dcf48eaa04
|
Merge pull request #11609 from CocosRobot/update_cocosfiles_1430120770
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-27 15:47:37 +08:00 |
CocosRobot
|
ef82d9fa3a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-27 07:46:12 +00:00 |
minggo
|
c0b2433bb5
|
Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows
|
2015-04-27 15:45:23 +08:00 |
minggo
|
588e575f7f
|
Merge pull request #11608 from samuele3hu/v3.6_test1
[ci skip]Update configure for auto travis and generate-cocosfiles.sh
|
2015-04-27 15:43:47 +08:00 |
samuele3hu
|
95381ab975
|
Update the generate-cocosfiles.sh
|
2015-04-27 15:41:26 +08:00 |
samuele3hu
|
99bdfeb468
|
Update the configure about travis
|
2015-04-27 15:38:35 +08:00 |
Hao Wu
|
7212735284
|
Merge pull request #4 from samuele3hu/v3.6
Update SpritePolygon
|
2015-04-27 15:23:14 +08:00 |
samuele3hu
|
3de665b9cd
|
Update SpritePolygon
|
2015-04-27 15:19:26 +08:00 |
minggo
|
c9bacd58e8
|
Merge pull request #11591 from Wu-Hao/v3.6
V3.6
|
2015-04-27 14:22:21 +08:00 |
WuHao
|
c7e990dcae
|
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
Conflicts:
cocos/2d/SpritePolygon.cpp
|
2015-04-27 13:39:41 +08:00 |
WuHao
|
9f2ea5fbb9
|
fixed some SpritePolygon create, added more tests
|
2015-04-27 13:34:47 +08:00 |
Hao Wu
|
f8464659e3
|
Merge pull request #3 from samuele3hu/v3.6
Add the PolySprite support and adjust the project setting on the different platform
|
2015-04-27 12:02:50 +08:00 |
samuele3hu
|
d7dbb910d0
|
Update SpritePolygonCache
|
2015-04-27 11:57:36 +08:00 |
minggo
|
98fcd83d50
|
Merge pull request #10870 from daiki1003/fix/scroll_view_container
Fix container view's anchor point problem.
|
2015-04-27 11:44:19 +08:00 |
minggo
|
92b7dcd64b
|
Merge pull request #11601 from CocosRobot/update_lua_bindings_1430101389
[AUTO]: updating luabinding automatically
|
2015-04-27 11:32:12 +08:00 |
samuele3hu
|
cf53d13f6f
|
Update SpritePolygon.cpp
|
2015-04-27 11:07:08 +08:00 |
samuele3hu
|
6f17dcecf2
|
Update config.json for 3rd-party-libs and SpritePolygonCache
|
2015-04-27 11:01:47 +08:00 |
minggo
|
0a8f533e80
|
Merge pull request #11590 from super626/v3
Animate3D Quality control
|
2015-04-27 10:58:10 +08:00 |
WuHao
|
c2cefadb6f
|
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
|
2015-04-27 10:44:56 +08:00 |
WuHao
|
cd0ebc1801
|
fix the info struct
|
2015-04-27 10:44:23 +08:00 |
CocosRobot
|
09cddb4d4b
|
[AUTO]: updating luabinding automatically
|
2015-04-27 02:25:05 +00:00 |
minggo
|
c500d6b0a7
|
Merge pull request #11588 from WenhaiLin/v3-jsb
[js-tests]Fixed crash.
|
2015-04-27 10:20:07 +08:00 |
minggo
|
d932d1e7e1
|
[ci skip]update CHANGELOG
|
2015-04-27 10:17:56 +08:00 |
minggo
|
033cfaa30b
|
Merge pull request #11592 from fusijie/add_EaseRateAction_create_method
Add EaseRateAction::create() method.
|
2015-04-27 10:16:38 +08:00 |
yangxiao
|
2dbb6a54b5
|
modify change log
|
2015-04-27 09:56:36 +08:00 |
minggo
|
838aa688b8
|
Merge pull request #11595 from loadrunner/seperate_typo
fixed 'seperate' typo
|
2015-04-27 09:33:12 +08:00 |
Hao Wu
|
7232577b23
|
Merge pull request #2 from samuele3hu/v3.6
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
|
2015-04-27 09:32:44 +08:00 |
samuele3hu
|
bd5ca083e9
|
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
|
2015-04-26 23:08:14 +08:00 |
HueyPark
|
25a9c90b54
|
Fix android http client memory leak
|
2015-04-26 20:52:09 +09:00 |
Danut Chereches
|
5f692962b9
|
fixed 'seperate' typo
issue #8408
|
2015-04-25 00:02:39 +03:00 |
Jacky
|
633c1aed75
|
Add EaseRateAction::create() method.
|
2015-04-24 18:31:44 +08:00 |
WuHao
|
9496a48800
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-04-24 18:29:23 +08:00 |
WuHao
|
c1d10ffa1c
|
fixed poly2tri creation method, added testCase
|
2015-04-24 18:28:28 +08:00 |