Dale Stammen
|
4d7e6567ea
|
Use TextBMFont when text is updated from slider for faster performance
|
2015-04-27 19:48:15 -07:00 |
WenhaiLin
|
41e2d84116
|
Fixed compile error on VS 2012.
|
2015-04-28 10:35:21 +08:00 |
minggo
|
e61e88bbad
|
[ci skip]update CHANGELOG
|
2015-04-28 09:48:25 +08:00 |
minggo
|
99482d4e48
|
Merge pull request #11614 from xiaofeng11/v3.6
Fix simulator crash when add animation under a user defined lua extension
|
2015-04-28 09:45:44 +08:00 |
minggo
|
1ac0c8c0b1
|
Merge pull request #11616 from WenhaiLin/v3.6
TransitionsTests:Fixed Transition not work when switch between test cases
|
2015-04-28 09:35:45 +08:00 |
minggo
|
a32a1029f5
|
Merge pull request #11617 from lvlonggame/v3
fix bug: set sprite name
|
2015-04-28 09:35:04 +08:00 |
minggo
|
669deecd3c
|
Merge pull request #11615 from CocosRobot/update_lua_bindings_1430127880
[AUTO]: updating luabinding automatically
|
2015-04-28 09:34:51 +08:00 |
minggo
|
ce9f40fb9a
|
Merge pull request #11619 from samuele3hu/v3.6_test1
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon
|
2015-04-28 09:32:30 +08:00 |
samuele3hu
|
dc765aee25
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1
|
2015-04-28 09:19:03 +08:00 |
samuele3hu
|
51bcac9e84
|
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest
|
2015-04-28 09:17:00 +08:00 |
lvlong
|
cecea92fde
|
fix bug: set sprite name
|
2015-04-27 19:12:44 +08:00 |
minggo
|
6b13505d1d
|
Merge pull request #11613 from Wu-Hao/v3.6
updated SpritePolygon
|
2015-04-27 17:59:59 +08:00 |
CocosRobot
|
a7edda72f5
|
[AUTO]: updating luabinding automatically
|
2015-04-27 09:47:08 +00:00 |
minggo
|
bd5f4e0285
|
[ci skip]update AUTHORS
|
2015-04-27 17:43:57 +08:00 |
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 |