Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5e198aa

Browse files
cocoscodeidecocoscodeide
committed
Merge pull request cocos2d#26 from cocos2d/v3
update cocos2d-x
2 parents 67e43e1 + 5c49217 commit 5e198aa

File tree

144 files changed

+31586
-21996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+31586
-21996
lines changed

‎AUTHORS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Core Developers:
1111
Huabing Xu (dabingnn)
1212
Bo Yu (boyu0)
1313
Wenhai Lin(Dhilan007)
14+
Guanghui Qu(andyque）
1415

1516

1617
Developers:
@@ -843,6 +844,8 @@ Developers:
843844
zifter
844845
Fixed a bug that the effect of particle loaded from CocosBuilder is incorrectly
845846
Fix twice calling onExit
847+
Fixed bug with cascade opacity and color for control button
848+
Fix Progress Action. Not working with charging from 100 to 0.
846849

847850
twhittock
848851
Fixed a bug that Application::run returns wrong value on Mac platform
@@ -855,6 +858,9 @@ Developers:
855858

856859
NatWeiss
857860
Fix compilation error using arch i386
861+
862+
favorcode
863+
Correct some doxygen comment
858864

859865
Retired Core Developers:
860866
WenSheng Yang

‎CHANGELOG‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1-
cocos2d-x-3.1-rc0 May.16 2014
1+
cocos2d-x-3.1 ???
2+
[FIX] Label: may crash when using outline effect
3+
[FIX] Label: using outline and invoking 'Director::setContentScaleFactor' cause label show nothing
4+
[FIX] ProgressTo: will start from 0 when it reaches 100
5+
[FIX] Physics integration: may crashes if remove bodies at physics contact callback
6+
[FIX] WP8: orientation is not correct when it is set to portrait
7+
[FIX] WP8: fix for precompiled shaders and precompiled headers
8+
[FIX] WP8: template supports orientation
9+
10+
cocos2d-x-3.1-rc0 May.18 2014
211
[NEW] Cocos2dxActivity: Adds a virtual method to load native libraries.
12+
[NEW] Directory Structure: reorder some files within the cocos/ folder
13+
[NEW] Sprite3D: a node that renders 3d models
314
[NEW] EditBox: support secure input on Mac
415

16+
[FIX] ControlButton: cascade opacity and color error
517
[FIX] Director: twice calling of onExit
618
[FIX] Math: Vector2->Vec2, Vector3->Vec3, Vector4->Vec4, Matrix->Mat4
719
[FIX] GLProgram: uniform CC_Texture0 is pre-defined by cocos2d. MUST NOT be defined in shaders

‎build/cocos2d-wp8.vc2012.sln‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30324.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
2+
# Visual Studio 2012
53
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}"
64
EndProject
75
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}"
@@ -46,9 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-tests", "..\tests\cpp-t
4644
EndProjectSection
4745
EndProject
4846
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-testsComponent", "..\tests\cpp-tests\proj.wp8-xaml\cpp-testsComponent\cpp-testsComponent.vcxproj", "{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}"
49-
ProjectSection(ProjectDependencies) = postProject
50-
{271FEE84-9198-4C26-8567-4247C563B0B1} = {271FEE84-9198-4C26-8567-4247C563B0B1}
51-
EndProjectSection
5247
EndProject
5348
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.wp8\libNetwork.vcxproj", "{7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}"
5449
ProjectSection(ProjectDependencies) = postProject
@@ -63,16 +58,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-empty-test", "..\tests\
6358
EndProjectSection
6459
EndProject
6560
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-testComponent", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-testComponent\cpp-empty-testComponent.vcxproj", "{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}"
66-
ProjectSection(ProjectDependencies) = postProject
67-
{271FEE84-9198-4C26-8567-4247C563B0B1} = {271FEE84-9198-4C26-8567-4247C563B0B1}
68-
EndProjectSection
6961
EndProject
7062
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.wp8\libGUI.vcxproj", "{08FB23E4-1517-4EDC-B682-DA238CDAA83D}"
7163
ProjectSection(ProjectDependencies) = postProject
7264
{B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB}
7365
EndProjectSection
7466
EndProject
7567
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\cocos\platform\wp8-xaml\CopyTemplateFiles.vcxproj", "{271FEE84-9198-4C26-8567-4247C563B0B1}"
68+
ProjectSection(ProjectDependencies) = postProject
69+
{5921FE12-7EF3-4847-8453-42EF286DDBE7} = {5921FE12-7EF3-4847-8453-42EF286DDBE7}
70+
{60D53713-1675-4466-81DC-D67A031C3D21} = {60D53713-1675-4466-81DC-D67A031C3D21}
71+
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}
72+
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}
73+
EndProjectSection
7674
EndProject
7775
Global
7876
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)