6cd7314497
cocos2d::Sequence::isDone() checks that the last action is actually done. ( #17437 )
2017-03-07 09:36:09 +08:00
bdcacd0031
Some fixes for search paths: ( #17435 )
...
* Some fixes for search paths:
1. Adds ‘_originalSearchPaths’ variable, ’getSearchPaths’ returns the original values set by ‘setSearchPaths’ or ‘addSearchPath’.
2. Adds a getter function ‘getDefaultResourceRootPath’.
3. ‘setDefaultResourceRootPath’ should also update search paths and remove file path cache internally.
4. ‘setSearchPaths’ supports to pass self (_originalSearchPath), could be used in ‘setDefaultResourceRootPath’ to update the final ’_searchPathArray’ for searching full path.
5. ‘addSearchPath’ fix, the default resource root path should be the last element in ‘_searchPathArray’.
* Checks whether the parameter ‘searchResolutionOrder’ passed in is the same as ‘_searchResolutionsOrderArray’.
* Don’t break the compatibility, add a new method called ‘FileUtils::getOriginalSearchPaths’.
2017-03-06 16:59:43 +08:00
e293520057
Fix some local variable names in tests ( #17445 )
2017-03-06 10:01:53 +08:00
c442275c8e
17357: Better encapsulate the definition of mouse buttons ( #17358 )
...
* 17357: Better encapsulate the definition of mouse buttons
Move definition of buttons from a list of #define's to an enum class and
make appropriate updates for successful compilation.
* 17357: Better encapsulate the definition of mouse buttons
Updates from code review:
* Removed changes to automatically generated files
* Removed std::ostream& convenience operator
* 17357: Fix mouse tests
2017-03-02 13:39:33 +08:00
cfbbc65c71
Fix various typos in comments and strings ( #17410 )
2017-02-27 11:12:29 +08:00
0e28e68d45
Fix variable name typo in Sprite3DTest.js ( #17409 )
2017-02-27 10:32:48 +08:00
454fd8518b
Fix minor typos in tests ( #17404 )
2017-02-24 12:45:41 +08:00
48cbc890c6
Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` ( #17399 )
2017-02-23 17:05:08 +08:00
3937b4d631
Fix minor typos in UI test cases ( #17400 )
2017-02-23 16:14:39 +08:00
41014fd54c
Update the spine runtime of JS. ( #17391 )
2017-02-22 11:21:37 +08:00
5ae8a95c6f
[ci skip]make all tests and template support Android Studio ( #17389 )
...
* make all tests and template support Android Studio
* use grable 2.2.3
2017-02-21 17:58:30 +08:00
d14f4270aa
Use ndk-build with Android Studio. ( #15676 )
...
* Use ndk-build integration in Android Studio.
* Update build.gradle
* Update build.gradle
* Update build.gradle
2017-02-20 11:14:36 +08:00
619e012d9b
[WebSocket] Adds support for getting url and server selected protocol ( #17381 )
...
* [WebSocket] Adds support for getting url and server selected protocol
* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
1baad6b962
Fix tizen compilation issue ( #17341 )
...
* fix tizen compile issue
* enable websocket test on tizen
* change application id of tizen projects
* improve cpp-tests websockets
* update template app id of tizen
* fix tizen cpp-tests in release mode
* update 3rd deps version
* bump external version to 123
2017-02-13 17:59:48 +08:00
4237639dd6
Some fixes for websocket ( #17342 )
...
* libwebsockets & curl are dynamic libraries now, modify project configuration for win32.
Updates WebSocketTest.cpp to test wss connection.
* Corrects some logic in WebSocket.cpp. Adds wss test case. WebSocketTest suggests developers to use `WebSocket::closeAsync` method which will not block current thread.
* mutex unlock fix in WebSocket.cpp. Reverts TEST URL.
* Allows self-assign cert.
* Each ws connection will create a virutal host now. Supports self-signed cert and update test case to suggest developer use ‘closeAsync’.
* Updates deps to 123.
2017-02-13 15:15:23 +08:00
f408cbfcca
fix rendering font with not null line gap ( #17175 )
...
* fix rendering font with not null line gap
* test for line gap fix
2017-02-13 13:58:32 +08:00
27e2012cf1
fixed #16871 : Material second shader texture will be lost when removeUnusedTextures is invoked. ( #16884 )
...
* fixed #16871 : Material second shader texture will be lost when removeUnusedTextures is invoked.
* issue #16871 : Adds test case for issue #16871 .
* issue #16871 : Checks whether current texture is the same as which is passed in. And more comments for release stuffs.
* Removes unused nullptr check of _value.tex.texture
CC_SAFE_RETAIN will check it.
And some indention fixes.
2017-02-10 14:01:26 +08:00
34d4c65c86
fix crash on Android ( #17338 )
...
The crash is caused because of local reference table overflow
2017-02-10 13:51:29 +08:00
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
d160d79d5b
Fix typos in comments and strings ( #17333 )
2017-02-10 10:35:52 +08:00
8825a091bb
update spine to 3.5.35 ( #17331 )
...
* update spine to 3.5.35
* fix jsb compiling error
* fix lua compiling error
2017-02-09 16:57:42 +08:00
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +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
75d2e76095
Fix minor typos in comments and docs ( #17294 )
2017-02-07 09:41:52 +08:00
88c3fcde67
Full unicode support ( #17179 )
...
* Full unicode support
* test for emoji
2017-02-06 16:41:52 +08:00
193518ed8b
add opacity support to DrawNode ( #17248 )
2017-02-06 15:34:14 +08:00
6bbf01537d
Allow to unbind asynchronous texture loading callback with a custom key. ( #17206 )
...
* Allow to unbind asynchronous texture loading callback with a custom key.
In order to unbind the callback passed to
`cocos2d::TextureCache::addImageAsync(path, callback)`, one has to
call `cocos2d::TextureCache::unbindImageAsync(path)`. In the cases
where the loading of the same texture is requested from several sources
simultaneously, then none of the source can unbind its own callback
unambiguously.
This commit adds an overload of the `addImageAsync` function taking an extra
argument identifying the callback, thus allowing to unbind it unambiguously
in cases where the loading of path is requested by several sources
simultaneously.
* Add a test case for TextureCache::addImageAsync with a custom key.
2017-02-04 09:38:54 +08:00
061122514c
Fix typo in Sprite (strech -> stretch) ( #17241 )
2017-01-23 09:25:56 +08:00
690db56f44
Merge v3.14.1 ( #17231 )
...
* update cocos console to fix compiling error with Android Studio projects (#17129 ) (#17145 )
* fix crash if physics3d camera is not set (#17139 ) (#17144 )
* fix linking error with vs2015 (#17146 )
* fix issue #17116 & #17119 for v3.14.1
* tests cases
* better documentation
* doc: updates sprite doc
* Fix scale9sprite polygon info (#17161 )
* add guard code to Scale9Sprite
* add new test code
* Glfw linux issue (#17166 )
* purge glfw3 before installing glfw3.2
* purge glfw3 before installing glfw3.2
* Update web engine ref (#17169 )
* update version and release note (#17170 )
* issue ##17119 improved v3.14.1 (#17189 )
* update version (#17230 )
2017-01-20 09:59:30 +08:00
b1f2a056b2
Refactor WebSocket to support SSL (wss) ( #17172 )
...
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works
* Adds openssl include path to xcode project configuration.
* mac doesn’t depend on curl
* ca file path should be full path.
* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986
* Remove curl dependence for mac
* Updates Andorid.mk
* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.
* Updates external/config.json to 118.
* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.
* Linux support websocket ssl connection.
* Updates external/config.json
* Updates install-deps-linux.sh
* Adds dependence of binutils, print ld version
* Updates travis scripts.
* Updates travis scripts.
* Updates travis script, don’t output log while extracting.
* update before-install.sh
* updates before-install.sh
* updates before-install.sh
* don’t output log for installing software.
* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
1278ccfbb2
Prevent the compilation of NavMeshTest if CC_USE_PHYSICS=0. ( #17205 )
2017-01-19 10:28:20 +08:00
42c77247cc
Fixed Scheduler bug occured when unschedule target during update. ( #17203 )
2017-01-18 16:32:36 +08:00
0de81de721
fix #14936 ( #17190 )
...
* fix #14936
* #14936 testcases
2017-01-17 09:48:30 +08:00
d9637f30b0
remove scheduler in time ( #17198 )
...
* remove scheduler in time
* fix compiling error
* add test case
* fix logic error
2017-01-16 17:37:59 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
c258b03f13
Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. ( #17140 )
2017-01-13 10:05:46 +08:00
84a3f73ecb
Particle set display frame ( #17163 )
...
* Fix CCParticleSystemQuad::setDisplayFrame()
* Added tests
2017-01-12 11:48:30 +08:00
e100d02dff
Sprite fixes: color + polygon ( #17135 )
...
* fixes issue #17119
and sanitizes the code a little bit
* more fixes
* fixes issue #17116
* restore xcode "none" sign profile
* code is cleaner
add more documentation in CCSprite.h
* missing assets
* anchor point works with batchnodes again
2017-01-10 15:28:47 +08:00
3d4d56d83a
Update BugsTest.cpp ( #17125 )
...
comment out Bug #15776 because it currently crashes during autotest
2017-01-09 09:36:00 +08:00
a0acaf5972
Merge pull request #17101 from minggo/merge-v314
...
Merge v314
2017-01-04 11:48:31 +08:00
79126ea72a
make ListView::setGlobalZOrder() work ( #17098 )
...
* make ListView::setGlobalZOrder() work
* revert modification of UIButton
* reset background color
* change global z order to test
2017-01-04 11:06:44 +08:00
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
e16828647c
Fix web engine canvas mode issues ( #17095 )
...
* Update web ref
* Fix custom event being discard during event emission
* Fix web engine canvas mode issues
* Revert "Fix custom event being discard during event emission"
This reverts commit 3f42273e1e86bc3c977abc61a45d30169d5c35ff.
* Update web ref
2017-01-03 09:40:38 +08:00
163e730849
Fix label disableeffect ( #17075 )
...
* add toggle rendering type test
* fix label additional kerning
* only substract additionalKerning when bold is enabled
2016-12-29 13:59:24 +08:00
c15da89c5e
use projection 2d ( #17078 )
2016-12-28 18:20:14 +08:00
279ae9819c
Merge pull request #17071 from VisualSJ/v3.14
...
Fixed a bug about LoaderTest
2016-12-27 11:36:04 +08:00
bdf161a99e
Fixed a bug about LoaderTest
2016-12-27 10:53:07 +08:00
41abefd082
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# CHANGELOG
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
8c71531338
Fix test case issues and add change log
2016-12-26 18:36:19 +08:00
6fa331b065
fix js tests description ( #17065 )
2016-12-26 18:15:05 +08:00
46ef933716
fix a bug that inserted text will overlap with title ( #17058 )
2016-12-26 09:22:49 +08:00
0496857283
Fix chipmunk test issue
2016-12-26 00:07:17 +08:00
20d8ef9584
make it work with release mode on arm64 bit ( #17057 )
2016-12-23 16:44:29 +08:00
b57db96f09
don't use Layer ( #17048 )
2016-12-21 13:49:59 +08:00
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
bd0789e22c
sync codes from cpp to js ( #17042 )
2016-12-19 16:00:27 +08:00
24be2acde0
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
3adbc2a116
change button background picture ( #17040 )
2016-12-19 10:44:56 +08:00
691a0ce8a5
fix the bug that sprite is not hide after trees ( #17028 )
2016-12-16 15:45:34 +08:00
291307b698
should retain object to be used later ( #17027 )
2016-12-16 15:16:00 +08:00
77cf6de2e5
[label] Fixes shadow is drawn incorrect while also enabling outline. ( #17024 )
2016-12-16 14:56:36 +08:00
7c2bd27d71
unschedule all before exit ( #17026 )
2016-12-16 14:53:15 +08:00
332ef17d51
use correct spine api ( #17023 )
2016-12-16 11:24:11 +08:00
effb6f077a
[mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. ( #17011 )
...
* [mac, ios] Adds AudioDecoder::readFixedFrames. And uses readFixedFrames to simply code.
* [mac, ios] ‘ExtAudioFileRead’ may return 0 frame while it doesn’t reach the end of very short audio file.
* [mac, ios] Adds test case for small file test.
* [mac, ios] Adds small audio file.
* [mac, ios] Macro ‘BREAK_IF’ logic fix.
* [mac, ios] Returns false of AudioDecoder::open if total frames is 0.
2016-12-15 09:58:47 +08:00
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +08:00
3302781dae
fix tizen compile issue ( #17002 )
...
* fix tizen compile issue
* fix linux compile issue
2016-12-14 11:55:38 +08:00
de670c1913
Lua tests ( #17005 )
...
* fix conflict effect
* set index to 1 before running a test case
2016-12-14 09:28:19 +08:00
5823f5792b
Synchronize creator engine bug fixes and upgrade web engine ( #17003 )
...
* Add EventDispatcher#hasEventListener (sync from creator)
* Fix function wrapper using js object during its gc
* Support more system languages
* Direct log/error for better understanding problems & add sys.now
* Synchronize Editbox APIs
* Synchronize Scheduler.PRIORITY_NON_SYSTEM const
* Upgrade web engine
* Upgrade test cases
* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
* Manual bind EventListeners’ create to avoid memory issue
* Fix compilation issue when COCOS_DEBUG = 2
* Unify function name of Texture2D::releaseTexture
* Fix compilation issues and update web & bindings-generator
* Fix lua compilation issue
* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
6f58131653
fix bug that localnization can not work correctly ( #17001 )
...
* fix bug that localnization can not work correctly
* re-enable other test cases
2016-12-13 16:33:11 +08:00
ba7c977111
use no border policy ( #17004 )
2016-12-13 16:31:31 +08:00
e469f4f710
Upgrade test cases
2016-12-13 14:29:24 +08:00
80954d392d
fix label position ( #16998 )
2016-12-13 13:38:49 +08:00
f26cc15373
Avoids function name conflict, and uses ` http://httpbin.org/gzip ` to test gzip functionality since only httpbin.org was added to exception list in Info.plist. ( #16933 )
2016-12-13 11:44:42 +08:00
636a253981
[cpp-tests] Reverts code change by mistake. ( #16996 )
...
The mistake was merged in https://github.com/cocos2d/cocos2d-x/pull/7619 .
2016-12-13 11:42:12 +08:00
93a879bfab
remove unneeded files ( #16990 )
2016-12-12 16:25:58 +08:00
2c2ed5c5f5
don't let toggle accept focus ( #16982 )
2016-12-12 09:41:53 +08:00
91daa7a12a
Fixes NewEventDispatcherTest. ( #16983 )
...
fixed http://punchbox.info:3000/issues/26036
2016-12-12 09:39:20 +08:00
951b5174db
[lua-tests] Fixes PhysicsDemoBug5482 crashes. ( #16979 )
...
Fixed http://punchbox.info:3000/issues/26011
2016-12-09 14:12:57 +08:00
fb3055e98c
remove duplicated codes to fix crash in release mode ( #16978 )
2016-12-09 13:42:16 +08:00
e6aa2ace3e
[lua] Fixes AssetsManagerEx test crashes. ( #16977 )
2016-12-09 12:04:38 +08:00
a0b67fc99a
Fixes lua action test ‘Issue 1305’ crashes. ( #16974 )
...
* Fixes lua action test ‘Issue 1305’ crashes.
* Removes an unused log.
2016-12-09 10:39:34 +08:00
3b7ffcf5d0
unscheduleAll() does not unschedule scheduled with performFunctionInCocosThread. ( #16856 )
...
* Fixing issue where Scheduler::unscheduleAll() would not unschedule functions scheduled with Scheduler::performFunctionInCocosThread.
* Removing clear of _functionsToPerform from unscheduleAll, based on code review feedback. Adding a function removeAllFunctionsToBePerfomedInCocosThread, which will remove all pending functions scheduled with performFunctionOnCocosThread.
* Adding test case for Scheduler::removeAllFunctionsToBePerformedInCocosThread
* Adding proper cleanup code to Scheduler test for SchedulerRemoveAllFunctionsToBePerformedInCocosThread
2016-12-08 11:58:58 +08:00
cef013dcc6
Fixes broken of JS AssetsManagerTest. And updates https configuration of cpp-tests, js-tests for macOS. ( #16970 )
...
fixed http://punchbox.info:3000/issues/26031
2016-12-08 10:40:22 +08:00
fb89672fff
Updates lua CCControlSliderTest. ( #16968 )
...
* Updates lua CCControlSliderTest.
fixed http://punchbox.info:3000/issues/26029
* [lua-tests] Fix the display position of CCControlSilderTest on win32.
2016-12-07 14:55:43 +08:00
46fd7e3d59
Sync JS TerrainTest.js from cpp test. ( #16967 )
2016-12-07 14:17:45 +08:00
3db39a27ea
Vibrate test ( #16966 )
...
* only show vibrate test on iOS and Android device
* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
1b0a6c2c5c
Sync editbox improvement from cocos creator ( #16965 )
...
* sync the changes from creator
* fix editbox vertical alignment
* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
f51234c549
fix jsb test inconsistance ( #16963 )
2016-12-06 17:50:26 +08:00
77fb210b3a
fix wrong codes and simplify codes ( #16964 )
2016-12-06 17:38:06 +08:00
84a6ab312c
use correct downloader implementation on mac ( #16955 )
2016-12-05 09:36:35 +08:00
2e0881e284
Scale9Sprite / Slider / LoadingBar fixes ( #16949 )
...
* WIP
* loadingbar issues fixed
* fixes clone in slider
* slider bug fixes
* slider: sets texturesize correclty before seting capsInsets
* sprite: scale9 avoid negativa values
* yeah! works!
* cloneIn -> copyTo
* restore xcode team: none
* fixes issue #16924
* correct issue number
* yeah! fixes issue #16928 and #16930
2016-12-03 07:35:22 -08:00
babced8b7c
Fixes lua-tests/keypad test case. ( #16954 )
...
* Fixes lua-tests/keypad test case.
* Updates string
2016-12-02 15:50:53 +08:00
b80e316150
fixed #16938 : Audio could not be played entirely on iOS/macOS. And refactored some code of decoding. ( #16946 )
...
* fixed #16938 : Audio could not be played entirely on iOS/macOS. And refactored some code of decoding.
* Adds license header, removes unused macros.
* issue #16938 : Corrects remaining frame count calculation.
* Updates include path.
* Adds comments for AudioDecoder class.
* Adds const for getter functions in AudioDecoder.
* issue #16938 : Adds test case.
* Updates license years.
* Deletes trailing white spaces.
2016-12-02 13:52:37 +08:00
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
8f9b096792
fix url and use https protocol ( #16940 )
2016-11-30 17:51:57 +08:00
7e100135b6
disable menu item according different angle of view ( #16937 )
2016-11-30 16:49:50 +08:00
28e48c0af8
remove unneeded test case ( #16936 )
2016-11-30 16:21:33 +08:00
51efcb9365
Fixes setScale & setAnchorPoint could not work in js-tests -> webview test . ( #16935 )
2016-11-30 15:32:02 +08:00
df13bc8856
Allows Arbitrary Loads for cpp-tests, js-tests, lua-tests project. removes exception dictionary. ( #16934 )
2016-11-30 15:29:48 +08:00
8f7d5cfc01
Updates ios project configuration, allows http connection to `httpbin.org` for cpp-tests,lua-tests. ( #16925 )
2016-11-30 11:17:24 +08:00
691a520c29
fix url ( #16922 )
2016-11-30 10:28:51 +08:00
0c06029532
fixed #16894 : RenderTexture does not support Sprite3D ( #16909 )
2016-11-28 09:50:54 +08:00
b397c93b01
fixed #16894 : RenderTexture does not support Sprite3D ( #16908 )
2016-11-28 09:50:45 +08:00
e63a2d0dc2
Scale9Sprite refactor ( #16891 )
...
* Squashed commit of the following:
commit 026eee59c9ece7fc59d71fead41104f375f72eb5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 22 21:45:12 2016 -0800
yay!
everything works!
commit a645c99d44f0d7674e6238afae7628d8d2a030b1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 22 14:55:31 2016 -0800
more fixes in Scale9Sprite
commit 3a688f4ea70c0abe311232c65ed14a7e9acc7611
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 23:06:45 2016 -0800
rotated sprites
commit 45e2085df3aa4b52236c817f7db7c1f6602c1e95
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 17:10:44 2016 -0800
android patch 9: fixes
is not 100% backward compatible since the previous version
had some artifacts. fixed the artifacts. now it renders ok
commit 4655d894387fa40a7e63b074a36bfed20e41d5f9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 16:31:29 2016 -0800
sprite: correct size for "fake scale9"
commit cb98aba27cc1c82a986268d5b74afb55b6cca2f3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 21:55:51 2016 -0800
sprite: adds setStrechEnabled for backward compatibility
and other fixes
commit c0fe67aac54cd62e3846810d56f87133f3a7343b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 18:49:42 2016 -0800
implemts missing functions in scale9sprite
commit e471ef318725ccabc9eca2c062e285e9ca4f9a81
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 18:42:30 2016 -0800
"batched" works
commit 33124bfb14d1f275d4b0ffca8989975625a8a76d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 18:59:38 2016 -0800
more fixes
commit 149f8206269843af63a1739885c00ed8d94c239c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 18:37:12 2016 -0800
scale 9 rotated not fixed yet.
but making progress
commit 27f98275d94ce00c8d5ff0b6f74b5c22723cc3c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 15:32:57 2016 -0800
sprite: streching works ok with normal sprites
commit 2519498cac8b77a32dee5bdf1805be56fbda5ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 12:12:28 2016 -0800
somes fixes... still not working
commit 43580d0b4aa976b0200717611a286bf1035c472d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 15 23:15:22 2016 -0800
more bug fixes related to untrimmed setCenterRect...
...in SCale9Sprite
commit 407247616e506afaa0415c58ad7fce38efed0cd9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 15 22:13:38 2016 -0800
spritecale9: untrimmed vs. trimmed capInsets
WIP. there still a few bugs
commit 3d845b2af3500be287fabb04bb6ba0ec04dbb401
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 14 23:11:17 2016 -0800
started progressbar
commit 0a44b00daf723869b7105689890f29cd53a62608
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 14 17:43:23 2016 -0800
adds EditBox test
commit 330304bd9b2e762de95c2f27f1ae3ceee83b2fbf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 16:57:08 2016 -0800
adds elastic to scroll view
commit a06a35f8691ff56a143953c44acd947b519150b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 15:58:29 2016 -0800
yay! scrollview works
commit 37748a885c62eca8c00d2c9c11ee103f1d95e71c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 15:33:58 2016 -0800
yet more scrollview fixes
commit a6e563b497adef7b141ac7c92c844d479b244c59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 14:48:28 2016 -0800
initial scroll view
commit 4243edd7548e5533ca03c26d5042f8dc5517445a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 8 17:50:15 2016 -0800
sanity check in frames.
missing files
commit 159d88603ad22f3c01761b60bacec98d52b9041d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 19:21:00 2016 -0800
three buttons working
commit 6764cfc7937a1a81d6993d5e32a21f17457b8e0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:50:22 2016 -0800
missing files
commit 11c1fa3812e706a7d34137fe2626f05ab73ee3e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:49:59 2016 -0800
button works!
commit 26b6de4c28fc973e332dd51fcd763a6249c0b4c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:19:47 2016 -0800
Scale9: more fixes.
complies with odd Rect::ZERO behavior
commit ce561268096afe322f25034eeab3508a60027afd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 11:50:42 2016 -0800
label: setTitleLabel
commit 51b5536cd2af36896002621f75c7310960c3f5e7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 17:41:08 2016 -0700
UIButton kind of working
commit 7562a49a761ef70c383a99d2addefc63d77e279f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 11:11:42 2016 -0700
missing resoruces
commit a9890dee5da0104bff6872cc04e8786a6c0a9018
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 10:54:55 2016 -0700
setCenterRect to .cpp file
commit c9c4bb55ed3fc55709eca46c43d1bfe5301c317f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 00:19:51 2016 -0700
removed unused paramter
commit e47732934cca79c08e6fe96e46ebdf075508e568
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 18:19:31 2016 -0700
flipping works!
commit c9769bacd321aeddf84e1772dd270f12194d2f04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 17:57:53 2016 -0700
spirte flip fixes... not finished yet
commit 1cbdc8e12cc6d0d2728c06dfabaada001784a178
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 09:53:16 2016 -0700
centerRect changes
commit aeb1b14c00331dabba640f52d79ab0e255fa3407
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 09:10:41 2016 -0700
changes from v3
commit e7a61c4a20d786c2bc1d6f57e33bf3ac95cb6f21
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 17:01:15 2016 -0700
sprite: rotated slice 9 works as expected
commit 91049389426051deb49a9d951364bf60abaf4532
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 15:39:54 2016 -0700
more bug fixes in scale9sprite support
commit 9feb12449078441c439df16dc7bcfb4506c7a226
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 13:22:52 2016 -0700
Android's Patch 9 works as expected
commit 1cf46afe3e7f7f5f714d30779caefc25a9bb1b3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 10:18:47 2016 -0700
Sprite: uses capInsets instead of centerRect
just to share the same API as Scale9Sprite
commit e944fa0248a7eb58012aacb229de1a9b814e0aef
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 18:59:42 2016 -0700
scale9sprite support fixes
commit b08765740d480b6ae1491800161b40d88f458767
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 17:38:47 2016 -0700
more scale9sprite fixes
commit 388a34d93de5e6007a2cecea959c929f26427cab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 17:20:01 2016 -0700
UI::Scale9Sprite refactoring
subclass of Sprite... much cleaner!
commit c84ec8ee654f74d4b38be2d0a3d7ffe6adbc6faf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 20:58:36 2016 -0700
supports tiled sprites
commit d2b18eb47a647b29319488bd53edac9f304acb84
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 19:21:57 2016 -0700
testing tiled sprite
commit b4832ab2facc01cbb624db587ede01fe7acf23e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 16:53:19 2016 -0700
using correct top-left coordinates for setCenterRect
commit 29d8de86a71cc597b2338f59f7951a28ee0c93b2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 16:46:13 2016 -0700
fixes from scale_sprite9 branch
commit ccbe1063bea7db75397ecaf9046aac3dd977a621
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 19:01:50 2016 -0700
updated example
commit 24f7f85d4eba80f8e543810dcbc1a02447900bdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 18:47:28 2016 -0700
more fixes in nine slice
commit df3358fae68f2d81baf3a8cbe033a4c400ea50da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 18:22:14 2016 -0700
anchor point fixes
commit 4ac7409bc72425abb0dc747b956ec346fbd1b2fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 17:01:48 2016 -0700
support for slice-9 from creator
commit a3221375d3a9defc2e03df0b1c2da1b36dfdd491
Merge: 73e5389 d7490d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 14:13:38 2016 -0700
Merge branch 'sprite_scale9' into creator_cpp_support
commit d7490d94896ad0ce8705dc0695252cee34329b5e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 13 14:34:52 2016 -0700
Adds slice9 support for Sprite.
how to use it:
// points coords
sprite->setCenterRect(Rect(x,y,w,h));
// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite
more slice 9 changes
sprite 9 slice works?
kind of works
correct anchor point
slice 9 works, at least with non-rotated atlases
streched works ok
better Y invert code.
cleaner, compatible with the previous code
yay, scaling workings...
need a better api now
sets scale correctly
yay! works as expected!
more fixes and tests
better test for box
setContentSize() changes size in non-9-slice mode sprites as well
setCenterRect() -> setCenterRectNormalized()
yet another test
adds setPositionNormalized()
adds setCenterRect() tests
remove devel team from xcode
tests: add one more tests
fun test!
improved test
yet another test for slice 9
commit 73e5389ef719880096067d0f7d0bffd6e1f3cfd1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Oct 9 18:54:22 2016 -0700
kind of ProgressBar support
commit 4db5e9e7369e93ceba1d9512ab88c26b843c43d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 7 16:23:54 2016 -0700
new generatred ui files
commit 75aa06f3d39df8c6aa898d5e6810b3cd8015c07b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 6 10:44:59 2016 -0700
bette canvas support
commit 89beacac478fc7f58ef930963b6393f3da4a743c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 21:47:11 2016 -0700
sprites tests
commit 5fe930ad50c2c1b6d868982709c7b659176f9889
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 18:35:44 2016 -0700
more label tests
commit d3f615a097d080d78f2ebd95f3e2388da45f92db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 18:08:24 2016 -0700
label tests
commit 2a4018922ce8d36117f7092fc324e37cf75fdeab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 21:52:56 2016 -0700
label fixes
commit 41fafbd023de63e376d014311605f2b156add307
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 19:14:58 2016 -0700
updated test
commit 06919fc28fffbc5a20cd14bdcc2ad2ff997e0da1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 18:50:45 2016 -0700
creator tests: works
commit 6e362e7cc7f68dc216b569a7f7f90aaa110c0e4a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 27 23:15:56 2016 -0700
autogen: new data
commit e78078b2ad84b4e364827a66f1c459de7384a91d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 26 18:18:57 2016 -0700
fix: initial test for CPP support for Creator
* adds more documentation
* adds more documentation
2016-11-24 09:59:00 +08:00
460c68125f
Use resolved file name (through dictionary lookup) in font atlas creation ( #16797 )
...
* Use resolved file name (through dictionary lookup) in font atlas creation, to prevent creating multiple atlases for the same file.
Add font tests with and without font name replacement (through dictionary lookup).
* Fix cpp-tests xcode and cmake project
* Additional fix for cmake project
2016-11-18 09:23:44 +08:00
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
9204c87cfc
Adding performance.now() to cocos2d-js. ( #16766 )
...
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision
* Adding performance.now tests
2016-11-04 11:58:48 +08:00
7e14812240
fixed #16492 : RapidJSON Crashes in Release mode on Android. ( #16792 )
...
* fixed #16492 : RapidJSON Crashes in Release mode on Android.
* Updates external/config.json
* json/filestream.h -> json/filereadstream.h
2016-11-04 09:36:59 +08:00
9f31a1e43c
Add reason for edit end to UIEditBoxDelegate ( #16771 )
...
* Add reason for edit end to UIEditBoxDelegate
* Adds "NEXT" action button for iOS and Android for easier form
* navigation
* Fix compile error
2016-11-03 14:02:53 +08:00
3b87e46280
Support compile & run project on Tizen by cocos command. ( #16783 )
...
* Add config files for build engine source code on tizen.
* Add config files for cpp-empty-test on tizen.
* Add missing files.
* Add config files for cpp-tests on tizen.
* Add Tizen config files for lua-bindings.
* Add Tizen config files for lua-empty-test.
* Solve the error when build lua-empty-test for Tizen.
* Add Tizen config files for lua-tests.
* Solve the error when build lua-tests for Tizen.
* Add tizen config files for templates.
* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
1667a5c444
Toggle between windowed/fullscreen on desktop ( #16762 )
...
* GLViewImpl methods for desktop window management - toggle between fullscreen/windowed
* Window management tests (mac)
* Added window management tests to Win32 and Linux
* Added const keyword. Removed platform macros.
2016-10-31 14:02:02 +08:00
cc1b7808f0
fixed #16735 : [native] The behavior of (setRotation + setSkewX) is wrong ( #16736 )
...
* fixed #16735 : [native] The behavior of (setRotation + setSkewX) is wrong.
Since I removed some logic, this patch may also improve a little bit performance.
* Adds test case for issue #16735
2016-10-31 10:29:04 +08:00
e0809d869c
Sprite::capInsets -> Sprite::centerRect ( #16770 )
...
* Sprite::capInsets -> Sprite::centerRect
as requested by @minggo
* fixes flip issues in Sprite with slice 9
2016-10-29 17:52:33 -07:00
e4170a7b02
Improve JS bindings ( #16751 )
...
* Fix tests for v3.12 web
* Improve scheduler wrapper
* Update web engine ref
* Fix leak: js_remove_object_reference can not remove non binding objects
* Fix ScriptingCore::evalString
* Add missed `__cppCreated` for JS create objects
* Fix manifest path issue
2016-10-28 09:29:56 +08:00
323ea7c0d4
Sprite scale9 ( #16702 )
...
* Adds slice9 support for Sprite.
how to use it:
// points coords
sprite->setCenterRect(Rect(x,y,w,h));
// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite
more slice 9 changes
sprite 9 slice works?
kind of works
correct anchor point
slice 9 works, at least with non-rotated atlases
streched works ok
better Y invert code.
cleaner, compatible with the previous code
yay, scaling workings...
need a better api now
sets scale correctly
yay! works as expected!
more fixes and tests
better test for box
setContentSize() changes size in non-9-slice mode sprites as well
setCenterRect() -> setCenterRectNormalized()
yet another test
adds setPositionNormalized()
adds setCenterRect() tests
remove devel team from xcode
tests: add one more tests
fun test!
improved test
yet another test for slice 9
* fixes anchorPoint issues
* adds documentation
* fix: using top-left coordinate for setRect
* sprite: fixes related to scale9 and tiled
* Sprite: slice 9 fixes
works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`
* fixes js and lua bindings for Autopolygon
2016-10-26 18:45:40 -07:00
90db0eb6bf
Android pixel fixes ( #16694 )
...
* android pixel fixes
- pragma pack for NavMesh! (how this was working)
- no no-const global variables in shaders
* spine: js bindings work again
2016-10-17 15:44:41 +08:00
6b27f014fc
Correct the Skybox fov ( #16655 )
...
* Remove undrawn quads from the skybox mesh
CCSkybox had been implemented using a combination of two
inconsistent techniques. The rendering was being achieved via use of
the vertex shader's inherent support for cubemaps. That technique requires
only a single screen-covering quad, but the implemtation defined a cube.
Defining a cube mesh would be appropriate if one were simply mapping the
cubemap's 6 textures to faces, but is unnecessary if using the shader's
cubemap feature.
Not only was the use of a cube mesh unnecessary, but the particular way
the cube was defined and used meant that only one face would ever
contribute to the rendering. One of the other faces would always be culled
and the other four would be viewed edge on, mapping the the infinitesimally
thin lines defining the edges of the screen.
This commit simply removes the never-rendered faces, and adds comments
explaining the technique.
* Within test code, remove setScale calls applied to skyboxes.
A Skybox is defined in such a way that it's position, rotation and
scaling has no effect on it's rendering, so setScale has no effect.
The calls are removed from test code to avoid confusing anyone using
it as a template for their own programs.
* Make the Skybox correctly account for the camera's fov
The Skybox does not use the model/view and projection matricies. Instead
a single quad that maps exactly to the screen is rendered and the camera's
world matrix is passed into a shader that renders using cubemap lookups.
The way that works hardwires the fov to 90deg in both the horizontal and
vertical. That shows up particularly badly when the camera is pointed
directly downwards and rotated: the image deforms as it rotates.
This commit corrects the problem by using scaling factors from the
camera's projection matrix to prescale the matrix passed into the shader.
2016-10-17 13:46:26 +08:00
875cf45d1d
Lua: add cc.vec3 functions - add, sub, mul and dot ( #16706 )
...
Also update the lua test to use these functions.
2016-10-17 10:39:40 +08:00
ae439ff8dc
Adds test case for showing border of TTF label, it will be easier to find out wrong offset of Label.
2016-10-14 17:14:15 +08:00
e4be87a059
Adds Spine binary-file format support ( #16629 )
...
* Adds Spine binary-file format support
fixes issue #10438
* ignore SkeletonBinary.c from linter
* add another file to the exclude list
* lua manual fixes for spine
* SkeletonBinary.c and not .cpp
* missing files for win8.1
* don't compile it as crt
* new updates from spine
2016-10-11 10:56:14 -07:00
56e0e6f741
correct search path ( #16660 )
2016-10-08 14:44:18 +08:00
1c0602e130
Remove unnecessary arguments from some lua cc.mat4 methods ( #16658 )
...
* Lua: remove unused 3rd argument from cc.mat4.transformVector
cc.mat4.transformVector takes a mat4 and a 4vector and returns the result
of applying the mat4 to the vector. Strangely it had been made to also
require a third argument called dst which it doesn't use but did check
was a vec4. This commit allows cc.mat4.transformVector to be called
without the unnecessary argument. We still permit calling with it for
backward compatibility.
Also changed is the wrapper in Cocos2d.lua so that a second form of
cc.mat4.transformVector can be used where the vector is supplied as
4 separate numbers.
Changed the test files to call without the unnecessary argument.
* Lua: remove unused argument from cc.mat4.createTranslation/Rotation
Both these functions have an extra unnecessary argument called dst,
although neither use it either to pass in or out a value. This
commit removes the extra argument and updates the test programs
correspondingly.
Also, within Cocos2d.lua, remove some definitions that are later
overwritten by new ones
2016-10-08 14:33:50 +08:00
c3bbbb6cb2
Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format ( #16615 )
...
* refactoring ui related code
* fix label bmfont/charmap etc drawing
* make code more robust
2016-09-30 09:42:21 +08:00
68ec773f39
lua: generate bindings for Sprite3DMaterial ( #16609 )
...
Add Sprite3DMaterial to the list of classes for autogeneration of
lua bindings.
Add a new test case to the end of Sprite3DTest.lua showing the
use of outline.material.
2016-09-30 09:34:16 +08:00
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
466053b740
Fix JS AssetsManagerTest and Improve scheduler wrapper ( #16605 )
...
* Fix tests for v3.12 web
* Improve scheduler wrapper
* Update web engine ref
2016-09-26 14:44:32 +08:00
b22efc9115
Features: add events for window resize, focus, and unfocus ( #16578 )
...
* add events for window resize, focus, and unfocus
* fix typo
2016-09-20 20:32:33 -07:00
4dd1af5485
fix compiling error
2016-09-18 11:34:01 +08:00
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
5f4fb66f61
fix: staggered hex maps returns correct tile ( #16552 )
...
* fix: staggered hex maps returns correct tile
order was fixed in the array that contains the GIDs.
fixes Github issue #16512
* fix: add fix validation code for issue #16512
2016-09-13 21:47:36 -07:00
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
fa15ab8212
3.13.1 text color ( #16516 )
...
* fix: Label updateColor() and underline color work as expected (#16486 )
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* fix conflict
* Issue 16471 (#16489 )
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-07 09:44:58 +08:00
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
c51605971f
fixed #16490 : [android, audio] AudioEngine::stop() triggers 'finished' callback ( #16491 ) ( #16524 )
2016-09-06 10:58:43 +08:00
a6c398ec95
Fixes jsval_to_std_string could not convert number to string. ( #16504 ) ( #16515 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 17:42:34 +08:00
5bfd110424
Fixes jsval_to_std_string could not convert number to string. ( #16504 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 10:02:05 +08:00
c32000250c
Issue 16471 ( #16489 )
...
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
64c62d37c2
fixed #16490 : [android, audio] AudioEngine::stop() triggers 'finished' callback ( #16491 )
2016-09-01 16:06:29 +08:00
01e67f6203
fixed #16477 : [android, audio] Deadlock if preload the same file more than 3 times in preload callback. ( #16478 )
...
And added test case.
2016-09-01 11:46:27 +08:00
35f937cd40
AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up. ( #16476 )
...
* Warning fixes in AudioDecoder.cpp
* AudioPauseResumeAfterPlay test case should start in onEnter.
And add a loop to pause & resume many times.
* AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up.
2016-09-01 11:43:37 +08:00
e57c30c83b
fix: Label updateColor() and underline color work as expected ( #16486 )
...
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
2016-08-31 20:20:13 -07:00
9dea92b2e0
feat: add support for Game Controllers on Mac ( #16461 )
...
it shares 100% the same code with iOS.
it only adds a few #ifdefs.
github issue #16460
2016-08-29 16:58:44 -07:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
f174dd1141
fix: improves test for issue #16155 ( #16418 )
...
improves test for github issue #16155
2016-08-23 09:47:55 +08:00
727c501285
Fixes crash while invoking pause&resume right after play2d. ( #16406 )
2016-08-22 09:43:06 +08:00
f0be4f3069
Merge part of Cocos2d-x-lite ( #16380 )
...
* Update js auto binding settings with new ndk version
* Remove unnecessary property from Ref
* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup
* Fix spine track entry circle referencing issue
* cocos2d/cocos2d-x#16327 : Fix global object leak issue in JSB
* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey
* Update JS versions
* Add docs for web v3.13
* Improve ScriptingCore
* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone
* Fix auto bindings configurations
* Update web ref
2016-08-19 16:28:47 +08:00
016e7b0dfc
fix: release texture in RenderState ( #16396 )
...
memory leak fixed in RenderState
fixes github issue #16155
2016-08-19 00:22:57 -07:00
e9a5a4e2bd
Revert luajit ( #16397 )
...
* revert to use lua
* comment lua bytecode test
* update release note
2016-08-19 11:49:19 +08:00
3ce4134ab3
use java reflection to avoid API level dependent, use app-abi 10 ( #16371 )
...
* use java reflection to avoid API level dependent, use app-abi 10
* add license header
2016-08-17 13:55:26 +08:00
b1a64ae730
new actions ResizeBy and ResizeTo ( #16275 )
...
* new actions ResizeBy and ResizeTo
* FDP-5580-ResizeBy and ResizeTo fix and Test cpp : added a scale exemple in the test cpp to compare with our new resize + fix
* FDP-5580: actions ResizeBy and ResizeTo : changed some functions visibility
2016-08-16 16:55:31 +08:00
86b8a633f3
Android arm64-v8a also uses Luajit. ( #16352 )
...
* Android arm64-v8a also uses Luajit.
* Updates external/config.json
2016-08-15 14:57:04 +08:00
1edaf7e122
Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. ( #16353 )
2016-08-15 14:10:13 +08:00
12d022d6ea
[lua-tests] Reverts uniform after GetUniformTest. ( #16357 )
2016-08-15 09:41:18 +08:00
3bc662ea7b
fix: not resize textureatlas multiple times on Label::create() ( #16358 )
...
since we know the size before allocating it, just reserve
the needed capacity once.
fixes github issue #16293
2016-08-13 09:38:42 -07:00
3d75750728
resets bindBuffer after using it ( #16342 )
...
fixes github issue #14711
2016-08-11 08:32:09 -07:00
89baddceda
fixes compile error for win32 ( #16351 )
2016-08-11 15:54:51 +08:00
14b8fc0a71
Remove AppDelegate memory leak in Android projects ( #16333 )
...
* Remove AppDelegate memory leak from Android projects
AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.
Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110
* Correct code style in Android main.cpp files
- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
f7464f8de5
fix: TriangleCommands with custom uniforms can be batched ( #16329 )
...
* fix: TriangleCommands with custom uniforms can be batched
TriangleCommands with custom uniforms can be batched together.
This improves the performance when using custom uniforms without
adding any penalties when not using them
Github issue #16224
* better tests
2016-08-07 14:51:02 -07:00
a58323a388
Adds more info regarding bug 15776 ( #16315 )
...
Related to github issue #15776
2016-08-05 14:04:39 +08:00
59a646341c
adds more info for bug #15776 ( #16316 )
...
related to github issue #15776
This is a PR for v3.13 branch
2016-08-05 14:04:26 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
6eaf15a2c2
fix pageview turning event ( #16299 )
2016-08-04 09:51:54 +08:00
efc6da8439
use correct file ( #16300 )
2016-08-03 15:13:04 +08:00
bbfd2d334c
Some bug-fix and quality assurance for Tizen support. ( #16281 )
...
* Support audio interruption and resume callback when change earphone status.
* Refactor keyevent callback and add makecurrent for compatible with different binary.
* Enable Tizen indicator.
* Remove the unnecessary evasobject in the window and refactor the function for glview mode.
* Fix the compatible issue between Tizen 2.3 and 2.4.
* Fix the wrong directory of script resources for HellLua template project.
* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
2945968614
Upgrades to Spine v3.4 ( #16242 )
...
* Upgrades to Spine v3.4
Github issue #16115
* compiles and works on windows
tested on:
* win32
* win10
* win8.1
* include-linter: don't test spine files
we need them unmodified
* spine bindings fixes
also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
30118aff6b
Merge pull request #16226 from dumganhar/fix/iss16192-smallaudio-crash
...
fixed #16192 : Crash while decoding small MP3 file on Android.
2016-07-27 15:39:57 +08:00
4e278183ad
Merge pull request #16122 from ricardoquesada/issue_16100
...
testcase: add test case for issue #16100
2016-07-26 23:21:25 -07:00
8eb30769a1
Adds test case.
2016-07-27 14:00:34 +08:00
b336aa3219
testcase: add test case for issue #16100
...
delays camera creation
fix issue #16100
2016-07-26 19:03:54 -07:00
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
2abd178e96
Merge pull request #16180 from ricardoquesada/issue_16113
...
test case for issue #16113
2016-07-21 10:53:38 -07:00
bb004c5e22
[audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform. ( #16147 )
...
* [audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform.
* Better state control in AudioCache.
* Adds State enum class which contains INITIAL, LOADING, READY, FAILED states.
* AudioPlayer::destroy should check AudioCache::_isAudioLoaded flag, otherwise, app will freeze in cpp-tests/NewAudioEngineTest/6:Test invalid audio file.
* Should check whether state is INITIAL in the destructor of AudioCache.
* Adds test case for switching play state frequently.
* Skips invoking reading data callback if cache's state is INITIAL.
* Variables initialization for AudioCache class and fixes protential missing delete AL buffers.
2016-07-21 14:57:59 +08:00
26dd7b2698
remove curl link for Android
2016-07-21 11:56:56 +08:00
aff6e7852b
test case for issue #16113
2016-07-20 19:45:52 -07:00
b3218c1e58
fix: stagger tilemaps hexa works as expected
...
Github issue #16105
2016-07-19 22:55:05 -07:00
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
15ef80e27d
[big refactoring] Audio latency fix for Android. Support to preload effects on Android now. ( #15875 )
...
* Audio latency fix for Android. Support preload effects on Android now.
Squashed commits:
[b6d80fe] log fix
[a0a918e] Fixes assetFd didn't be released while PcmData is returned from cache.
[4b956ba] Potential crash fix for PcmAudioPlayer while pause / resume.
[398ab8c] Updates LOG_TAG position in AudioEngine-inl.cpp
[e3634e7] include stdlib.h for posix_memalign
[9004074] fixes setVolume logical error.
[c96df46] Don't use another thread for mixing, enqueue is in a seperated thread, therefore doing mixing in another thread will waste more time.
[0a4c1a8] Adds setLoop, setVolume, setPostion support for Track
[c35fb20] Fixed include.
[cdd9d32] Do mixing by ourself. (TO BE POLISHED)
[6447025] µ -> u since µ could not be shown on some android devices.
[97be0c6] Don't send a silence clip.
[c1607ed] Make linter.py happy.
[0898b54] Puts enqueue & SetPlayState in PcmAudioPlayer::play to thread pool.
[b79fc01] Adds getDuration, getPosition support for PcmAudioPlayer
[80fa2ab] minor fix of the code position of resetting state to State::INITIALIZED
[d9c62f1] underrun fix for PcmAudioPlayer.
[9c2212a] UrlAudioPlayer, playOverMutex should be static, and should be used in update method.
[1519d2e] static variables
[19da936] _pcmAudioPlayer Null pointer check in AudioPlayerProvider.
[e6b0d14] Updates audio performance test.
[fc01dd4] Registers foreground & background event in AudioEngine-inl.cpp(android), the callback should invoke `provider`'s pause & resume method.
[e00a886] TBD: Pause & resume support for PcmAudioPlayerPool.
Since OpenSLES audio resources are expensive and device shared, we should delete all unused PcmAudioPlayers in pool while pause and re-create them while resume.
But this commit isn't finished yet, I don't find a better way to register pause&resume event in AudioEngine module.
[9e42ea3] Interleave mono audio to stereo audio. PcmAudioPlayerPool only contains PcmAudioPlayers with 2 channels.
[3f18d05] Adds a strategy for checking small size of different file formats.
[753ff49] Adds performance test for AudioEngine.
[09d3045] Releases an extra PcmAudioPlayer for UrlAudioPlayer while allocating PcmAudioPlayer fails.
[9dd4477] Using std::move for PcmData move constructor & move assignment.
[6ca3bcb] some fixes:
1) new -> new (std::nothrow)
2) break if allocate PcmAudioPlayer fails
3) renames 'initForPlayPcmData' to 'init'
4) PcmAudioPlayer destructor deadlock if 'init' failed
[54675b6] include path fix.
[a1903ca] More refactorings.
[19b9498] Makes linter.py happy. :)
[923c530] Fixes:
1) Avoid getFileInfo to be invoked twice
2) A critical bug fix for UrlAudioPlayer and adds detailed comments
3) __clang__ compiler option fix for AudioResamplerSinc.cpp.
[5ec4faf] minor fix.
[faaa0f3] output a log in the destructor of UrlAudioPlayer.
[9c20355] NewAudioEngineTest,TestControll crash fix.
[f114464] fixes an unused import.
[1dc5dab] Better algorithm for allocating PcmAudioPlayer.
[331a213] minor fix.
[e54084a] null -> nullptr
[f9a0389] Support uncache.
[89a364f] Removes unused update, and TODO uncache functionality.
[1732bf9] Supports AudioEngineImpl::setFinishCallback for android.
[43d1596] UrlAudioPlayer::stop fix.
[e2ee941] Test case fix in NewAudioEngineTest/AudioIssue11143Test
[5c5ba01] More fixes for making cpp-tests/New Audio Engine Test happy.
[8b554a3] Adds log while remove player from map.
[ed71322] If original file is larger than 30k bytes, consider it's a large audio file.
[fb1845a] Updates project.properties
[6f3839f] minor log output fix in AudioEngine-inl.cpp
[c68bc6c] Don't resample if the sample rate of the decoded pcm data matchs the device's.
[43ca45f] PcmAudioPlayers also need to be removed while they play over, but should not be deleted since their lifecycle is managed by PcmAudioPlayerPool.
[f5e63c9] Audio latency fix for Android. Support preload effects on Android now.
* Supports to loading audio files asynchronously.
* Crash fix for stop audio right after play2d.
* Minor fix for logic in AudioMixerController.cpp
* Adds missing files (CCThreadPool.h/.cpp).
* Minor fix for including.
* Minor fix for missing include <functional> in Track.h
* update license information in audio.h
* Don't use std::future/std::promise anymore since ndk counldn't support it well in armeabi arch.
* isSmallFile postion updated, fixes large audio file goto the checking logic of cache.
* std::atomic<int> isn't supported by ndk-r10e while compiling with `armeabi` arch, using a int with a mutex instead.
* fixes __isnanf & posix_memalign doesn't exist on low api (<=16) devices.
* namespace updated: cocos2d -> cocos2d::experimental
* Removes commented code in AudioMixerController.h/.cpp
* Removes unused code again, and fixes a memory leak of `Track` instance.
* Oops, namespace changed.
* Only outputs log in debug mode.
* Uses ALOGV for outputing logs in AudioEngine-inl.cpp
* const PcmData& -> PcmData for Track
* Fixes a protential crash in NewAudioEngineTest
* Adds `COCOS` prefix in header #ifndef COCOS_BALABALA #define COCOS_BALABALA
* Uses _ prefix for cocos code style instead of `m` prefix.
* Deletes AudioResamplerSinc related files.
* Bug fix from @minggo's reply on github.
* Don't need to invoke pause after in UrlAudioPlayer::prepare.
* Updates ThreadPool class, uses enum class and adds const keyword.
2016-07-18 10:22:40 +08:00
8b289d2385
fix bug that virtual button is not hidden after keyboard dismissed
...
* fix compiling error with --android-studio
* hide virtual button after keyboard dismiss
* remove unneeded log
2016-07-15 18:25:48 +08:00
1563d14447
Squashed commit of the following:
...
commit c8349caeca6ff5ebacf497eaa986e71d5f1c2c0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 14 11:19:50 2016 -0700
fix: works with odd sized maps
commit da4cf8bc19c9cdab148d60e03a25ee9cc4292b66
Author: zhangbin <zhangbin@cocos2d-x.org>
Date: Wed Jul 13 13:45:57 2016 +0800
Add test case.
2016-07-14 11:21:24 -07:00
05a772115e
fixes issue #15566
...
lua and javascript for arm64 is not compiled
version 103
uses JPEG 9b for android
using armeabi
uses Lua, and not LuaJIT for Android ARM64
2016-07-12 19:03:53 -07:00
2ca1760b78
Merge pull request #16079 from minggo/use-std_srand
...
use std::srand() instead
2016-07-11 12:01:38 +08:00
a146f3eec7
use std::srand() instead
2016-07-11 11:17:28 +08:00
995868c62e
fix: Text::create() does not crash on mac/ios
...
...on invalid unicode.
fixes issue #16073
2016-07-08 16:59:44 -07:00
c267167d07
Merge pull request #16069 from minggo/ndkr12b-issue
...
fix compiling and linking error with ndk r12b
2016-07-08 17:01:09 +08:00
a144006931
use arm mode
2016-07-08 16:00:32 +08:00
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
8d8c295ff0
Merge pull request #16062 from minggo/fileutils-issue
...
fix bug that FileUtils::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-08 14:54:25 +08:00
7727c2eb6f
Merge pull request #16058 from ricardoquesada/issue_11942
...
test: add test case for Github issue #11942
2016-07-07 11:51:47 -07:00
891fe706da
Merge pull request #16057 from ricardoquesada/issue_12226
...
test: add test case for Github issue #12226
2016-07-07 08:34:30 -07:00
4511b35b51
fix bug that FileUitls::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-07 17:43:19 +08:00
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
766817f1dd
test: add test case for Github issue #11942
...
test case for Github issue #11942
2016-07-06 17:21:58 -07:00
6d5a94e569
test: add test case for Github issue #12226
...
Adds test case for Github issue #12226
2016-07-06 16:37:15 -07:00
96155a670f
Improve web template and update web ref
2016-07-06 13:54:55 +08:00
f7d65fbe8a
Squashed commit of the following:
...
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 1 11:05:02 2016 -0700
Add support for Hex tiled maps
Based on original patch by https://github.com/JustVic
Original patch:
https://github.com/cocos2d/cocos2d-x/pull/13288
fix: tiled hex maps
Hexagonal TileMaps Support
fix: odd, even works as expected
still problems with rendering order
fix: fixes layer position in Hex
fix render ordering
2016-07-01 15:51:00 -07:00
2354df9faf
Fix getSubStringOfUTF8String bug
2016-07-01 15:16:35 +09:00
afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
91341c151a
Fix js test issues
2016-06-29 11:08:34 +08:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
c7af8e3e74
Merge pull request #15987 from ricardoquesada/issue14017test
...
fix: add test case for issue #14017
2016-06-28 17:58:51 -07:00
a6305cc1f7
fix: add test case for issue #14017
...
Add test case for issue #14017
2016-06-28 17:32:13 -07:00
ed30993f59
fix: add testcase for issue #14050 fix
2016-06-28 17:08:56 -07:00
6e54080e83
Fix style issue in html page
2016-06-28 21:59:37 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
417ddcc9e7
[Web] Fix TransitionsTest issue on render type detection
2016-06-28 15:10:42 +08:00
6b2a96a2b9
Fix LoaderTest
2016-06-28 14:08:30 +08:00
4dfa9d1719
[ci skip]Lua test case issue ( #15970 )
...
* modify title and replace or with BitOr
* remove unneeded codes
2016-06-27 18:44:09 +08:00
d7cb7676bc
Merge pull request #15966 from mogemimi/improve-refptr
...
Improve RefPtr to avoid casting when possible
2016-06-27 10:07:54 +08:00
a287e696c9
Improve RefPtr to avoid casting when possible
2016-06-26 21:39:43 +09:00
bc51528301
Fix typo in FileUtils::Status enum
2016-06-25 12:58:55 +09:00
26fb64395a
Merge pull request #15954 from pandamicro/v3.12
...
Fix easing action crash because the js object is not rooted
2016-06-24 17:21:41 +08:00
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
8cb2e93644
Fix easing action crash because the js object is not rooted
2016-06-24 14:38:59 +08:00
d643b306ef
Remove cocos studio tests in JS-tests
2016-06-24 13:50:24 +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
459b7f30c6
refactoring Android editbox setVisible API
...
fix set visible issue of android editbox
fix android lower case multiline
revert unkown changes
2016-06-23 18:18:39 +08:00
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
bac1870d16
fix android editbox custom font file ( #15924 )
...
* fix android editbox custom font file
* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
ff71ffae84
fix: not crash after removing a physics body right after...
...
adding it.
2016-06-22 14:12:27 -07:00
324931a242
Merge pull request #15919 from zilongshanren/fix-android-system-fontname
...
fix system font creation on Android platform
2016-06-22 18:10:13 +08:00
2a659b932a
Update html5 engine to v3.12
2016-06-22 17:39:47 +08:00
683a4bfec6
Fix tests for v3.12 web
2016-06-22 17:39:38 +08:00
8366983a01
fix js ui test missing UITest.json
2016-06-22 17:01:53 +08:00
783dfb3f14
fix system font name on Android ttf creation
2016-06-22 16:54:01 +08:00
9fd190d283
Merge pull request #15916 from dumganhar/fix/AssetsManager
...
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 15:25:18 +08:00
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
b2c5e092e4
Merge pull request #15915 from minggo/lua-remove-studio-test
...
[ci skip]remove studio related test cases
2016-06-22 14:11:46 +08:00
359fdb92f2
remove studio related test cases
2016-06-22 14:05:58 +08:00
beee9a664e
SocketIOTest: url fix
2016-06-22 12:10:19 +08:00
35008702bf
fix: underline will have the same solor as text in TTF
...
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?
github issue #15214
2016-06-17 17:23:59 -07: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
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
b80a81fc7c
removed incorrect AppBundle info
2016-06-16 06:09:59 -07:00
d66b686bd8
Merge pull request #15816 from yalab/valuemap_reject_none
...
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-16 14:20:46 +08:00
d12d19dbbe
Merge pull request #15857 from minggo/issue-15833
...
remove unneeded test case
2016-06-16 14:13:59 +08:00
43ece2de34
remove unneeded test case
2016-06-16 11:00:15 +08:00
98e2c4bb4a
fix: compiles cpp-empty-test
2016-06-15 15:25:19 -07:00
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07:00
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
72dfa63294
Fix assertion failure when running Sprite Test
2016-06-12 03:45:38 +09:00
598be0840c
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-10 14:53:11 +09: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
097eebdb50
Testcase for CCS 1.6 animations with only one frame ( #15714 )
...
* Testcase for CCS 1.6 animations with only one frame
* Removed extra comma
* Removed conflict garbage
* Removed old code
* Create new Test section Cocos Studio > Issues
* update ccs-res submodule
* Fixed Back button visibility
2016-06-06 09:32:33 +08:00
3810854c45
use std::isnan instead of isnan to fix compiling errors
2016-05-30 18:19:10 +08:00
69974ab06f
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-28 22:15:56 +09:00
ff058eebc4
Merge pull request #15719 from ricardoquesada/issue_15594
...
fix: add code/resources to reproduce issue_15594
2016-05-26 20:40:38 -03:00
0be6645004
fix: 15594 compiles on android
...
github issue #15594
2016-05-26 19:25:39 -03:00
8bd4ddf081
fix: compile on linux, android and windows
2016-05-26 16:02:24 -03:00
1116176362
Merge pull request #15720 from billyquith/v3
...
Grammar corrections
2016-05-26 11:00:53 +08:00
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
b830b7de4c
fix: add code/resources to reproduce issue_15594
...
github issue #15594
2016-05-25 09:00:32 -03:00
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
8d1aad0f96
Fix test cases with PVRTC textures loading on devices that don't support this formats
2016-05-23 18:10:00 +03:00
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
9c0acf1e5d
Merge pull request #15619 from VisualSJ/v3_audio
...
audio search path (android)
2016-05-19 18:06:58 +08:00
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
50acf4c94b
Merge pull request #15660 from minggo/assetsmanager-test-issue
...
[ci skip]make AssetsManagerExTest can connect to the url
2016-05-17 17:15:45 +08:00
8c9138601c
make AssetsManagerExTest can connect to the url
2016-05-17 16:41:07 +08:00
d7d52c1996
Merge pull request #15638 from MSOpenTech/v3-winrt-fix
...
V3: Winrt added updated .filters file for Windows 8.1 Universal cpp-tests project
2016-05-17 10:39:44 +08:00
f0343bf219
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
2016-05-13 22:13:05 -04:00
cad762a4f9
added updated .filters file
2016-05-13 07:33:51 -07:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
ada1d1dfe8
audio search path (android)
2016-05-11 17:24:14 +08:00
cf305a56b1
removed missing files from project
2016-05-10 21:41:39 -07:00
8b0c2110fd
Merge pull request #15606 from minggo/websocket-test-issue
...
fix crash when back to parent test case
2016-05-11 09:28:42 +08:00
2ad6f10bb6
Merge pull request #15609 from pandamicro/v3.11
...
Fix web engine issues and SocketIO connection fail issue
2016-05-11 09:28:24 +08:00
05dd3bb608
Fix web engine issues in test cases
2016-05-10 20:34:35 +08:00
b2a592ce36
fix crash when back to parent test case
2016-05-10 17:55:36 +08:00
d7fea4b08b
reduce loop times to be quicker on low performace devices
2016-05-10 16:19:58 +08:00
d086965683
Merge pull request #15598 from minggo/android-package-name
...
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
5d7cbe622a
Merge pull request #15589 from pandamicro/v3.11
...
Add cc.game.end to close game window
2016-05-07 22:11:46 +08:00
fc9880ab49
Add captureNode for cocos2d::utils ( #15558 )
...
* Add captureNode for cocos2d::utils
Add captureNode for cocos2d::utils and fix CC_DLL syntax.
* Add test case for utils::captureNode
Add test case for utils::captureNode.
* Store captured image to disk with RGB.
* Trigger jenkins check
2016-05-07 22:10:53 +08:00
c4b2f6ff35
Merge pull request #15584 from VisualSJ/v3.11_bugs
...
loader test bug
2016-05-07 22:07:49 +08:00
1980311204
Fix OpenGL test issue on web
2016-05-07 17:31:58 +08:00
d0fc3ec4c4
Add cc.game.end to close game window
2016-05-07 14:37:36 +08:00
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
cb8cde63b1
loader test bug
2016-05-06 17:19:33 +08:00
44958d7361
not add invalid search paths
2016-05-06 15:54:08 +08: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
44063b8e85
Merge pull request #15568 from zilongshanren/fix-jsb-related-issues
...
fix jsb 3.11 related issues
2016-05-05 11:01:44 +08:00
8c046fea92
fix jsb 3.11 related issues
2016-05-05 10:20:00 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
1886ac1349
Fix http arraybuffer test can not load issue
2016-05-04 15:48:16 +08:00
788dae5a2e
Merge pull request #15531 from pandamicro/v3.11
...
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
27b9510f2c
Upgrade web engine to v3.11 beta and fix issues with js-tests
2016-04-28 16:12:29 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
43a94c0693
Add FileUtils::getContents(). ( #15479 )
...
* Add FileUtils::getContents().
* skip FileUtils::getContents() in binding generator config.
* use FileUtils::getContents in CCDataReaderHelper.
* obey the cocos2d-x coding style.
* Explicit constructor.
* More docs.
* More tests.
* Move FileError to FileUtils::Error.
* Fixes wrong buffer size for reading into string and vector.
* Update tests.
* Add note on padding for output buffers.
* FileUtils: implements old methods by using `getContents()`.
methods are:
* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()
and follow Android methods are now just calls FileUtils' ones.
* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()
* Fixes build error.
* FileUtils::getFileData: Return the size of data.
* Remove old methods form FileUtilsAndroid they are now done in FileUtils.
* Fixes for win32 code.
* Fixes build error in test and add more test.
* Better error message.
* Make template type name more readable.
* Update comments.
* Move internal functions to anonymous namespace.
* Refactor FileUtils test.
* Fix warning about compare signed and unsigned.
* Win32 and WinRT does not use text mode.
That is we don't need simulate convert CRLF to LF.
* Fixes for Win32 and WinRT.
* Update for Win32 and WinRT.
* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().
* Update for coding styles.
* More error strings.
* check read and malloc return codes.
* rename FileUtils::Error to FileUtils::Status.
* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.
* Fixes build error for winrt and cleanup FileUtils::Status.
* Try to fix the build error on Linux.
Status must defined in some header, so move FileUtils.h up.
* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
d97275e0ad
Merge pull request #15505 from dumganhar/issue-15495
...
fixed #15495 : WebSocket crash on Director end (app exit),
2016-04-26 11:45:30 +08:00
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
6746aeb992
ignoreAnchorPointForPosition() -> set ~ from missing files
2016-04-25 20:43:42 +09:00
45d68ad265
fixed #15495 : WebSocket crash on Director end (app exit), WebSocketTest in cpp-tests needs to be updated.
2016-04-25 16:22:46 +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
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
b8eae430fb
Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
...
extend the RichText
2016-04-20 20:05:29 -07:00
a8ddbdc12c
defaults and append tag support
2016-04-21 10:03:57 +09:00
4c7e4671d9
Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. ( #15194 )
2016-04-20 17:25:31 +08:00
85646b8d80
Fix warning C4305 while compiling AppDelegate with MSVC
2016-04-20 04:01:06 +09:00
f9f751834a
Add missing float suffix to avoid warning C4305
2016-04-20 03:54:47 +09:00
4d7bf1f827
updated expiration dates of all winrt test app and template certificates
2016-04-19 09:07:30 -07:00
dc0f7bf903
Fixes format warnings.
2016-04-18 17:52:58 +08:00
001a0ee812
remove useless warning log of stencil buffer. ( #15396 )
...
1. disable GC for Native object
2. improve js tests of label
2016-04-18 15:43:54 +08:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
32e9f9eb15
Add js-tests for page view indicator tune.
2016-04-11 13:44:25 +03:00
f51f9003bf
Fix deprecation warnings in tests
2016-04-11 19:35:44 +09:00
2246495cc3
Add test for page view indicator tune
2016-04-11 12:29:02 +03:00
32b64831da
Fixed ccui.ListView Test
2016-04-11 11:28:46 +08:00
cf32f8a2f0
Add PageView js tests
2016-04-11 11:27:50 +08:00
273281ecce
Add ListView js tests
2016-04-11 11:27:38 +08:00
8ae6d68640
Add scroll view bar js test
2016-04-11 11:27:25 +08:00
fea84b8af3
fix: use chipmunk v6.2 API whenever possible
...
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
2016-04-11 11:12:34 +08:00
9459d2b67e
Fixed ccui.ListView Test
2016-04-08 15:31:51 +03:00
c7bea705af
Add PageView js tests
2016-04-08 14:01:20 +03:00
dbd2b5fd03
Add ListView js tests
2016-04-08 13:40:21 +03:00
c0dc8b0637
Add scroll view bar js test
2016-04-08 11:14:45 +03:00
f243cc4ce3
fix: use chipmunk v6.2 API whenever possible
...
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
2016-04-07 16:22:49 -07:00
88ff4da348
buoyancy fix.
...
first commit
2016-04-05 17:52:19 -07:00
3d7d5de95d
Merge pull request #15317 from pandamicro/v3
...
Fix Socket IO handshake issue with latest version libwebsocket
2016-04-01 22:27:57 +08:00
d93fbea0f6
Fix Socket IO connection issue on iOS
2016-03-31 21:21:20 +08:00
08383628cc
Merge pull request #15356 from minggo/crash
...
[ci skip]fix crash issue
2016-03-31 15:37:27 +08:00
8694a15a72
fix crash issue
2016-03-31 15:36:00 +08:00
fb3032b6fe
Merge pull request #15349 from minggo/menu_test
...
[ci skip]Menu test
2016-03-30 14:44:24 +08:00
b4ee6e8971
don't set wrong string for atlas label
2016-03-30 14:32:11 +08:00
c1a79700ae
don't set wrong string for atlas label
2016-03-30 14:28:33 +08:00
c566dce581
fix: compile cpp-tests in release mode
...
replace some deprecated functions
use `log` instead of `CCLOG` in order to avoid Warnings when not using
some variables
2016-03-29 18:09:58 -07:00
1de5141473
update label string every 0.1s
2016-03-29 15:25:18 +08: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
8f30d01156
Merge pull request #15286 from xpol/remove-uncessary-search-paths
...
Removed unnecessary search paths.
2016-03-22 19:51:59 +08:00
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
4b47750e1f
Merge pull request #15171 from xiaofeng11/v3_jsFix
...
[ci skip] js-test bug fix
2016-03-22 16:24:31 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
11ed05a0be
Merge pull request #15245 from mogemimi/fix-function-name
...
Fix incorrect function name of getTrianglesCount
2016-03-17 16:08:40 +08:00
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
cf38b1fbfd
fix build failed of gradle
2016-03-11 19:23:26 +09:00
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
4247292c82
add test case for fix bugs
2016-03-10 18:06:54 +08:00
cce46195ca
Add websocket close test
2016-03-10 14:01:38 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
ce555f68de
Fix CocosDenshionTest playMusic won't work under android system
...
Fix click setNotificationNode button in SceneTest then return to main menu the animation is still play on screen
2016-03-03 16:47:05 +08:00
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
05411a44f5
Add comment.
2016-03-03 13:41:32 +08:00
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
19caf2d276
Merge branch 'v3' into add-listview-cellreuse-tests
2016-03-01 16:40:07 +08:00
7ec4450fc0
add js ListView item reuse tests
2016-03-01 15:22:32 +08:00
91581754a4
Add introductions of localization manager in test.
2016-03-01 14:34:13 +08:00
552d7d0132
add vertical list cell reuse tests
2016-03-01 13:44:42 +08:00
b3b08271e6
improve Listview item demo
2016-03-01 10:37:48 +08:00
248978bac1
force multiple for windowsphone
2016-02-29 15:23:22 -08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
a839d5818e
add horizontal cell reuse ListView
2016-03-01 00:07:49 +08:00
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
fb7044c535
Add SpriteFrameCacheTest to Android, Windows, Linux project files
2016-02-17 20:52:30 +03:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
9224a9d03b
Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead.
2016-02-17 14:54:15 +08:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
c26fe122ad
SpriteFrameCacheTest: test for PixelFormat
2016-02-12 19:06:16 +03:00
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
2016-02-08 11:25:37 -08:00
a93bc88d31
add Mac Editbox multiline support.
...
1. It also refactor the original logic and optimize the iOS EditBox implementation.
2016-02-04 14:21:07 +08:00
72be9a3966
Fix other issues
2016-02-02 23:39:18 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
55756cb043
Improve test cases
2016-01-26 19:34:01 +08:00
74e7bd2083
fix win32 compile error
2016-01-26 09:52:53 +08:00
bc44769b8b
add more deprecated functions
2016-01-25 18:14:48 +08:00
00ad5bd620
fix jsb deprecated constants
2016-01-25 15:40:51 +08:00
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
0daa846020
Improve gc test case and add cycle reference tests
...
t
Improve gc test case and add action cycle reference test
2016-01-24 19:47:24 +08:00
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
be7c8c7553
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
...
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08:00
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
be6fd6a2ee
format code indent
2016-01-21 10:27:37 +08:00
7735a75651
adds JS tests for RichText
2016-01-20 17:59:13 -08:00
87434e2774
add scrollview bar parse for cocostudio in reader
2016-01-20 21:13:59 +08:00
e2a3fb4a04
update ccs-res for scroll bar test
2016-01-20 21:12:52 +08:00
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
39ab445f7d
Merge pull request #14904 from pandamicro/v3
...
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
751e2f6eb8
Improve gc test case and add action cycle reference test
2016-01-20 11:15:06 +08:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
ec5b5f0014
Add TreeScene test case to jsb memory test
2016-01-18 14:28:02 +08:00
41c0881ab5
SpriteTest fix
...
* Image is Ref class, please new & release it. Don't allocate it on stack.
* Fixes complicated logic of getting string from file.
2016-01-15 00:55:10 +08:00
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
be6f9c0f03
Merge pull request #14882 from geron-cn/playableframe
...
add PlayableFrame
2016-01-14 09:42:17 +08:00
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
5d1e98340e
Updates WebSocket::onSocketCallback & WebSocketTest.js
2016-01-13 21:15:48 +08:00
eab1de0f1e
format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885
2016-01-13 16:34:04 +08:00
e3c50caf11
add test case for PlayableFrame
2016-01-13 15:25:31 +08:00
e1d0d7f722
Merge pull request #14854 from zilongshanren/fixScale9GrayShader
...
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
7d943f200f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 17:17:55 +08:00
2797277de8
Revert "fix scale9sprite gray state opacity issue."
2016-01-07 17:07:27 +08:00
1910f79b2f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 15:26:14 +08:00
81428737c9
fix compilation errors
2016-01-05 09:51:37 +08:00
168e851cce
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 10:42:06 +08:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
3a09bd400d
Merge pull request #14799 from xiaofeng11/v3.10_xf
...
[ci skip] Bug fix
2015-12-24 21:38:16 +08:00
88196a4879
Both Image/blocks9ss.plist and animations/grossini.plist have image frames grossini_dance_*.png, and in Image/blocks9ss.plist the frames is smaller than frames in animations/grossini.plist, so if load Image/blocks9ss.plist first, the samples use frames named grossini_dance_*.png in animations/grossini.plist will crash. After check in source file, we found these frames in Image/blocks9ss.plist hasn't been used, so we changed frames name in Image/blocks9ss.plist to avoid crash.
2015-12-24 20:22:01 +08:00
169d3fc4b8
Merge pull request #14797 from VisualSJ/v3.10
...
Fixed a bug about should not be used `gl` in canvs mode
2015-12-24 17:51:03 +08:00
79bf3897d7
Fixed a bug about should not be used `gl` in canvs mode
2015-12-24 16:33:46 +08:00
707f08c557
Revert "fix setflip for batch sprite"
2015-12-23 09:54:04 -08:00
0d0534a2e1
Merge pull request #14697 from super626/v3.10-fixsprite
...
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
dea1ef1290
Merge pull request #14790 from pandamicro/v3.10
...
Fixed WebSocket JSB crash issue
2015-12-24 01:37:17 +08:00
acf03c06d5
Fixed WebSocket JSB crash issue
2015-12-23 23:28:14 +08:00
830eb3433f
Merge pull request #14786 from liamcindy/v3_ui_widget
...
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
519e69813d
Merge pull request #14785 from xiaofeng11/v3.10
...
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
2015-12-23 18:43:07 +08:00
c181390881
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
2015-12-23 18:39:06 +08:00
bcc2ed0e2a
update for scrollView test
2015-12-23 18:14:09 +08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
45d1d655cc
Merge pull request #14779 from xiaofeng11/v3.10
...
Bug fix & update
2015-12-23 12:35:52 +08:00
1c60ae6ff1
Close webgl dedicated test in canvas mode
2015-12-22 19:07:46 +08:00
843694cea5
Close webgl dedicated test in canvas mode
2015-12-22 18:46:30 +08:00
82867b0073
Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
...
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
875a2d83b1
Close webgl dedicated test in canvas mode
2015-12-22 18:36:48 +08:00
064cd8d04f
Merge pull request #14722 from newnon/v3.10_webp_improvement
...
WebP loading improvements WebP loaded as premultiplied alpha if it has
2015-12-22 13:43:11 +08:00
fa172b9da9
Merge pull request #14765 from liamcindy/v3_ui_js
...
update for js uiTextAtlasTest
2015-12-21 19:17:41 +08:00
81f9d20158
update for js uiTextAtlasTest
2015-12-21 16:29:16 +08:00
8d8ac60625
Merge pull request #14761 from pandamicro/v3.10
...
Correct return type to adopt GC Rooting API
2015-12-21 11:46:59 +08:00
09c139039f
add tmx with flipped spritebatch test
2015-12-21 10:00:15 +08:00
81918f51ea
Fix event handle function issue with compartment
...
and Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
34c7331b99
Issue fixes for new memory model
2015-12-21 00:16:17 +08:00
8ddaf310ef
Update manual bindings to use the new memory model
2015-12-21 00:16:16 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
80973677ed
Improve UICheckBox issue
2015-12-20 21:13:16 +08:00
a342866083
Test for WebP with & without alpha
2015-12-20 14:22:04 +03:00
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
ac4f66fff2
fix lua focus test
2015-12-19 18:32:43 +08:00
795637c0c5
Merge pull request #14743 from liamcindy/v3_ui_LoadingBar
...
fix loadingbar direction changed error
2015-12-19 16:59:42 +08:00
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
6481a0f3c1
Merge pull request #14740 from xiaofeng11/v3.10
...
Bug Fix & h5 engine ref update
2015-12-19 14:13:37 +08:00
f6021d502d
Fix pageViewTest Horizontal scroll won't work in Lua-test
2015-12-19 13:12:32 +08:00
b480e9191d
Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support
...
Scale9Sprite cropped sprite frames support
2015-12-19 13:07:25 +08:00
593a619dc8
Merge pull request #14715 from liamcindy/v3_textureCache
...
update for 3D object render, revert old changes
2015-12-18 21:22:31 +08:00
e2f94a7a44
Merge pull request #14698 from super626/v3.10-fixshader
...
fix Shader-Sprite crash when shader can not compile
2015-12-17 23:22:09 -08:00
9025b010ba
changeв russian letter с to english c
2015-12-18 10:19:08 +03:00
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
714c01991e
Scale9Sprite test improvemets
2015-12-18 01:38:53 +03:00
98fe1d46cc
Scale9Sprite now fully support cropped sprite frames in both mode simple & slice
2015-12-18 00:32:59 +03:00
b079705dcd
Merge pull request #14702 from pandamicro/v3.10
...
Fix Downloader callback bug on iOS9
2015-12-17 01:05:10 +08:00
2881ce7c40
Merge pull request #14632 from liamcindy/UITest
...
update for ui resource test
2015-12-16 18:18:35 +08:00
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
b91882f150
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-16 14:59:33 +08:00
5e61e37d80
fix crash when shader can not compile
2015-12-16 13:54:43 +08:00
8e75cdcd42
SpriteOffsetAnchorRotation test: moved setup code from ctor to onEnter(), as ctor is called before onExit() of previous test case, which might mess up sprite frame cache
2015-12-15 14:14:09 +01:00
4dd3595b1e
added test with plist file containing anchor points
2015-12-14 16:17:41 +01:00
6318634887
Merge pull request #14641 from liamcindy/v3_ui_controlButton
...
fix controlButton test error
2015-12-14 19:47:41 +08:00
508d54ec3c
fix pageview child size
2015-12-14 15:29:02 +08:00
d33062ac35
Merge pull request #14667 from chengstory/#24347
...
Fix #24347
2015-12-14 15:03:21 +08:00
6781c96fe0
Merge pull request #14661 from zilongshanren/v3.10
...
fix scale9sprite global zorder issue.
2015-12-14 13:56:29 +08:00
cbce4d37c3
Merge pull request #14671 from ricardoquesada/more_js_fixes
...
More js fixes
2015-12-14 13:41:59 +08:00
41218a65e7
Merge pull request #14668 from pandamicro/v3
...
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
436db6e932
Fix #24347
...
JSTest(web)-->UI Test-->UIFocus-->UIFocusTestVertical displays focus first.
2015-12-14 11:20:26 +08:00
8c9b03112e
fix scale9sprite global zorder issue.
...
1. it also fix the positiong issue when call setScale9Enabled(false)
2015-12-14 10:09:06 +08:00
c5058aa2f9
more conversions
2015-12-11 17:18:20 -08:00
47911e0c24
more js fixes
...
fixes in how ref count is measured
opengl bindings converted to new API
2015-12-11 15:18:09 -08:00
8b2dfb1a4b
Mooooores fixes
...
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
d75767bfc4
Merge pull request #14639 from liamcindy/v3_ui_text
...
update for text effect clone
2015-12-11 13:54:46 +08:00
f877f26bd2
update for controlButton
2015-12-11 11:56:58 +08:00
c034303ad8
Adds MemoryModelTest
2015-12-10 18:22:10 -08:00
1a17e94e1c
update for scrollview test
2015-12-10 15:25:27 +08:00
136b2bd514
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into UITest
2015-12-10 14:53:43 +08:00
e92db43e14
update for text clone
2015-12-10 13:17:31 +08:00
c823821a08
fix controlButton test error
2015-12-10 10:36:00 +08:00
aedd48e74b
Merge pull request #14615 from xiaofeng11/v3_testBugFix
...
Remove default focus item from "Node:UI->1:GUI Dynamic Create Test->4:Focus Test"
2015-12-09 18:36:08 +08:00
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
db05c13407
update ccs-res ref
2015-12-09 14:45:41 +08:00
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
724e9b42a2
Remove default focus item from "Node:UI-->1:GUI Dynamic Create Test-->4:Focus Test"
2015-12-09 11:12:42 +08:00
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
1b6a13d4b5
Fix compile error
2015-12-04 17:22:41 +08:00
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
1171c6aaa1
Remove desktop only function, set ondraw serial function in DrawNode override able.
2015-12-04 14:55:54 +08:00
0e34a864b2
Merge pull request #14528 from xiaofeng11/v3_3dtouch
...
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
f14688464f
spawn2 in the correct place
2015-12-03 12:18:33 -08:00
3646d1e9fc
Adds init(array) for Sequence and Spawn
...
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
ea42c09243
Merge pull request #14566 from zilongshanren/fixIssue14564
...
fix scale9sprite be culled unexpectedly
2015-12-03 19:17:40 +08:00
b6fd2e9449
Permit http access to cocos2d-x.org in test projects
2015-12-03 18:00:48 +08:00
73d00b9262
fix scale9sprite be culled unexpectedly
...
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
2015-12-03 17:53:02 +08:00
e7dca08df9
Add js test case for fix, improve template
2015-12-03 16:55:15 +08:00
30874d457f
Update sub module
2015-12-03 15:04:08 +08:00
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +08:00
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
1b4d12ced7
changed to cocos2d-x.org server
2015-12-02 15:16:05 -05:00
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
bb23015f73
make sure attributes greater than 8 before use normal map
2015-12-02 12:03:31 +08:00
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
5dfc8f6a26
Remove default arguments
2015-12-02 11:02:27 +08:00
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
2e38dcb1a0
add normalmaping test
2015-12-01 18:13:50 +08:00
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +08:00
81f590e52a
Merge pull request #14478 from pandamicro/v3
...
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
096efe8744
rename print interface
2015-12-01 11:07:02 +08:00
34da2aabb2
fix compile error
2015-11-30 17:34:49 +08:00
6054dc0197
update for ui test
2015-11-30 16:17:13 +08:00
e0349ae975
update sprite 3d test
2015-11-30 14:48:19 +08:00
01e619f686
Merge pull request #14476 from cesarpachon/linuxAudioEngine
...
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
2015-11-28 14:27:15 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
0f8c3e0c1c
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
...
Add Overflow to Label
2015-11-27 17:31:40 +08:00
40f6f76030
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
2015-11-26 22:22:05 -05:00
955ddaafb7
Use rooted object for js_proxy new and get (missed)
2015-11-27 10:20:04 +08:00
d23ffe4fc7
Fix some issue of js_type_class usage
2015-11-27 10:16:11 +08:00
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
dcfdfd3a78
LUA tests: add Sprite3DNormalMappingTest
2015-11-26 11:27:33 +08:00
64f082ab7c
add bumped testing model
2015-11-26 10:14:27 +08:00
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
9241797acb
support normal mapping material
2015-11-25 10:45:03 +08:00
b36f464c09
update ccs-res submodule
2015-11-24 18:06:11 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
a6fdd9aa09
Improve js template documentation
2015-11-24 16:31:14 +08:00
8d1f1a9933
Merge pull request #14457 from zilongshanren/testEditBoxScaleSize
...
Fix edit box setPlaceholderFontName and scale font size issue
2015-11-24 11:33:52 +08:00
7676b1cb73
improve label layout logic
2015-11-23 17:47:30 +08:00
361daf7f5f
fix wrong indentation
2015-11-23 11:50:04 +08:00
12df5ae1cc
Fix wrong variable use for setPlaceholderFontName
...
1. fix editbox scale not affect native font size
2015-11-23 11:49:22 +08:00
689c0f4af3
Merge pull request #14327 from wohaaitinciu/editbox-win32
...
Fix a fatal bug in EditBox implement for platform win32
2015-11-23 11:35:40 +08:00
7ee82f20fc
fix getLetter crash issue.
...
1. make vertical clamp works in non-wrap mode.
2. make the lineHeight and letterSprite scale work correct.
2015-11-20 16:39:48 +08:00
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
ccdb2a75f9
Add Label Overflow and wrap option.
...
Squashed commit of the following:
commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 19 10:30:54 2015 +0800
add char map font test
commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 15:00:17 2015 +0800
system font overflow is not supported
commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 11:04:15 2015 +0800
add system font test
commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 17 10:29:35 2015 +0800
Finish resize height mode
commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 16 11:01:27 2015 +0800
fix wrap issue
commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date: Sat Nov 14 08:28:57 2015 +0800
horizontal shrink still has a issue
commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 11:42:34 2015 +0800
finish shrink without wrap
commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 10:09:46 2015 +0800
update shrink
commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 12 17:55:15 2015 +0800
refactor shrink logic
commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 18:25:34 2015 +0800
add resize overflow type
commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 11:49:51 2015 +0800
no wrap, shrink is working.
commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 10 16:16:27 2015 +0800
add overflow type to label.
1. optimize the testcase
commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:22:34 2015 +0800
finish bmfont wrap by char
commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:04:51 2015 +0800
finish bmfont wrap by word
commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 11:29:21 2015 +0800
add BMFont size support
commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 09:58:01 2015 +0800
add font size support for BMFONT
commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 16:36:27 2015 +0800
add toggle wrap option.
1. make hirozontal clamp working
commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 15:12:59 2015 +0800
tweak label layout
commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 5 11:11:02 2015 +0800
finish the test skeleton
commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 16:38:54 2015 +0800
add setFontSize api to label.
1. add new chinese-english bmfont
2. beautify base test
commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 11:27:18 2015 +0800
add label layout test skeleton
2015-11-19 16:06:13 +08:00
efeae1eae9
add a test case for pr 14327
2015-11-18 22:52:47 +08:00
5d8cfa889c
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
...
Change PageView to derive from ListView
2015-11-17 12:02:10 +08:00
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
603d788fbf
PageView - Fix that page indicator was not working well in vertical page view.
2015-11-15 22:49:42 +09:00
d86d32fb09
constexpr for signature, garbage collection and compile-time error for unsupported argument types
2015-11-10 23:39:16 +03:00
9cbbd283c7
PageView - Deprecate the APIs related to custom scroll threshold.
2015-11-10 21:35:01 +09:00
89798d949b
[js-tests] Test case for Scale9Sprite fade actions with cascade opacity enabled
...
Test case for https://github.com/cocos2d/cocos2d-html5/pull/3181
2015-11-10 15:13:05 +03:00
23118cb587
fix missing include
2015-11-08 01:26:15 +03:00
ef89025d4b
fix missing include
2015-11-08 00:25:02 +03:00
80e8b58b53
easy jni
2015-11-07 23:57:05 +03:00
668558b99f
Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system
2015-11-06 11:38:41 +08:00
a74c8ccded
Merge pull request #14292 from xiaofeng11/v3
...
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
2015-11-03 17:46:34 +08:00
6010879ecf
Merge pull request #14305 from pandamicro/v3
...
[ci skip] Fix SocketIO test on iOS 9
2015-11-03 17:27:21 +08:00
6a454d3eba
Fix SocketIO test on iOS 9
2015-11-03 17:26:37 +08:00
39f68e9885
Update ccs-res submodule to the latest.
2015-11-03 13:08:56 +08:00
8e6e46d596
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
2015-11-02 14:50:45 +08:00
0c8aed8a1a
Remove redundancy code
2015-11-02 13:40:08 +08:00
0d6bf3263b
Improve js templates with noCache and cc.view.setRealPixelResolution docs
2015-11-01 18:33:05 +08:00
3e2094981f
add scale9sprite rendering type test
2015-10-30 14:01:01 +08:00
f84c2de1e2
add sprite and scale9sprite batch test
2015-10-30 09:58:02 +08:00
1417534194
add rendering type to scale9sprite
2015-10-29 23:13:36 +08:00
b66fa04c21
Merge pull request #14255 from xiaofeng11/v3_23634
...
Fix "UItest->UicheckBox" display status, make it same as C++ version
2015-10-28 18:32:49 +08:00
53d2874507
Fix "UItest->UicheckBox" display status, make it same as C++ version
2015-10-28 17:38:17 +08:00
543fff63fb
PageView - Add indicators to some test cases
2015-10-28 17:23:08 +09:00
abc309edb2
PageView - Replace the deprecated APIs with new ones.
2015-10-28 16:57:54 +09:00
b9a4449494
PageView - Add `handleReleaseLogic()` for page view.
2015-10-28 16:56:35 +09:00
97acf52cc8
PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.
2015-10-28 16:56:34 +09:00
e567259826
PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.
2015-10-28 16:56:34 +09:00
a09f2af14c
PageView - Trivial change on test code
2015-10-28 16:56:34 +09:00
15e400fb2e
Merge pull request #14248 from xiaofeng11/v3_23634
...
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
2015-10-28 15:49:52 +08:00
80b2def648
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
2015-10-28 14:12:24 +08:00
5a963c66cd
Merge pull request #14240 from neokim/android_test_app_landscape_reversible
...
Change the android test app to be landscape reversible.
2015-10-28 13:03:33 +08:00
c55f030218
Fix "Test change animation intenal" under js test can not change back to 60fps
2015-10-28 11:18:12 +08:00
11b46a7b04
Change the android test app to be landscape reversible.
2015-10-27 20:43:56 +09:00
aa9f0d5bd5
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
...
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
2015-10-27 17:28:22 +08:00
175f4c02ad
Merge pull request #14197 from xiaofeng11/v3_xf
...
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
2015-10-22 14:45:20 +08:00
43c19fd1e7
Merge pull request #14205 from pandamicro/v3
...
Fix Scheduler API inconsistency
2015-10-21 22:11:16 +08:00
9eeda122e9
Fix Scheduler API inconsistency
2015-10-21 22:10:48 +08:00
3f359381dc
moved file to correct folder in vcxproj
2015-10-20 10:07:30 -07:00
f9d8907697
updated winrt temporary app certificates expiration dates
2015-10-20 07:39:42 -07:00
3d626940af
Roll back debug commented code
2015-10-20 17:23:31 +08:00
7e54a91ee6
Fix CCDownloader-curl will crash in js-test
...
Fix broken image link in TextureCacheTest.js
2015-10-20 16:28:03 +08:00
3bf0d0fe44
Merge pull request #14168 from MSOpenTech/v3-win10-fix
...
V3: fixed msbuild by removing incorrect AppxBundle properties from project
2015-10-19 08:22:24 +08:00
cde67d1261
Merge pull request #14162 from mogemimi/fix-warnings
...
Fix warnings on Xcode 7
2015-10-18 22:56:12 +08:00
c365fc5883
Merge pull request #14180 from pandamicro/v3
...
Fix issue for web engine upgrade
2015-10-18 22:48:16 +08:00
11890d6c4b
Fix issue for web engine upgrade
2015-10-18 00:19:02 +08:00
e2730a3d92
fixed msbuild by removing incorrect AppxBundle properties from project
2015-10-16 09:25:24 -07:00
73c0ce1a9a
Replace String::createWithFormat() with StringUtils::format()
2015-10-16 15:02:14 +09:00
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
efeb6a44fb
Merge pull request #14143 from MSOpenTech/v3-win10-curl
...
V3 win10 curl
2015-10-16 13:35:48 +08:00
e789ab97be
Merge pull request #14139 from super626/v3
...
fix obb performance test
2015-10-15 16:00:51 +08:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
1c085c96f1
Merge pull request #14136 from songchengjiang/cocos2d-v3-bugfix
...
fix lua Scene3DTest "back" button not working issue
2015-10-14 14:01:58 +08:00
85f40de424
fix obb performance test
2015-10-14 13:43:02 +08:00
29c5ca6ea9
fix the #23309 bug
2015-10-14 11:23:11 +08:00
767a4afb9f
Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1
2015-10-14 09:16:34 +08:00
f2e3a0c071
Merge pull request #14104 from xiaofeng11/v3_bugfix
...
Bug fix
2015-10-12 10:14:26 +08:00
aee3244ad3
Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2
2015-10-10 17:50:48 +08:00
cff1a8ed50
Merge pull request #14103 from xiaofeng11/v3_bugfix
...
Bug fix
2015-10-10 17:20:07 +08:00
4df211fa0b
Fix particle test under lua test project display different in different platform
...
Fix cocostudio 3d test under lua test project crash bug
2015-10-10 14:51:14 +08:00
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
8b0a6a6c29
Merge pull request #14099 from pandamicro/v3
...
[ci skip]Sync with CCBoot for web
2015-10-10 10:16:16 +08:00
5ae2812bf8
Sync with CCBoot for web
2015-10-10 10:15:36 +08:00
bc9b59b7f7
Merge pull request #14096 from pandamicro/v3
...
[ci skip]Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:07:27 +08:00
0ea54868e2
Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:01:49 +08:00
87677cdbd1
Merge pull request #14088 from chengstory/Fix#23321
...
Fix Bug #23321
2015-10-09 15:27:56 +08:00
68f25f65c4
update submodule
2015-10-08 14:59:48 +08:00
77062acfa7
Fix Bug #23321
2015-10-08 14:48:38 +08:00
d6bb62beee
Merge pull request #14083 from chengstory/Fix#23337
...
Fix Bug #23337
2015-10-08 11:54:07 +08:00
4bf56e5853
Fix #23337
...
Hide menu "cocostudio 2.1", because cocostudio 1.6 Api can't load json exported from cocostudio 2.x.
2015-10-08 11:35:43 +08:00
2dbe0c1a90
Merge pull request #14016 from xiaofeng11/v3
...
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
2015-10-08 11:12:36 +08: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
79656ffe13
fixed typo, indentation
2015-09-29 16:50:14 +02:00
b14b251628
added Sprite performance test: load sprite from sprite sheet, with rectangular frame as well as with polygon outline
2015-09-29 15:45:48 +02:00
80ca579a01
added Sprite test case which loads PolygonInfo of sprite from plist file
2015-09-29 15:44:13 +02:00
8368762b37
update for light3D
2015-09-29 18:33:28 +08:00
f715a93521
Solve the crash of performance-tests on windows.
2015-09-29 15:32:51 +08:00
84347bb056
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-09-29 09:35:35 +08:00
0bdb1b099d
Fix particle test under performance test project memory overflow
2015-09-28 14:06:02 +08:00
0af7f29cfd
Merge pull request #14024 from TheCodez/fix_refptr_testcase
...
Fix : RefPtr test wasn't executed even in debug build
2015-09-27 23:16:27 +08:00
17c78ad3b1
Merge pull request #14018 from natural-law/v3
...
Solve the crash of performance-tests on windows.
2015-09-27 23:11:19 +08:00
744b7f54c9
Fix wrong debug check
2015-09-26 16:58:26 +02:00
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
a1bbd43f9f
Add component test to lua-tests and remove it from lua empty test
2015-09-26 19:43:36 +08:00
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
3d1318fdf1
enemy can run
2015-09-26 19:43:35 +08:00
7326369ed2
pass dt to lua update
2015-09-26 19:43:35 +08:00
63af026769
can use any lua type to extend component
2015-09-26 19:43:35 +08:00
3f066d156a
lua script can access c++'s functions
2015-09-26 19:43:35 +08:00
85c297f53b
temple save
2015-09-26 19:43:35 +08:00
10427fb7ae
add lua component
2015-09-26 19:43:35 +08:00
6697cad212
Solve the crash of performance-tests on windows.
2015-09-25 18:23:13 +08:00
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
03e5573f79
button Opacity setting
2015-09-24 11:13:41 +08:00
149775ea10
Merge pull request #13962 from ZhangMenghe/v3-scrollView
...
[ci skip] Testcase for multiple items in scrollView
2015-09-24 09:35:05 +08:00
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
49f6a863ea
Merge pull request #13966 from zilongshanren/fix-xcode7-override-issue
...
CCScrollView should override removeChild
2015-09-22 01:53:37 +08:00
68713d2074
Multiple items testcase
2015-09-21 18:22:58 +08:00
cddd7dfdf6
Merge pull request #13965 from ZhangMenghe/v3-drawLabels
...
[ci skip] DrawLabel Mode testcase
2015-09-21 15:08:47 +08:00
1c40f7b61b
CCScrollView should override removeChild
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
2015-09-21 11:35:11 +08:00
26358c9c2c
DrawLabel Mode testcase
2015-09-21 11:05:21 +08:00
6ab7f3804e
Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile
...
Add jsb.fileUtils.writeDataToFile()
2015-09-21 10:48:25 +08:00
4054686903
Testcase for multiple items in scrollView
2015-09-21 10:24:44 +08:00
fa9afd6c2b
Merge pull request #13953 from himynameschris/fix-socketio
...
Fix socketio to work with servers v1.0+
2015-09-20 23:15:27 +08:00
bb8d9a4145
add testcase for writeDataToFile to jstests
2015-09-20 16:46:54 +08:00
f93cfac0f7
rename setAnimationEndCallFunc
2015-09-20 16:24:41 +08:00
0cfc33e4d3
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
2015-09-20 12:34:34 +08:00
e7c2436d85
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:31:48 -04:00
6bf54a3eda
Merge pull request #13770 from geron-cn/v3
...
add Frame End Call Back and Animation Clip End Call Back
2015-09-19 00:24:21 +08:00
6b8d400517
Merge pull request #13804 from ZhangMenghe/v3-UItestcase
...
[ci skip] UItestcase modification to be friendly
2015-09-19 00:22:41 +08:00
3fc1349561
Merge pull request #13945 from WenhaiLin/v3-physics-testcase-fix
...
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:05:26 +08:00
db102f2030
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:03:21 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
cc8e944050
Merge pull request #12220 from hanxi/v3
...
add UIEditBox support linux platform
2015-09-18 21:53:09 +08:00
add24ccf95
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
...
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 21:43:42 +08:00
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
36d4f5564d
merge cocos
2015-09-18 14:08:33 +08:00
8d0d053249
Merge pull request #13909 from ZhangMenghe/v3-s9sprite
...
[ci skip] testcase for s9sprite action
2015-09-18 13:03:13 +08:00
3f5df0ccc3
Merge pull request #13647 from super626/motionstreak3d
...
Motionstreak3d
2015-09-18 11:59:33 +08:00
eb480fb021
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 11:31:37 +08:00
6e4d39e909
s9sprite action testcase
2015-09-18 09:45:43 +08:00
6f1b04fd89
merge cocos
2015-09-18 09:37:26 +08:00
ded9a9e6d4
Merge pull request #13893 from yangws/downloader
...
Remove AssetsManager dependence with CRUL.
2015-09-17 22:18:56 +08:00
5eafc93d86
Remove AssetsManager dependence with CRUL.
2015-09-17 16:52:31 +08:00
1eeafed072
Merge pull request #13884 from yangws/v3
...
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 16:32:56 +08:00
5b99ada936
Merge pull request #13842 from yangws/issue_13818
...
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong
2015-09-17 16:23:25 +08:00
572ee3adb2
merge cocos
2015-09-17 14:24:01 +08:00
4b83240bed
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 11:20:36 +08:00
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
0479cca364
Merge pull request #13832 from yangws/downloader
...
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
c85dc71846
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong.
2015-09-16 11:07:37 +08:00
ea538cd9da
merge cocos
2015-09-16 10:37:24 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
f2bee23696
Merge pull request #13789 from neokim/fix-13668
...
Fix for #13668
2015-09-15 18:28:24 +08:00
73d2c5d1b8
Merge pull request #13577 from fusijie/fix_13454
...
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
556175df1e
add iOS EditBox multiline support
...
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.
Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
2fea4db9fc
fix ui::Button title location issue
2015-09-15 13:37:32 +08:00
ebf308d88c
Test case Downloader Test restructured.
2015-09-14 15:33:34 +08:00
5f8351ea32
UItestcase modification to be friendly
2015-09-14 15:31:25 +08:00
9fbefb8eed
Merge pull request #13786 from dumganhar/lua-xmlhttprequest-fix
...
[Lua] Life control fix for XMLHttpRequest
2015-09-14 12:12:41 +08:00
d3a76bc872
Merge pull request #13792 from natural-law/v3
...
Add tools for converting the performance tests data to excel files.
2015-09-14 10:55:27 +08:00
5d47ce8f23
Add tools for converting the performance tests data to excel files.
2015-09-14 09:52:21 +08:00
3fff195c20
Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary.
2015-09-13 22:32:22 +09:00
10e45ee744
Updates XMLHttpRequestTest.lua
2015-09-12 19:11:32 +08:00
96d6221daf
Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview
...
Add scrolling to item and magnetic scroll into ListView
2015-09-11 17:48:40 +08:00
edb964a673
Remove the performance related config in project.json.
2015-09-11 16:03:07 +08:00
22b2f8b7b3
ListView - Change the order of test cases and fix for windows builds.
2015-09-11 16:00:53 +09:00
8e9928ad99
Remove performance tests from lua-tests & js-tests.
2015-09-11 10:53:17 +08:00
966e568051
add ActionTimeline Frame End Call Back and Animation Clip End Call Back
2015-09-10 18:29:09 +08:00
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
6f06ea19ac
Merge branch 'v3' into performance-test
2015-09-10 16:06:36 +08:00
e3161eb127
Remove performance tests from cpp-tests project.
2015-09-10 16:01:56 +08:00
j-jorge