d1597a0e3e
Fix iCCP profile using mogrify ( #18908 )
2018-06-29 11:14:13 +08:00
18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
03066ff47d
Windows 10 update compiler to Visual Studio 10 PlatformToolset v141 ( #18511 )
2017-11-27 17:10:52 +08:00
0a69031db3
[Windows]Fix edit box spacing and alignment ( #17807 )
...
* Fix windows edit box crash, spacing, and alignment
Signed-off-by: saumya.mukul <saumya.mukul@mx.com>
* Cleanup
* Reset file attributes
2017-05-31 08:57:11 +08:00
db837ebdae
remove unneeded test cases and fix parameter length limitation on windows
...
* delete unnneded test case on windows
* delete unneeded test cases
* avoid parameter length limit when building android on windows
* adjust project setting to delete unneeded test cases
* remove unneeded test cases for windows10
* remove unneeded test cases for tizen
* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
48cbc890c6
Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` ( #17399 )
2017-02-23 17:05:08 +08:00
c0575311b7
V3 win10 websockets ( #17310 )
...
* add openssl to libwebsockets
* updated win10 version to v3.15
* clear any glErrors created by any not found uniforms
2017-02-08 09:44:06 +08:00
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
d9b3ef55ae
Merge pull request #15880 from ricardoquesada/issue-15776
...
fix: TextureCache ASSERTS if image is invalid
2016-06-17 16:48:19 -07:00
c387f953fa
fix: TextureCache ASSERTS if image is invalid
...
Github issue #15776
2016-06-17 16:07:33 -07:00
b80a81fc7c
removed incorrect AppBundle info
2016-06-16 06:09:59 -07:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07:00
98bee7e12a
remove unneeded test case and fix resource missing ( #15804 )
...
* remove unneeded test case and fix resource missing
* remove unneeded test case
2016-06-08 13:36:36 +08:00
8bd4ddf081
fix: compile on linux, android and windows
2016-05-26 16:02:24 -03:00
cf305a56b1
removed missing files from project
2016-05-10 21:41:39 -07:00
8068c51d94
remove studio related test cases and resources ( #15574 )
...
* remove studio related test cases and resources
* remove unneeded files
2016-05-06 13:38:19 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
4d7bf1f827
updated expiration dates of all winrt test app and template certificates
2016-04-19 09:07:30 -07:00
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
fb7044c535
Add SpriteFrameCacheTest to Android, Windows, Linux project files
2016-02-17 20:52:30 +03:00
3f359381dc
moved file to correct folder in vcxproj
2015-10-20 10:07:30 -07:00
e2730a3d92
fixed msbuild by removing incorrect AppxBundle properties from project
2015-10-16 09:25:24 -07:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
84e0d7fe7b
fixed another missing image asset in Win10 UWP manifest
2015-10-04 09:19:18 -07:00
6df43e60c0
fixed Windows 10 UWP app manifest by correcting image asset paths
2015-10-02 13:28:39 -07:00
e3161eb127
Remove performance tests from cpp-tests project.
2015-09-10 16:01:56 +08:00
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
97ecec1d64
updated Win10 UWP app asset files
2015-08-17 18:35:42 -07:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
6669fec648
added missing bug test
2015-07-23 12:34:37 -07:00
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
a9dfd8012c
Add new bug test to Android, Win 10, Win Universal, Linux project file
2015-07-07 11:02:00 +08:00
00e360f438
Add the missing file into CMake and Windows project configurations.
2015-07-01 15:36:53 +09:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
0781978788
added librecast. Updated build properties
2015-06-15 18:44:14 -07:00
e14fdedf67
added missing NavMeshTest files
2015-06-15 18:19:51 -07:00
d702012972
don't auto update version number for each windows app certification test
2015-05-28 15:04:09 -07:00
dadbbc18d6
added Windows 10 UWP project files
2015-05-28 13:51:25 -07:00
Valera