Merge branch 'v3' into vr

zilongshanren · Jun 15, 2016 · 494061e · 494061e
2 parents 284910b + fd3b6d4
commit 494061e
Show file tree

Hide file tree

Showing 599 changed files with 22,144 additions and 16,157 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ Generated Files
 AppPackages
 BundleArtifacts
 .vs/
+*.VC.db
 
 # Ignore files build by ndk and eclipse
 libs/
@@ -149,3 +150,7 @@ tests/cpp-tests/Resources/audio
 /*/*/*/prebuilt-mk/Android.mk
 /*/*/*/*/prebuilt-mk/Android.mk
 *.xcscmblueprint
+tests/cpp-empty-test/proj.tizen/res/
+tests/cpp-tests/proj.tizen/res/
+tests/lua-empty-test/project/proj.tizen/res/
+tests/lua-tests/project/proj.tizen/res/
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,11 +1,16 @@
-cocos2d-x-3.11 ?? 2016
+cocos2d-x-3.11.1 May 27 2016
 
-[REFINE]        add optional alpha parameter to Color4B and Color4F constructors
+[HIGHLIGHT]     Supports IPv6-only network
 
-cocos2d-x-3.11 Apr ? 2016
+[FIX]           Fix `cocos gen-libs` compiling issue
+
+cocos2d-x-3.11 May 11 2016
 
 [HIGHLIGHT]     Physics: upgrade chipmunk to v7.0.1
 [HIGHLIGHT]     JS: new memory model, don't have to use retain/release in JS
+[HIGHLIGHT]     Curl: upgrade to v7.48
+[HIGHLIGHT]     OpenSSL: upgrade to 1.0.2g
+[HIGHLIGHT]     JS: can use Firefox 30+ and VSCode to debug cocos2d-x JSB programs
 
 [NEW]           JS: web console is enabled debugging JSB projects via firefox
 [NEW]           UI: add a setter for touch total time threshold in ScrollView
@@ -26,14 +31,22 @@ cocos2d-x-3.11 Apr ? 2016
 [REFINE]        Renderer: TriangleCommand and QuadCommand are merged
 [REFINE]        2D: SpriteFrameCache takes pixelFormat into account if specified
 [REFINE]        UI: let ScrollView swallow touch events by default
+[REFINE]        JSB: make selectedSprite optional
 
 [FIX]           JS: firefox v30+ can not debug cocos2d-x JSB projects
 [FIX]           UI: can not get event when PageView was turning
 [FIX]           UI: bitmap font sizes are not loaded from binary .fnt files
-[FIX]           2D: TargetedAction::isDone() always return false
-[FIX]           2D: some fonts were rendered incorreclty
+[FIX]           UI: some fonts were rendered incorreclty
+[FIX]           Action: TargetedAction::isDone() always return false
+[FIX]           Action: Repeat: will run actions more than speicific times, instant action will run one frame later
 [FIX]           2D: drawing in incorrect app state on iOS
-[FIX]           2D: FileUtils::getValueVectorFromFile() returns wrong value on iOS and Mac
+[FIX]           Platform: FileUtils::getValueVectorFromFile() returns wrong value on iOS and Mac
+[FIX]           Network: downloader crashed when storage path contains spaces on iOS
+[FIX]           Network: downloader may crash on Android
+[FIX]           HTTPAsyncConnection: crash when custom SSL certification is set on iOS
+[FIX]           AssetsManagerEX: will stuck at UPDATING forever if last task fails
+[FIX]           AssetsManagerEX: may repeatly update some assets and cause file write conflict
+[FIX]           Lua: fix display.wrapScene()
 
 cocos2d-x-3.10 Jan 11 2016
 

diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj
diff --git a/build/tizen/.cproject b/build/tizen/.cproject
diff --git a/build/tizen/.exportMap b/build/tizen/.exportMap
@@ -0,0 +1,4 @@
+{
+	global: main;
+	local: *;
+};
diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
@@ -0,0 +1,3 @@
+/SA_Report
+/Emulator
+/res
diff --git a/build/tizen/.project b/build/tizen/.project
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>libcocos2dx</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.tizen.nativecore.apichecker.apicheckerbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.tizen.nativecore.apichecker.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.tizen.nativecore.apichecker.core.tizenCppNature</nature>
+		<nature>org.tizen.nativecore.apichecker.apicheckernature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>cocos</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC/cocos</locationURI>
+		</link>
+		<link>
+			<name>extensions</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC/extensions</locationURI>
+		</link>
+		<link>
+			<name>external</name>
+			<type>2</type>
+			<locationURI>PARENT-2-PROJECT_LOC/external</locationURI>
+		</link>
+	</linkedResources>
+	<filteredResources>
+		<filter>
+			<id>1423558551456</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-projectRelativePath-matches-false-false-*/.tpk</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551461</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-Android.mk</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551465</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-CMakeLists.txt</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551469</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*_props$</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551473</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-libcocos2d_8_1</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551477</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*.props$</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551482</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*vcxproj.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551486</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*\.def$</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551490</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*\.mm$</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551494</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*\.m$</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551498</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-proj.win32</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551503</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-proj.wp8</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551508</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-^proj.win.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551513</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-android</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551518</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-apple</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551523</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-desktop</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551528</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-ios</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551533</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-linux</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551537</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-mac</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551542</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*win8.1.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551559</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*wp8.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551564</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*winrt.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551578</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-scripting</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551597</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-lua</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551615</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*win32.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1423558551627</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-true-.*wp_8.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1414416409298</id>
+			<name>cocos/audio</name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-openal</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/build/tizen/.tproject b/build/tizen/.tproject
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tproject xmlns="http://www.tizen.org/tproject">
+    <platforms>
+        <platform>
+            <name>mobile-2.4</name>
+        </platform>
+    </platforms>
+    <package>
+        <blacklist/>
+        <resFallback autoGen="true"/>
+    </package>
+</tproject>
diff --git a/cmake/Modules/SetCompilerOptions.cmake b/cmake/Modules/SetCompilerOptions.cmake
@@ -23,7 +23,7 @@ macro (SetCompilerOptions)
     # definitions for bullet
 	if (USE_BULLET)
 		add_definitions(-DCC_ENABLE_BULLET_INTEGRATION=1)
-        add_definitions(-DCC_USE_PHYSICS=1)
+        add_definitions(-DCC_USE_3D_PHYSICS=1)
 	else()
 		add_definitions(-DCC_ENABLE_BULLET_INTEGRATION=0)
         add_definitions(-DCC_USE_3D_PHYSICS=0)