andyque
|
b32ca246e7
|
issue #5183, done
|
2014-05-15 10:44:19 +08:00 |
andyque
|
5697d2417a
|
issue #5183, done
|
2014-05-15 10:23:25 +08:00 |
andyque
|
0639e49031
|
issue #5183, add LayoutProtocol
|
2014-05-15 10:07:42 +08:00 |
andyque
|
967c071c68
|
issue #5183, refator LayoutExecutant
|
2014-05-14 18:24:23 +08:00 |
andyque
|
8c8f9611f7
|
issue #5183, add CCLayoutExecutant file
|
2014-05-14 18:03:44 +08:00 |
James Chen
|
bbc906e7db
|
Merge pull request #6732 from samuele3hu/v3_fix
fix compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
|
2014-05-14 16:35:03 +08:00 |
James Chen
|
36dafd5768
|
Merge pull request #6733 from shujunqiao/pull-build-branch
[ci skip], set v2-branch different variable in pull-request-builder.py.
|
2014-05-14 15:32:10 +08:00 |
shujunqiao
|
c58f303a31
|
[ci skip], set v2-branch different variable in pull-request-builder.py.
|
2014-05-14 15:13:43 +08:00 |
samuele3hu
|
ee4e5e4800
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-14 14:45:15 +08:00 |
samuele3hu
|
534ad2aafb
|
fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
|
2014-05-14 14:43:10 +08:00 |
minggo
|
f22804241a
|
Merge pull request #6725 from dumganhar/ref-tracker
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
|
2014-05-14 13:44:22 +08:00 |
James Chen
|
4c23ff5b8c
|
trackRef and untrackRef are static function now.
|
2014-05-14 11:55:20 +08:00 |
James Chen
|
77d330da77
|
Merge pull request #6727 from shujunqiao/pull-build-trigger
[ci skip], modify v3!=v2 about config.json.
|
2014-05-14 11:23:59 +08:00 |
shujunqiao
|
1341970b40
|
[ci skip], modify v3!=v2 about config.json.
|
2014-05-14 11:19:30 +08:00 |
James Chen
|
7bc0eea7f0
|
Merge pull request #6724 from CocosRobot/update_lua_bindings_1400032916
[AUTO]: updating luabinding automatically
|
2014-05-14 10:50:44 +08:00 |
James Chen
|
54176b0267
|
Include <algorithm> for std::find
|
2014-05-14 10:31:09 +08:00 |
James Chen
|
c14482254d
|
Fixes wrong indention and whitespace cleanup
|
2014-05-14 10:25:45 +08:00 |
James Chen
|
ba3f5f8eee
|
Updates indention in CCRef.h
|
2014-05-14 10:17:08 +08:00 |
James Chen
|
72d29976c3
|
Disables memory tracker by default
|
2014-05-14 10:16:05 +08:00 |
James Chen
|
eb8f07370c
|
Remove a comment in CCRef.cpp
|
2014-05-14 10:12:49 +08:00 |
James Chen
|
d9d4d9d51a
|
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
|
2014-05-14 10:07:03 +08:00 |
CocosRobot
|
20c50ef189
|
[AUTO]: updating luabinding automatically
|
2014-05-14 02:03:18 +00:00 |
minggo
|
89bb56e829
|
[ci skip]
|
2014-05-14 09:59:38 +08:00 |
minggo
|
0303e5d270
|
Merge pull request #6716 from andyque/issue4900
closed #4900, add TTF font to UIText
|
2014-05-14 09:57:57 +08:00 |
andyque
|
ca4a7a7e53
|
issue #4900, refactor
|
2014-05-14 09:55:55 +08:00 |
andyque
|
92d9120967
|
issue #4900, refactor
|
2014-05-14 09:37:21 +08:00 |
Ricardo Quesada
|
52578d9145
|
Merge pull request #6723 from ricardoquesada/EffectNode
Adds effectNode in ShaderTest2
|
2014-05-13 18:13:51 -07:00 |
Ricardo Quesada
|
723938e292
|
Adds effectNode in ShaderTest2
|
2014-05-13 18:12:58 -07:00 |
Ricardo Quesada
|
0171e27747
|
Merge pull request #6714 from Dhilan007/v3_nodefix
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
|
2014-05-13 14:14:27 -07:00 |
Ricardo Quesada
|
0866c0121d
|
Merge pull request #6722 from ricardoquesada/multitexturing_fixes
Adds simple sample for multitexturing
|
2014-05-13 14:09:47 -07:00 |
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 |
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 |
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 |
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 |
andyque
|
31a2194dcb
|
closed #4900, add TTF font to UIText
|
2014-05-13 17:45:15 +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 |
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 |
Dhilan007
|
1a7ca64be2
|
Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix
|
2014-05-13 16:36:42 +08:00 |