Skip to content

Commit 4c6f67f

Browse files
pandamicropandamicro
committed
Conflicts: tools/bindings-generator web
2 parents fdec552 + d671591 commit 4c6f67f

File tree

813 files changed

+99854
-22915
lines changed

Some content is hidden

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

813 files changed

+99854
-22915
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,14 @@ build/build/
113113
cocos/scripting/lua-bindings/proj.ios_mac/build/
114114
tests/*/runtime/
115115
tests/*/publish/
116+
tests/*/project/proj.android-studio/app/build.xml
117+
tests/*/project/proj.android-studio/app/proguard-project.txt
118+
tests/*/proj.android-studio/app/build.xml
119+
tests/*/proj.android-studio/app/proguard-project.txt
116120

117121
# Android
118122
project.properties
123+
*.iml
119124

120125
# Ignore prebuilt libraries folder
121126
/external/*
@@ -130,3 +135,4 @@ tests/cpp-tests/Resources/audio
130135
/tests/lua-game-controller-test/src/cocos/
131136
/tests/lua-tests/src/cocos/
132137
/tests/js-tests/res/
138+
/tools/framework-compile/

‎AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ Developers:
833833

834834
flashjay
835835
Remove deprecated code in lua tests & template
836+
luaLoadChunksFromZip should just remove .lua or .luac extension
836837

837838
zukkun
838839
Fixed incorrect function invocation in PhysicsBody::setAngularVelocityLimit
@@ -1127,6 +1128,9 @@ Developers:
11271128
tankorsmash
11281129
Fixed the bug that ProgressTimer::setSprite() doesn't take effect
11291130

1131+
namezero111111
1132+
ui: TextField add `getTextColor`, `getTextHorizontalAlignment` and `getTextVerticalAlignment` API
1133+
11301134
Retired Core Developers:
11311135
WenSheng Yang
11321136
Author of windows port, CCTextField,

‎CHANGELOG

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,46 @@
11
cocos2d-x-3.7 ??
2+
[NEW] android: Add Samsung API for cocos, please refer to the release note for more details.
3+
[NEW] 3rd: updated rapidjson to v1.0.2
24
[NEW] 3d: added physics3d support
5+
[NEW] console: support build & run Android Studio project
6+
[NEW] Audio: added support on WP8.1, now it supports wav format
37
[NEW] C++: added ActionFloat
4-
[NEW] C++: support physical keyboard on WinRT
8+
[NEW] C++: supported physical keyboard on WinRT
9+
[NEW] C++: added Android Studio support
510
[NEW] FileUtils: checked filename case characters on windows
611
[NEW] FileUitls: added supporting loading files that which file path include utf-8 characters
712
[NEW] PhysicsShape: added sensor property
8-
13+
[NEW] Scale9Sprite: added Android 9-patch image support
14+
[NEW] Sprite: used triangle command
15+
[NEW] 3d: add `getFarPlane` and `getNearPlane` in `Camera` class
16+
[NEW] 3d: add opengl version project/unproject function in camera.
17+
[NEW] ui: button add BMFont title support
18+
[NEW] ui: TextField add `getTextColor`, `getTextHorizontalAlignment` and `getTextVerticalAlignment` API
19+
[NEW] audio: Added MP3 support to winrt audio
20+
21+
[FIX] audio: Fixed program may freeze if `AudioEngine::stop` or `AudioEngine::stopAll()` is invoked frequently on Android
22+
[FIX] audio: Fixed audio can't resume if it is interrupted by an incoming phone call.
23+
[FIX] audio: Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x
24+
[FIX] ui: TextField scale factor is wrong with multiline text.
25+
[FIX] 3d: skybox can't move to other position except origin point in world space
26+
[FIX] 3d: terrain can't move to other position except origin point in world space
927
[FIX] 3rd: fix PIE link error on iOS caused by libpng and libtiff
1028
[FIX] AssetsManager: crashed issue
29+
[FIX] Audio: can not play large ogg files on windows
1130
[FIX] EaseRateAction: no way to create an `EaseRateAction` instance
1231
[FIX] Label: crashed if invoking `setString(text` after `getLetter(letterIndex)` and `letterIndex` is greater than the length of text
1332
[FIX] Label: position is wrong if label content is changed after invoking `getLetter(letterIndex)`
1433
[FIX] Label: shadow effect cause OpenGL error on iOS
1534
[FIX] Label: outline effect doesn't match characters well
1635
[FIX] ProgressTimer: `setSprite()` doesn't take effect
1736
[FIX] Sprite3D: setGLProgram() does not work
37+
[FIX] Sprite3D: transition breaks when there is a Sprite3D in the scene
1838
[FIX] Terrain: terrain is on top of particles, particles can not be seen
39+
[FIX] TextureCache: unbindImageAsync failed to unbind all asynchronous callback for a specified bound image
40+
[FIX] TileMap: crashed if a layer contains nothing
1941
[FIX] WebView: memory leak on iOS
2042
[FIX] WebView: crashed if url contains illegal characters on Android
43+
[FIX] Lua: luaLoadChunksFromZip should just remove .lua or .luac extension
2144

2245
cocos2d-x-3.6 Apr.30 2015
2346
[NEW] 3rd: update chipmunk to v 6.2.2 on Windows 8.1 Universal App

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ endif()
5858
set(BUILD_CPP_TESTS_DEFAULT ON)
5959
set(BUILD_LUA_LIBS_DEFAULT ON)
6060
set(BUILD_LUA_TESTS_DEFAULT ON)
61-
set(BUILD_JS_LIBS_DEFAULT OFF)
62-
set(BUILD_JS_TESTS_DEFAULT OFF)
61+
set(BUILD_JS_LIBS_DEFAULT ON)
62+
set(BUILD_JS_TESTS_DEFAULT ON)
6363
# TODO: fix test samples for MSVC
6464
if(MSVC)
6565
set(BUILD_CPP_TESTS_DEFAULT OFF)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ $ bin/lua-empty-test/lua-empty-test
186186

187187
* For Windows
188188

189-
Open the `cocos2d-x/build/cocos2d-win32.vc2013.sln`
189+
Open the `cocos2d-x/build/cocos2d-win32.sln`
190190

191191
* For Windows 8.1 Universal Apps (Phone and Store)
192192

‎build/android-build.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import sys
66
import os, os.path
7-
import shutil
87
from optparse import OptionParser
98

109
CPP_SAMPLES = ['cpp-empty-test', 'cpp-tests', 'game-controller-test']
1110
LUA_SAMPLES = ['lua-empty-test', 'lua-tests', 'lua-game-controller-test']
12-
ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES
11+
JS_SAMPLES = ['js-tests']
12+
ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES + JS_SAMPLES
1313

1414
def caculate_built_samples(args):
1515
''' Compute the sampels to be built
@@ -27,6 +27,9 @@ def caculate_built_samples(args):
2727
if 'lua' in args:
2828
targets += LUA_SAMPLES
2929
args.remove('lua')
30+
if 'js' in args:
31+
targets += JS_SAMPLES
32+
args.remove('js')
3033

3134
targets += args
3235

@@ -36,8 +39,8 @@ def caculate_built_samples(args):
3639
return list(targets)
3740

3841
def do_build(app_android_root, build_mode):
39-
40-
command = 'cocos compile -p android -s %s --ndk-mode %s' % (app_android_root, build_mode)
42+
43+
command = 'cocos compile -p android -s %s --ndk-mode %s' % (app_android_root, build_mode)
4144
print command
4245

4346
if os.system(command) != 0:
@@ -49,7 +52,7 @@ def build_samples(target, build_mode):
4952
build_mode = 'debug'
5053
elif build_mode != 'release':
5154
build_mode = 'debug'
52-
55+
5356
build_targets = caculate_built_samples(target)
5457

5558
app_android_root = ''
@@ -60,7 +63,8 @@ def build_samples(target, build_mode):
6063
"cpp-tests": "tests/cpp-tests",
6164
"lua-empty-test": "tests/lua-empty-test",
6265
"lua-tests": "tests/lua-tests",
63-
"lua-game-controller-test": "tests/lua-game-controller-test"
66+
"lua-game-controller-test": "tests/lua-game-controller-test",
67+
"js-tests": "tests/js-tests"
6468
}
6569

6670
cocos_root = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
@@ -81,7 +85,7 @@ def build_samples(target, build_mode):
8185
usage = """
8286
This script is mainy used for building tests built-in with cocos2d-x.
8387
84-
Usage: %prog [options] [cpp-empty-test|cpp-tests|lua-empty-test|lua-tests|cpp|lua|all]
88+
Usage: %prog [options] [cpp-empty-test|cpp-tests|lua-empty-test|lua-tests|js-tests|cpp|lua|all]
8589
8690
If you are new to cocos2d-x, I recommend you start with cpp-empty-test, lua-empty-test.
8791
@@ -93,13 +97,15 @@ def build_samples(target, build_mode):
9397

9498
parser = OptionParser(usage=usage)
9599
parser.add_option("-n", "--ndk", dest="ndk_build_param",
96-
help='It is not used anymore, because cocos console does not support it.')
100+
help='It is not used anymore, because cocos console does not support it.')
97101
parser.add_option("-p", "--platform", dest="android_platform",
98-
help='This parameter is not used any more, just keep compatible.')
102+
help='This parameter is not used any more, just keep compatible.')
99103
parser.add_option("-b", "--build", dest="build_mode",
100-
help='The build mode for java project,debug[default] or release. Get more information,please refer to http://developer.android.com/tools/building/building-cmdline.html')
104+
help='The build mode for java project,debug[default] or release. \
105+
Get more information, \
106+
please refer to http://developer.android.com/tools/building/building-cmdline.html')
101107
(opts, args) = parser.parse_args()
102-
108+
103109
if len(args) == 0:
104110
parser.print_help()
105111
sys.exit(1)

‎build/cocos2d-js-win32.vc2013.sln renamed to ‎build/cocos2d-js-win32.sln

File renamed without changes.

‎build/cocos2d-js-win8.1-universal.sln

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.Windows", "..\
4545
EndProject
4646
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.WindowsPhone", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.WindowsPhone\libjscocos2d.WindowsPhone.vcxproj", "{CA082EC4-17CE-430B-8207-D1E947A5D1E9}"
4747
EndProject
48+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libbullet", "libbullet", "{9A66AB4C-057B-4675-849D-5D69B98C728C}"
49+
EndProject
50+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.Shared", "..\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems", "{16AF311F-74CA-45A3-A82D-6334200FB124}"
51+
EndProject
52+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.Windows", "..\external\bullet\proj.win8.1-universal\libbullet.Windows\libbullet.Windows.vcxproj", "{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}"
53+
EndProject
54+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.WindowsPhone", "..\external\bullet\proj.win8.1-universal\libbullet.WindowsPhone\libbullet.WindowsPhone.vcxproj", "{E35634BD-B91B-4A6D-B957-96F56DD065F9}"
55+
EndProject
4856
Global
4957
GlobalSection(SharedMSBuildProjectFiles) = preSolution
5058
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{ae6763f6-1549-441e-afb5-377be1c776dc}*SharedItemsImports = 9
@@ -53,7 +61,10 @@ Global
5361
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{70914fc8-7709-4cd6-b86b-c63fde5478db}*SharedItemsImports = 4
5462
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4
5563
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
64+
..\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{e35634bd-b91b-4a6d-b957-96f56dd065f9}*SharedItemsImports = 4
65+
..\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{ec2b1292-2d8c-4feb-a84b-2550b32c1ae7}*SharedItemsImports = 4
5666
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9
67+
..\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{16af311f-74ca-45a3-a82d-6334200fb124}*SharedItemsImports = 9
5768
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{ca082ec4-17ce-430b-8207-d1e947a5d1e9}*SharedItemsImports = 4
5869
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9
5970
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{bea66276-51dd-4c53-92a8-f3d1fea50892}*SharedItemsImports = 9
@@ -192,6 +203,28 @@ Global
192203
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.ActiveCfg = Release|Win32
193204
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.Build.0 = Release|Win32
194205
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|x64.ActiveCfg = Release|Win32
206+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Debug|ARM.ActiveCfg = Debug|ARM
207+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Debug|ARM.Build.0 = Debug|ARM
208+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Debug|Win32.ActiveCfg = Debug|Win32
209+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Debug|Win32.Build.0 = Debug|Win32
210+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Debug|x64.ActiveCfg = Debug|x64
211+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Debug|x64.Build.0 = Debug|x64
212+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Release|ARM.ActiveCfg = Release|ARM
213+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Release|ARM.Build.0 = Release|ARM
214+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Release|Win32.ActiveCfg = Release|Win32
215+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Release|Win32.Build.0 = Release|Win32
216+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Release|x64.ActiveCfg = Release|x64
217+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7}.Release|x64.Build.0 = Release|x64
218+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Debug|ARM.ActiveCfg = Debug|ARM
219+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Debug|ARM.Build.0 = Debug|ARM
220+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Debug|Win32.ActiveCfg = Debug|Win32
221+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Debug|Win32.Build.0 = Debug|Win32
222+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Debug|x64.ActiveCfg = Debug|Win32
223+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|ARM.ActiveCfg = Release|ARM
224+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|ARM.Build.0 = Release|ARM
225+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.ActiveCfg = Release|Win32
226+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.Build.0 = Release|Win32
227+
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|x64.ActiveCfg = Release|Win32
195228
EndGlobalSection
196229
GlobalSection(SolutionProperties) = preSolution
197230
HideSolutionNode = FALSE
@@ -214,5 +247,9 @@ Global
214247
{BEA66276-51DD-4C53-92A8-F3D1FEA50892} = {60DCAEA9-E344-40C0-B90C-82FB8E671BD5}
215248
{BCF5546D-66A0-4998-AFD6-C5514F618930} = {60DCAEA9-E344-40C0-B90C-82FB8E671BD5}
216249
{CA082EC4-17CE-430B-8207-D1E947A5D1E9} = {60DCAEA9-E344-40C0-B90C-82FB8E671BD5}
250+
{9A66AB4C-057B-4675-849D-5D69B98C728C} = {85630454-74EA-4B5B-9B62-0E459B4476CB}
251+
{16AF311F-74CA-45A3-A82D-6334200FB124} = {9A66AB4C-057B-4675-849D-5D69B98C728C}
252+
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7} = {9A66AB4C-057B-4675-849D-5D69B98C728C}
253+
{E35634BD-B91B-4A6D-B957-96F56DD065F9} = {9A66AB4C-057B-4675-849D-5D69B98C728C}
217254
EndGlobalSection
218255
EndGlobal

0 commit comments

Comments
 (0)