Ricardo Quesada
|
6462a1bf79
|
Adds simple sample for multitexturing
|
2014-05-13 12:55:34 -07:00 |
Ricardo Quesada
|
adce46a7b4
|
Merge pull request #6720 from ricardoquesada/matrix_constants
Matrix::identity() -> IDENTITY
|
2014-05-13 10:28:41 -07:00 |
Ricardo Quesada
|
31dd70dba2
|
Matrix::identity() -> IDENTITY
consistency with the rest of the cocos2d API
|
2014-05-13 10:26:25 -07:00 |
James Chen
|
41e57a6de3
|
Merge pull request #6718 from dumganhar/v3
Updates travis.yml, adds email notification to @Minggo and @James
|
2014-05-13 21:30:22 +08:00 |
James Chen
|
bd82c119b6
|
Updates travis.yml, adds email notification to @Minggo and @James
|
2014-05-13 21:26:25 +08:00 |
Dhilan007
|
ed0ae9d5b3
|
fix compiling fail on Linux.
|
2014-05-13 18:51:02 +08:00 |
minggo
|
ac22dc236a
|
[ci skip]
|
2014-05-13 18:45:41 +08:00 |
andyque
|
a28bdb0ed5
|
closed #5005, refactor
|
2014-05-13 18:41:38 +08:00 |
minggo
|
05c16de87a
|
Merge pull request #6715 from dumganhar/iss5160-animation-notification
closed #5160: Dispatch a custom event after an animation frame is displayed
|
2014-05-13 18:38:44 +08:00 |
bofeng-song
|
11f28c47cb
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3
|
2014-05-13 18:35:18 +08:00 |
bofeng-song
|
47bc17eac2
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3
|
2014-05-13 18:33:08 +08:00 |
James Chen
|
c57815778d
|
Merge pull request #6717 from lmskater/add-error-commit-status
[Jenkins][ci skip] Add error commit status for cancel build in queue
|
2014-05-13 18:21:30 +08:00 |
lm
|
5cd5a2339b
|
[Jenkins][ci skip] Add error commit status for cancel build in queue
|
2014-05-13 18:16:51 +08:00 |
andyque
|
2a25afbb76
|
closed #4900. add comment
|
2014-05-13 18:15:53 +08:00 |
cw
|
d9543e9371
|
fixed mistake
|
2014-05-13 18:15:25 +08:00 |
minggo
|
7d7d0b8251
|
Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header
PLEASE NEVER `using namespace cocos2d;` in header file
|
2014-05-13 18:07:18 +08:00 |
bofeng-song
|
b19a5b2feb
|
Merge branch 'v3' of https://github.com/bofeng-song/cocos2d-x into v3
|
2014-05-13 18:07:08 +08:00 |
cw
|
3207d841a3
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-05-13 18:01:38 +08:00 |
cocoscodeide
|
0b301d6602
|
Merge pull request #5 from cocos2d/v3
update cocos2d-x
|
2014-05-13 17:59:18 +08:00 |
andyque
|
31a2194dcb
|
closed #4900, add TTF font to UIText
|
2014-05-13 17:45:15 +08:00 |
chuanweizhang2013
|
21483b1a47
|
add start search config.json
|
2014-05-13 17:44:35 +08:00 |
James Chen
|
24524cb5be
|
issue #5160: Updates actiontest
|
2014-05-13 17:30:48 +08:00 |
James Chen
|
1ced31a2d3
|
issue #5160: Don't use static variables, use member variables
|
2014-05-13 17:29:05 +08:00 |
heliclei
|
35b19a239a
|
exit gracefully after running all tests
|
2014-05-13 17:20:12 +08:00 |
andyque
|
41fe56ee70
|
closed #5005, fix a null pointer exception
|
2014-05-13 17:12:48 +08:00 |
James Chen
|
0dd22af688
|
closed #5160: Updates ActionTest
|
2014-05-13 17:08:52 +08:00 |
James Chen
|
0cd2196b88
|
closed #5160: Dispatch a custom event after an animation frame is displayed
|
2014-05-13 17:08:30 +08:00 |
James Chen
|
d0c98d6269
|
Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables.
|
2014-05-13 17:03:48 +08:00 |
Dhilan007
|
fbfbcaffc8
|
update project
|
2014-05-13 16:43:19 +08:00 |
andyque
|
2d88c8ea92
|
closed #5005, fix visible and enable issue
|
2014-05-13 16:37:41 +08:00 |
Dhilan007
|
1a7ca64be2
|
Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix
|
2014-05-13 16:36:42 +08:00 |
James Chen
|
86411837c6
|
PLEASE NEVER `using namespace cocos2d;` in header file
|
2014-05-13 16:15:21 +08:00 |
cocoscodeide
|
a300194d8f
|
Merge pull request #4 from chuanweizhang2013/v3luaruntime
V3luaruntime
|
2014-05-13 16:03:12 +08:00 |
chuanweizhang2013
|
f35d69805f
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-05-13 15:57:24 +08:00 |
chuanweizhang2013
|
c8d871a60b
|
modify read config time
|
2014-05-13 15:56:39 +08:00 |
chuanweizhang2013
|
4518185a7b
|
modify read config time
|
2014-05-13 15:30:55 +08:00 |
minggo
|
f36f224d46
|
Merge pull request #6710 from natural-law/v3
Modify the lua runtime template for the implementation of downloading runtime files.
|
2014-05-13 15:25:34 +08:00 |
Ricardo Quesada
|
cd194cad9f
|
Merge pull request #6711 from ricardoquesada/indent_issues
fixes more indentation issues
|
2014-05-13 00:10:30 -07:00 |
Ricardo Quesada
|
8aea6fe89f
|
fixes more indentation issues
|
2014-05-13 00:10:01 -07:00 |
zhangbin
|
b0adc6fe51
|
Modify the lua runtime template for the implementation of downloading runtime files.
|
2014-05-13 15:06:56 +08:00 |
James Chen
|
58fd1a05b3
|
Merge pull request #6709 from CocosRobot/update_lua_bindings_1399964508
[AUTO]: updating luabinding automatically
|
2014-05-13 15:05:30 +08:00 |
CocosRobot
|
7ad48b632a
|
[AUTO]: updating luabinding automatically
|
2014-05-13 07:03:12 +00:00 |
Ricardo Quesada
|
b456701451
|
Merge pull request #6708 from ricardoquesada/multitexturingsupport
Multi texturing support
|
2014-05-12 23:58:10 -07:00 |
Ricardo Quesada
|
f25de7869b
|
indentation issues
|
2014-05-12 23:57:46 -07:00 |
andyque
|
1c47c833c6
|
issue #5005, fixed widget visit method
|
2014-05-13 14:56:44 +08:00 |
andyque
|
810c25b85e
|
Merge branch 'v3' into issue5005
|
2014-05-13 14:52:49 +08:00 |
andyque
|
1a319b3f12
|
issue #5005, deprecated setTouchEnabled
|
2014-05-13 14:52:27 +08:00 |
Ricardo Quesada
|
cdac920b5f
|
Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport
|
2014-05-12 23:52:02 -07:00 |
Ricardo Quesada
|
71848aca93
|
Initial multitexturing support
|
2014-05-12 23:51:37 -07:00 |
heliclei
|
17cd12f8b1
|
fix win32 compile
|
2014-05-13 14:43:11 +08:00 |