Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,221 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

4672 Commits

Author SHA1 Message Date
patriciog 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
minggo 3810854c45 use std::isnan instead of isnan to fix compiling errors 2016-05-30 18:19:10 +08:00
mogemimi 69974ab06f Fix warnings caused by comparison between RefPtr and C++11's nullptr 2016-05-28 22:15:56 +09:00
Ricardo Quesada 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
Ricardo Quesada 0be6645004 fix: 15594 compiles on android 
github issue #15594
 2016-05-26 19:25:39 -03:00
Ricardo Quesada 8bd4ddf081 fix: compile on linux, android and windows 2016-05-26 16:02:24 -03:00
minggo 1116176362 Merge pull request #15720 from billyquith/v3 
Grammar corrections
 2016-05-26 11:00:53 +08:00
BQ 93ed59bfb3 English grammar corrections. 2016-05-25 15:25:38 +01:00
BQ 6097c3abd1 English grammar corrections. 
Make brackets consistent.
 2016-05-25 15:18:57 +01:00
Ricardo Quesada b830b7de4c fix: add code/resources to reproduce issue_15594 
github issue #15594
 2016-05-25 09:00:32 -03:00
Ricardo Quesada 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
Mikhail Shulepov 8d1aad0f96 Fix test cases with PVRTC textures loading on devices that don't support this formats 2016-05-23 18:10:00 +03:00
Vladimir Perminov 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
minggo 9c0acf1e5d Merge pull request #15619 from VisualSJ/v3_audio 
audio search path (android)
 2016-05-19 18:06:58 +08:00
zilongshanren b154f274a5 Merge pull request #15410 from 1scaR1/up_v3 
Make PageView indicator more tunable
 2016-05-19 16:19:18 +08:00
zilongshanren c4e6db4e9b fix tizen related issues 2016-05-18 16:26:13 +08:00
minggo 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
minggo 8c9138601c make AssetsManagerExTest can connect to the url 2016-05-17 16:41:07 +08:00
minggo 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
Wilson E. Alvarez f0343bf219 Fixed APP_NAME for cpp, cpp-empty, js, and lua tests. 2016-05-13 22:13:05 -04:00
Dale Stammen cad762a4f9 added updated .filters file 2016-05-13 07:33:51 -07:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
ViusualSJ ada1d1dfe8 audio search path (android) 2016-05-11 17:24:14 +08:00
Dale Stammen cf305a56b1 removed missing files from project 2016-05-10 21:41:39 -07:00
minggo 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
minggo 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
pandamicro 05dd3bb608 Fix web engine issues in test cases 2016-05-10 20:34:35 +08:00
minggo b2a592ce36 fix crash when back to parent test case 2016-05-10 17:55:36 +08:00
minggo d7fea4b08b reduce loop times to be quicker on low performace devices 2016-05-10 16:19:58 +08:00
minggo d086965683 Merge pull request #15598 from minggo/android-package-name 
[ci skip]set correct package name
 2016-05-09 18:17:28 +08:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
minggo 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
halx99 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
minggo c4b2f6ff35 Merge pull request #15584 from VisualSJ/v3.11_bugs 
loader test bug
 2016-05-07 22:07:49 +08:00
pandamicro 1980311204 Fix OpenGL test issue on web 2016-05-07 17:31:58 +08:00
pandamicro d0fc3ec4c4 Add cc.game.end to close game window 2016-05-07 14:37:36 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
ViusualSJ cb8cde63b1 loader test bug 2016-05-06 17:19:33 +08:00
minggo 44958d7361 not add invalid search paths 2016-05-06 15:54:08 +08:00
minggo 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
minggo 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
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
pandamicro 1886ac1349 Fix http arraybuffer test can not load issue 2016-05-04 15:48:16 +08:00
minggo 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
pandamicro 27b9510f2c Upgrade web engine to v3.11 beta and fix issues with js-tests 2016-04-28 16:12:29 +08:00
zilongshanren 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
Xpol Wan 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
xpol 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
minggo 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
minggo 86df9b535a Merge pull request #15493 from njh0602/somefix 
Renamed ignoreAnchorPointForPosition()
 2016-04-26 11:41:09 +08:00
minggo 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
NamJunHyone 6746aeb992 ignoreAnchorPointForPosition() -> set ~ from missing files 2016-04-25 20:43:42 +09:00
James Chen 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
Josh Bodily 614c3c47d7 Josh/winrt inplace editbox (#15473) 
* WinRT in-place edit box

* Fix static analysis errors
 2016-04-25 11:17:09 +08:00
Steve Tranby 510e7b831e csv support working test 2016-04-23 17:31:10 -06:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
Ricardo Quesada b8eae430fb Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor 
extend the RichText
 2016-04-20 20:05:29 -07:00
Yukio Murakami a8ddbdc12c defaults and append tag support 2016-04-21 10:03:57 +09:00
AlwynC 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
mogemimi 85646b8d80 Fix warning C4305 while compiling AppDelegate with MSVC 2016-04-20 04:01:06 +09:00
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Dale Stammen 4d7bf1f827 updated expiration dates of all winrt test app and template certificates 2016-04-19 09:07:30 -07:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
zilongshanren 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
xpol 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
mogemimi 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
Ricardo Quesada 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
Ricardo Quesada 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
Ricardo Quesada 88ff4da348 buoyancy fix. 
first commit
 2016-04-05 17:52:19 -07:00
pandamicro 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
pandamicro d93fbea0f6 Fix Socket IO connection issue on iOS 2016-03-31 21:21:20 +08:00
minggo 08383628cc Merge pull request #15356 from minggo/crash 
[ci skip]fix crash issue
 2016-03-31 15:37:27 +08:00
minggo 8694a15a72 fix crash issue 2016-03-31 15:36:00 +08:00
minggo fb3032b6fe Merge pull request #15349 from minggo/menu_test 
[ci skip]Menu test
 2016-03-30 14:44:24 +08:00
minggo b4ee6e8971 don't set wrong string for atlas label 2016-03-30 14:32:11 +08:00
minggo c1a79700ae don't set wrong string for atlas label 2016-03-30 14:28:33 +08:00
Ricardo Quesada 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
minggo 1de5141473 update label string every 0.1s 2016-03-29 15:25:18 +08:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
minggo 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
zilongshanren 8f30d01156 Merge pull request #15286 from xpol/remove-uncessary-search-paths 
Removed unnecessary search paths.
 2016-03-22 19:51:59 +08:00
Xpol Wan a225130010 Fixes windows universal build. 2016-03-22 18:51:58 +08:00
minggo 4b47750e1f Merge pull request #15171 from xiaofeng11/v3_jsFix 
[ci skip] js-test bug fix
 2016-03-22 16:24:31 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
zilongshanren 7993ad93d2 fix jsb API inconsistency. 
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
 2016-03-18 16:18:40 +08:00
zilongshanren 589d7e47bf fix polygon api typo 2016-03-17 17:16:56 +08:00
zilongshanren a1b4cd845f Revert "Fix incorrect function name of getTrianglesCount" 2016-03-17 16:38:17 +08:00
zilongshanren 11ed05a0be Merge pull request #15245 from mogemimi/fix-function-name 
Fix incorrect function name of getTrianglesCount
 2016-03-17 16:08:40 +08:00
mogemimi 23a05ddab2 Fix incorrect function name of getTrianglesCount 2016-03-15 07:39:42 +09:00