Ricardo Quesada
|
5f8a5921d5
|
Merge pull request #6742 from ricardoquesada/v3_renameMathClassName_squash
math renames
|
2014-05-14 10:08:28 -07:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
James Chen
|
86fb75a031
|
Merge pull request #6739 from shujunqiao/pull-build-branch
[ci skip],for stupid error in equal
|
2014-05-14 20:00:07 +08:00 |
shujunqiao
|
a1f1b2f3a1
|
[ci skip],for stupid error in equal (backup_files = current_files = range(1))
|
2014-05-14 18:47:58 +08:00 |
minggo
|
abc08e703f
|
Merge pull request #6728 from pandamicro/FixParticlesInit
Fixed #5040: Remove memory allocation assertion to permit multiply init
|
2014-05-14 18:39:13 +08:00 |
minggo
|
d46362abb3
|
Merge pull request #6681 from minggo/director-fix
[ci skip] don't trigger onExitTransitionDidStart
|
2014-05-14 18:24:26 +08:00 |
minggo
|
048d6c09d3
|
Merge pull request #6701 from heliclei/autotest-autorun
support auto start cpp-tests
|
2014-05-14 18:16:58 +08:00 |
James Chen
|
8a92b6cc7f
|
Merge pull request #6736 from CocosRobot/update_lua_bindings_1400061063
[AUTO]: updating luabinding automatically
|
2014-05-14 18:02:30 +08:00 |
minggo
|
fba3bf2d15
|
Merge pull request #6735 from Dhilan007/v3_labelfix
label's small improvement.
|
2014-05-14 17:58:46 +08:00 |
CocosRobot
|
6f6d233ea5
|
[AUTO]: updating luabinding automatically
|
2014-05-14 09:52:20 +00:00 |
minggo
|
db0ea94b8a
|
Merge pull request #6730 from andyque/refactor5110
refactor ui framework
|
2014-05-14 17:47:47 +08:00 |
minggo
|
9c6e612c1f
|
Merge pull request #6729 from lmskater/add-external-lib-to-ci-release
[Jenkins][ci skip] Add external lib to ci release build
|
2014-05-14 17:41:19 +08:00 |
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 |
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 |
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 |
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 |
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 |