andyque
|
6cb3b47488
|
closed #5110, refactor
|
2014-05-14 17:07:24 +08:00 |
Dhilan007
|
059ea3dd8a
|
label's small improvement.
|
2014-05-14 16:41:26 +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 |
andyque
|
9d5c2ba773
|
closed #5110, add const specifier to getStringLength function
|
2014-05-14 16:25:30 +08:00 |
andyque
|
09fce798f0
|
closed #5110, add const reference to typedef
|
2014-05-14 16:14:28 +08:00 |
andyque
|
437b30487c
|
issue #5110, refactor UITextBMFont
|
2014-05-14 16:02:31 +08:00 |
cocoscodeide
|
747f28c2e1
|
Merge pull request #8 from bofeng-song/v3
fix build err
|
2014-05-14 15:55:55 +08:00 |
bofeng-song
|
d0d20e7272
|
fix build err
|
2014-05-14 15:52:58 +08:00 |
andyque
|
76cefcaa3f
|
issue #5110, refactor UITextAtlas
|
2014-05-14 15:51:50 +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 |
andyque
|
e6889dca36
|
issue #5110, refactor UIText
|
2014-05-14 15:26:14 +08:00 |
shujunqiao
|
c58f303a31
|
[ci skip], set v2-branch different variable in pull-request-builder.py.
|
2014-05-14 15:13:43 +08:00 |
yinkaile
|
e30e05ce92
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-05-14 15:13:38 +08:00 |
cw
|
7c8e237ee2
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-05-14 15:11:59 +08:00 |
cocoscodeide
|
fe7774947d
|
Merge pull request #7 from bofeng-song/v3
support custom orientation for android
|
2014-05-14 15:10:10 +08:00 |
cw
|
501762f3b5
|
remove post-new.py
|
2014-05-14 15:03:32 +08:00 |
bofeng-song
|
668ed34512
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
|
2014-05-14 15:03:07 +08:00 |
bofeng-song
|
20346d8ef6
|
lua runtime, support custom orientation
|
2014-05-14 15:02:24 +08:00 |
cocoscodeide
|
83c4063570
|
Merge pull request #6 from chuanweizhang2013/v3luaruntime
modify andorid orientation
|
2014-05-14 15:02:03 +08:00 |
cw
|
e0fe2cb2e2
|
modify android orientation
|
2014-05-14 14:58:36 +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 |
andyque
|
578ff2735d
|
issue #5110, fix VideoPlayer android compile error
|
2014-05-14 14:44:04 +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 |
cw
|
cc5ba9b2b1
|
modify android orientation
|
2014-05-14 14:40:27 +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 |
lm
|
cf24e327ee
|
[Jenkins][ci skip] Add external lib to ci release build
|
2014-05-14 11:53:27 +08:00 |
pandamicro
|
a463a1630f
|
Fixed #5040: Remove memory allocation assertion to permit multiply init
|
2014-05-14 11:49:09 +08:00 |
andyque
|
46cf6251b6
|
issue #5110, rename a member variable and delete gui prefix in ui tests
|
2014-05-14 11:26:04 +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 |
andyque
|
e6a36fde18
|
issue #5110, refactor VideoPlayer
|
2014-05-14 11:18:11 +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 |
andyque
|
08801c035e
|
issue #5110. refactor UILoadingBar, remove unneeded deprecats
|
2014-05-14 10:48:16 +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 |
andyque
|
df86b07f15
|
closed #5005, refactor
|
2014-05-14 09:23:56 +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 |