Skip to content

Commit ec4ae7e

Browse files
author
Jeff Wang
committed
Merge pull request #7 from cocos2d/v3
update
2 parents 2804e57 + db1505c commit ec4ae7e

File tree

394 files changed

+7811
-19386
lines changed

Some content is hidden

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

394 files changed

+7811
-19386
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,5 @@ project.properties
138138
/v*-deps-*.zip
139139
/v*-lua-runtime-*.zip
140140
/tools/fbx-conv/
141+
external/chipmunk
142+
tests/cpp-tests/Resources/audio

‎AUTHORS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,12 @@ Developers:
994994

995995
kaishiqi
996996
Fixed a but that cursor postion is wrong on desktop.
997+
998+
jagd
999+
Added setSubsteps() and getSubsteps() in PhysicsWorld
1000+
1001+
denpen
1002+
Fixed a bug that scroll view hidden picks up the touch events.
9971003

9981004
Retired Core Developers:
9991005
WenSheng Yang

‎CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
cocos2d-x-3.3?? ??
22
[NEW] ActionManager: added removeAllActionsByTag()
3+
[NEW] Audio: added new audio system for iOS and Android
34
[NEW] GLViewProtocol: added getAllTouches()
45
[NEW] Node: added stopAllActionsByTag()
6+
[NEW] PhysicsWorld: add setSubsteps() and getSubsteps()
57
[NEW] Renderer: added TriangleCommand
68
[NEW] UI: added `WebView` on iOS and Android
79

10+
[FIX] C++: CMake works for Mac builds
11+
[FIX] C++: Reorganized cocos2d/platform folder. Easier to add new platforms
812
[FIX] EditBox: moved to ui:EditBox
913
[FIX] HttpClient: condition variable sleep on unrelated mutex
1014
[FIX] Node: create unneeded temple `Vec2` object in `setPosition(int, int)`, `setPositionX()` and `setPositionY()`
1115
[FIX] Node: skew effect is wrong
1216
[FIX] Node: setNormalizedPosition can not take effect if parent position is not changed
17+
[FIX] External: ScrollView: scroll view hidden picks up the touch events
1318
[FIX] TextureAtlas: may crash if only drawing part of it
1419

1520
cocos2d-x-3.3alpha0 Aug.28 2014

‎CMakeLists.txt‎

Lines changed: 57 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
# ****************************************************************************/
2525

2626
cmake_minimum_required(VERSION 2.8)
27-
project (Cocos2dx)
27+
project (Cocos2d-X)
2828

2929
# The version number
30-
set(Cocos2dxSamples_VERSION_MAJOR 3)
31-
set(Cocos2dxSamples_VERSION_MINOR 1)
30+
set(COCOS2D_X_VERSION 3.3.0)
31+
#set(CMAKE_C_COMPILER_INIT g++)
3232

3333
include(build/BuildHelpers.CMakeLists.txt)
3434

@@ -43,6 +43,7 @@ endif(DEBUG_MODE)
4343
set(CMAKE_C_FLAGS_DEBUG "-DCOCOS2D_DEBUG=1")
4444
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
4545

46+
# Compiler options
4647
if(MSVC)
4748
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
4849
-wd4251 -wd4244 -wd4334 -wd4005 -wd4820 -wd4710
@@ -52,16 +53,24 @@ else()
5253
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
5354
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -std=c99")
5455
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -std=c++11 -Wno-deprecated-declarations -Wno-reorder")
56+
if(CLANG)
57+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
58+
endif()
5559
endif(MSVC)
5660

61+
# Some macro definitions
5762
if(WINDOWS)
5863
ADD_DEFINITIONS (-D_USRDLL -DCOCOS2DXWIN32_EXPORTS -D_WINDOWS -DWIN32)
5964
set(PLATFORM_FOLDER win32)
6065
elseif(MACOSX)
66+
ADD_DEFINITIONS (-DCC_TARGET_OS_MAC)
67+
ADD_DEFINITIONS (-DUSE_FILE32API)
6168
set(PLATFORM_FOLDER mac)
62-
else(LINUX)
69+
elseif(LINUX)
6370
ADD_DEFINITIONS(-DLINUX)
6471
set(PLATFORM_FOLDER linux)
72+
else()
73+
message( FATAL_ERROR "Unsupported platform, CMake will exit" )
6574
endif()
6675

6776
if(MINGW)
@@ -78,31 +87,62 @@ endif()
7887

7988
# architecture
8089
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
81-
set(ARCH_DIR "64-bit")
90+
set(ARCH_DIR "64-bit")
91+
elseif ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
92+
set(ARCH_DIR "32-bit")
8293
else()
83-
set(ARCH_DIR "32-bit")
94+
message( FATAL_ERROR "Unsupported architecture, CMake will exit" )
95+
endif()
96+
97+
# Specific Include Directories
98+
if(LINUX)
99+
set(PLATFORM_INCLUDE_DIR
100+
/usr/include
101+
/usr/include/GLFW
102+
/usr/local/include/GLFW
103+
)
104+
else()
105+
set(PLATFORM_INCLUDE_DIR
106+
${CMAKE_CURRENT_SOURCE_DIR}/external/glfw3/include/${PLATFORM_FOLDER}
107+
)
84108
endif()
85109

86110
include_directories(
87-
/usr/include
88-
/usr/include/GLFW
89-
/usr/local/include/GLFW
111+
${PLATFORM_INCLUDE_DIR}
90112
${CMAKE_CURRENT_SOURCE_DIR}/cocos
91113
${CMAKE_CURRENT_SOURCE_DIR}
92114
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/${PLATFORM_FOLDER}
93115
${CMAKE_CURRENT_SOURCE_DIR}/extensions
94116
${CMAKE_CURRENT_SOURCE_DIR}/external
95117
)
96118

119+
# Specific Link Directories
120+
if(LINUX)
121+
set(PLATFORM_LINK_DIR
122+
/usr/local/lib
123+
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/fmod/prebuilt/${ARCH_DIR}
124+
)
125+
set(PLATFORM_FOLDER_ARCH
126+
${PLATFORM_FOLDER}/${ARCH_DIR}
127+
)
128+
else()
129+
set(PLATFORM_FOLDER_ARCH
130+
${PLATFORM_FOLDER}
131+
)
132+
set(PLATFORM_LINK_DIR
133+
${CMAKE_CURRENT_SOURCE_DIR}/external/glfw3/prebuilt/${PLATFORM_FOLDER_ARCH}
134+
)
135+
endif()
136+
97137
link_directories(
98-
/usr/local/lib
99-
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
100-
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
101-
${CMAKE_CURRENT_SOURCE_DIR}/external/webp/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
102-
${CMAKE_CURRENT_SOURCE_DIR}/external/png/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
103-
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
104-
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
105-
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/fmod/prebuilt/${ARCH_DIR}
138+
${PLATFORM_LINK_DIR}
139+
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER_ARCH}
140+
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER_ARCH}
141+
${CMAKE_CURRENT_SOURCE_DIR}/external/webp/prebuilt/${PLATFORM_FOLDER_ARCH}
142+
${CMAKE_CURRENT_SOURCE_DIR}/external/png/prebuilt/${PLATFORM_FOLDER_ARCH}
143+
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/prebuilt/${PLATFORM_FOLDER_ARCH}
144+
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/prebuilt/${PLATFORM_FOLDER_ARCH}
145+
${CMAKE_CURRENT_SOURCE_DIR}/external/chipmunk/prebuilt/${PLATFORM_FOLDER_ARCH}
106146
)
107147

108148
# libcocos2d.a

‎build/cocos2d-wp8.vc2012.sln‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2012
2+
# Visual Studio 2013
3+
VisualStudioVersion = 12.0.21005.1
4+
MinimumVisualStudioVersion = 10.0.40219.1
35
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}"
46
EndProject
57
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}"
@@ -24,8 +26,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensi
2426
EndProject
2527
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "..\external\Box2D\proj.wp8\Box2D.vcxproj", "{C55734A3-702C-4FA1-B950-32C8E169302F}"
2628
EndProject
27-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "..\external\chipmunk\proj.wp8\chipmunk.vcxproj", "{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}"
28-
EndProject
2929
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.wp8\libLocalStorage.vcxproj", "{88982C27-5A7B-40A8-86E7-B3187B44B322}"
3030
ProjectSection(ProjectDependencies) = postProject
3131
{B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB}
@@ -208,26 +208,6 @@ Global
208208
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x64.ActiveCfg = Release|Win32
209209
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.ActiveCfg = Release|Win32
210210
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.Build.0 = Release|Win32
211-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|Any CPU.ActiveCfg = Debug|Win32
212-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|ARM.ActiveCfg = Debug|ARM
213-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|ARM.Build.0 = Debug|ARM
214-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
215-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
216-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|Win32.ActiveCfg = Debug|Win32
217-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|Win32.Build.0 = Debug|Win32
218-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|x64.ActiveCfg = Debug|Win32
219-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|x86.ActiveCfg = Debug|Win32
220-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Debug|x86.Build.0 = Debug|Win32
221-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|Any CPU.ActiveCfg = Release|Win32
222-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|ARM.ActiveCfg = Release|ARM
223-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|ARM.Build.0 = Release|ARM
224-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
225-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|Mixed Platforms.Build.0 = Release|Win32
226-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|Win32.ActiveCfg = Release|Win32
227-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|Win32.Build.0 = Release|Win32
228-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|x64.ActiveCfg = Release|Win32
229-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|x86.ActiveCfg = Release|Win32
230-
{BA568A33-98F9-4D2A-BFFF-C065ADCB447A}.Release|x86.Build.0 = Release|Win32
231211
{88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Any CPU.ActiveCfg = Debug|Win32
232212
{88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|ARM.ActiveCfg = Debug|ARM
233213
{88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|ARM.Build.0 = Debug|ARM

0 commit comments

Comments
 (0)