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

1338 Commits

Author SHA1 Message Date
Ricardo Quesada 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
Ricardo Quesada c5a4e87d4a fix issue #16921 (#16932) 
call setupScale9() always
 2016-11-29 22:58:53 -08:00
James Chen 066adfe204 Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked. (#16916) 
* Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked.
Test case is: 1. Node: Scene3D -> Description -> Scale9Sprite display is wrong.

* Some fixes:

* Call Sprite::initWithFile(filename) in Scale9Sprite::initWithFile(filename) rather than Scale9Sprite::initWIthFile(filename, Rect::ZERO). Otherwise content size will be zero which is incorrect.
* setCapInsets in updateCapInset only when it’s in slice mode.
* setCapInsets should reset _insetLeft, _insetTop, _insetRight, _insetBottom member variables.
* Remove _previousCenterRectNormalized, just updateCapInset while switching to SLICE mode.

* Fixes JSTest -> ExtensionTest -> EditBoxTest: no background of editbox.

* Avoids an unused `setCapInsets` invocation in setupSlice9.
 2016-11-30 09:26:40 +08:00
Ricardo Quesada fce13ba607 fix: Scale9Sprite test case 18 (#16897) (#16902) 
* fix: Scale9Sprite test case 18

Bug calculating rotated frames.
the width was being used instead of the height and vice-versa

* fixes test cases 8 and 9
 2016-11-25 09:27:20 +08:00
Ricardo Quesada 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
pyrosphere 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
子龙山人 ee8305ed52 fix editbox can't input on macos 10.12 (#16842) 
* fix editbox can't input on macos 10.12

fix editbox can't input characters on mac os 10.12

* update external to 114
 2016-11-16 09:38:42 +08:00
Josh Bodily c3c6681b9e Add Horizontal Text Alignment to UIEditBox (#16772) 
* Add Horizontal Text Alignment to UIEditBox

* Fix compile error

* Fix win32 compile
 2016-11-09 10:38:00 +08:00
David DeSimone fb9c1f2de0 Fixed EditBox placeholder font not being set correctly for multiline text fields on iOS. (#16821) 2016-11-09 10:27:34 +08:00
Josh Bodily e20c1e0a9a Misc. UIEditBoxImpl-winrt fixes (#16773) 
* SENSITIVE doesn't imply password, fixes crash on static cast in
* onTextChanged
* Fix type fontName instead of pFontName
* Set attributes that affect text content before setting initial text
 2016-11-04 09:38:48 +08:00
Josh Bodily 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
Josh Bodily 40b5c9f4b7 Mac edit box bug fixes (#16656) 
* Don't allow multiline to overflow bounds of box
* Fix bug w/ performSelector
 2016-10-31 15:16:18 +08:00
Wilson E. Alvarez c0e1e91373 Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. (#16716) 
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.

Other minor trivial changes were applied.

* Fixed Android compilation error

* Fixed windows-universal compilation error
 2016-10-27 15:10:24 +08:00
mogemimi ccc141fc99 Remove unnecessary const return qualifiers (#16671) 2016-10-11 09:33:05 +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
halx99 2ee439e3f5 Fix issue: 16603 (#16604) 
see: https://github.com/cocos2d/cocos2d-x/issues/16603
 2016-09-27 13:59:24 +08:00
mogemimi 8b703a8d12 Fix implicit conversion warning (#16598) 
* Fix implicit conversion warning

* Change SAXParser::textHandler parameter type from int to size_t
 2016-09-26 14:49:47 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
Sachin Garg 84f6863214 getSlidBallRenderer methods to allow more customization of UISlider (#16532) 
* getSlidBallRenderer methods to allow more customization of UISlider look and feel.

* Added const to declaration of getSlidBallRenderer methods for UISlider.
 2016-09-09 10:01:14 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522) 
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
 2016-09-06 10:14:14 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13 
Update rapid json to version 1.1.0.
 2016-08-29 15:22:01 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00
Alfonso Grillo 6c9a05f831 PageView with custom 'scrollToPage' time (#16390) 
* PageView with custom scrollToPage time

* fix compiler error
 2016-08-25 15:48:01 +08:00
halx99 5bc3659a33 #Improve XML parse performance with rapidxml pure SAX parser (#16419) 
* Update CCSAXParser.cpp

* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.

* put rapidxml to external

* Update deps
 2016-08-24 16:37:03 -07:00
子龙山人 0d836b2cea Fix pageview click turning event (#16318) 
* fix pageView click turning event

* fix current PageIndx issue
 2016-08-05 14:04:57 +08:00
子龙山人 08515f46e3 fix pageView click turning event (#16310) 2016-08-05 09:43:15 +08:00
James Chen 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
Jeff Wang f8b2d8fe0f fixed base URL for webview on android doesn't work (#16279) 
fixed base URL for webview on android doesn't work
 2016-08-02 16:49:24 +08:00
minggo 57e4963502 Merge pull request #15963 from Drakon-Cocos/PageViewIndicator 
Fix PageViewIndicator opacity for 'inactive' pages
 2016-07-28 14:44:35 +08:00
mogemimi 093ef3a14f Fix typos in variable names 2016-07-26 04:06:01 +09:00
halx99 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
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
minggo 391d97d1dd improve log info 2016-07-22 11:56:41 +08:00
mogemimi d931c62649 Fix typos in documentation comments 2016-07-16 04:18:40 +09:00
mogemimi 98cc48bc62 Add missing override keyword 2016-07-13 15:03:53 +09:00
mogemimi b9c78ac41c Use std::abs to avoid overhead of casting float to double 2016-07-13 00:55:11 +09:00
mogemimi 7531c5156b Fix documentation when compile with -Wdocumentation and Clang 2016-07-10 17:38:32 +09:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
mogemimi 2650fd1afd Add missing float suffix to avoid -Wdouble-promotion 2016-07-04 23:12:45 +09:00
minggo 8bbeb01be4 Merge pull request #16025 from mogemimi/fix-doc-typo 
Fix typos and other mistakes in docs
 2016-07-04 09:33:29 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi 57900112c5 Fix format string warning when compiling with Android NDK 2016-07-03 17:19:17 +09:00
mogemimi 2354df9faf Fix getSubStringOfUTF8String bug 2016-07-01 15:16:35 +09:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
Drakon-Cocos 7302ad979a Can set scroll to item duration in ListView and derived classes (#15964) 
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)

* Parameter no more 'const'. Comments
 2016-06-29 09:48:03 +08:00