Ricardo Quesada
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
XiaoFeng
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
Ricardo Quesada
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
CocosRobot
30f3096c92
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-21 11:36:07 +00:00
CocosRobot
0f90f74df9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-19 09:12:27 +00:00
CocosRobot
b5141a28bd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-18 13:28:14 +00:00
Joachim Grill
ba45e2df33
updated lua bindings; updated file format description
2015-12-15 10:56:10 +01:00
CocosRobot
8cb2ec6187
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-15 04:31:50 +00:00
CocosRobot
0473dd88fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-13 03:12:14 +00:00
CocosRobot
6727719cb7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-10 01:47:27 +00:00
CocosRobot
7e803cbd0a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-07 03:30:43 +00:00
CocosRobot
d5e54bdb81
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:48:13 +00:00
CocosRobot
d09eae92f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 07:13:02 +00:00
CocosRobot
fd2d616aed
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 02:03:46 +00:00
CocosRobot
3edadc035b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 21:34:13 +00:00
CocosRobot
b1fd2277d8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 07:53:26 +00:00
CocosRobot
edd786e7f6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 06:30:18 +00:00
CocosRobot
0c67171b9d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 02:05:32 +00:00
CocosRobot
5c9084fd7d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-27 09:41:59 +00:00
CocosRobot
da9e8548a0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-25 17:29:11 +00:00
CocosRobot
06c7b94440
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-25 09:28:43 +00:00
CocosRobot
ded045ae26
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-24 07:01:07 +00:00
CocosRobot
d5b07e5b60
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-19 03:14:03 +00:00
CocosRobot
0794c7a43c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-17 04:09:43 +00:00
CocosRobot
3ee2e7a490
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-17 02:56:26 +00:00
CocosRobot
4ccc6ce5de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-11 06:53:45 +00:00
CocosRobot
f7803cba19
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-04 11:09:49 +00:00
CocosRobot
09cbc2145d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-28 03:29:16 +00:00
CocosRobot
5760e43387
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-26 01:45:38 +00:00
CocosRobot
6a0e1b323f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-20 02:42:17 +00:00
CocosRobot
216438fb9b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-10 01:40:55 +00:00
CocosRobot
1919d1a679
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-08 03:50:33 +00:00
CocosRobot
246fa7ffd8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-29 07:45:48 +00:00
CocosRobot
b082620d85
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-27 15:24:49 +00:00
minggo
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
CocosRobot
b09b146f97
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-22 09:23:14 +00:00
CocosRobot
9ef7991b99
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-21 10:43:59 +00:00
CocosRobot
0af77fca90
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-21 08:35:18 +00:00
CocosRobot
c562a57030
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 16:32:43 +00:00
CocosRobot
37cb9afb3f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 14:04:49 +00:00
CocosRobot
ad65343814
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 13:51:58 +00:00
CocosRobot
79a7878687
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 07:41:46 +00:00
CocosRobot
fe41739584
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 04:07:18 +00:00
CocosRobot
ae8a35a726
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 10:36:16 +00:00
CocosRobot
19561ca84b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 06:32:52 +00:00
CocosRobot
c9b30bd391
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 05:45:47 +00:00
CocosRobot
4b3e71e353
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 01:35:59 +00:00
CocosRobot
e79678454b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-11 09:59:04 +00:00
CocosRobot
cfe0be269b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-10 10:14:45 +00:00
CocosRobot
b3976cdd63
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 06:08:45 +00:00