Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/ui
History
Ricardo Quesada 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 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 09:37:24 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Feb 27 01:11:13 2016 -0800

    correct paths for win8.1

commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 22:46:58 2016 -0800

    projects works on win32

commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:57:10 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:26:55 2016 -0800

    trying to make it compile on win32

commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 10:28:12 2016 -0800

    quick hack to make it compile...

    ...autogenerated files will fix it.

commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 09:20:59 2016 -0800

    Squashed commit of the following:

    commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 20:10:13 2016 -0800

        compiles.. sort of

    commit a7990e2888d5ef1e43b811148b23c0b899105ab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:55:24 2016 -0800

        more chipmunk fixes

    commit 1174f6ec8201324161d7946af0f493b136a56690
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:36:15 2016 -0800

        more chipmunk fixes

    commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
    Merge: f942c5a 0594d3c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:29:27 2016 -0800

        Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed

    commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:28:51 2016 -0800

        correct path for chipmunk

    commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 18:44:05 2016 -0800

        compiles on ios

    commit 379503399c384ad77d25d68a2f83b71a829b1c04
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:51:36 2016 -0800

        chipmunk include fixes

    commit 95839fb7b406a32255853294b016d8c15aec1ed6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:09:04 2016 -0800

        fixes for cmake + mac

    commit 39449ea3b7efccae2946785c1c11433d964ee480
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:51:25 2016 -0800

        correct includes

    commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:35:40 2016 -0800

        fixes chipmunk with cmake

    commit 337f21f9466703722847635301d841ace9b757cb
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:42:01 2016 -0800

        updates android and linux projects

    commit 7111a9993b97f78cf73206804b25665c21a59ca8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:18:26 2016 -0800

        cosmetic changes

    commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:53:41 2016 -0800

        chipmunk autogenerated files

    commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:47:41 2016 -0800

        compatibility both in JS (to reduce space)

        and in C for (C++ users)

    commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:10:02 2016 -0800

        mooooore fixes

    commit 9ab23014093677e8eda69b105f50410b8c792aa3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:30:58 2016 -0800

        doesn't crash with collision handler

    commit 69275a16817a038244bbaaff9e82a011b6729cb2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:16:29 2016 -0800

        adds missing space functions

    commit a6b97bbc76cb9ab293356bb7451cfa858353f589
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 22:22:27 2016 -0800

        queries... better

    commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 19:48:41 2016 -0800

        adds more missing functions

        fixes other chipmunk JS issues

    commit 3797a033896d059da58a05ce0de832ed9c150eff
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 18:30:21 2016 -0800

        yep... poly works ok

    commit d1bb57776891605b9d3e4fb90736c6869d96b944
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:29 2016 -0800

        neede compat files

    commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:04 2016 -0800

        query working!

    commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:57:03 2016 -0800

        almost there

    commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:18:46 2016 -0800

        fixes return values

    commit 7218778da846e1e36a510c0a19a5ee76f91db032
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 20:36:14 2016 -0800

        cpMomentForSegment is manual since parameter 4 is optional

        in chipmunk 6, but not in 7

    commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 17:29:28 2016 -0800

        yeah... process the arguments correctly

        works both for functions and auto_classes

    commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 16:49:00 2016 -0800

        compiles and links

        fixes some issues with the queries.
        returns shapes instad of the queryInfo

    commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 15:03:18 2016 -0800

        adds removeCollisionHandler and other fixes

    commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 18 20:59:24 2016 -0800

        compiles... doesn't work yet

    commit bd64de81713fb2d7652a538d667d73f05f5d9320
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 17 18:17:39 2016 -0800

        WIP: chipmunk bindings
 		2016-02-29 13:53:00 -08:00
..
UIEditBox Squashed commit of the following: 2016-02-29 13:53:00 -08:00
proj.win32 Remove obsolete Win32 references. 2016-01-25 12:23:53 -07:00
Android.mk PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
CMakeLists.txt Squashed commit of the following: 2016-02-29 13:53:00 -08:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h Editing code as comment. 2015-12-04 10:43:39 +08:00
GUIDefine.h ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
GUIExport.h Combine Studio change for UI components 2015-11-18 13:38:29 +08:00
UIAbstractCheckButton.cpp Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UIAbstractCheckButton.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UIButton.cpp fix #12249 2015-12-14 11:53:09 +08:00
UIButton.h change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
UICheckBox.cpp Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
UICheckBox.h Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
UIDeprecated.cpp add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
UIDeprecated.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIHBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIHBox.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UIHelper.cpp Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display. 2015-10-14 13:58:58 +08:00
UIHelper.h Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
UIImageView.cpp fix #12249 2015-12-14 11:53:09 +08:00
UIImageView.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UILayout.cpp Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 2016-01-09 18:01:56 +08:00
UILayout.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UILayoutComponent.cpp Merge pull request #14419 from xiaofeng11/v3_combine_ui 2015-11-25 17:19:54 +08:00
UILayoutComponent.h Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
UILayoutManager.cpp Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
UILayoutManager.h Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
UILayoutParameter.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UILayoutParameter.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
UIListView.cpp PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
UIListView.h fix some minor typos in the comments 2015-12-21 14:26:50 +08:00
UILoadingBar.cpp refine code with DRY. 2015-12-23 14:43:25 +08:00
UILoadingBar.h refine code with DRY. 2015-12-23 14:43:25 +08:00
UIPageView.cpp tweak PageView page turning event time. 2016-02-04 15:57:32 +08:00
UIPageView.h tweak PageView page turning event time. 2016-02-04 15:57:32 +08:00
UIPageViewIndicator.cpp PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
UIPageViewIndicator.h PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
UIRadioButton.cpp Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
UIRadioButton.h Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
UIRelativeBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIRelativeBox.h Update comment for Lua 2015-03-30 15:47:47 +08:00
UIRichText.cpp default is word-wrap 2016-01-22 06:20:01 -08:00
UIRichText.h RichText with word wrapping working as expected 2016-01-21 21:44:45 -08:00
UIScale9Sprite.cpp Scale9Sprite: allow to set custom GLProgram 2016-02-11 16:18:41 +03:00
UIScale9Sprite.h Scale9Sprite: allow to set custom GLProgram 2016-02-11 16:18:41 +03:00
UIScrollView.cpp Add missing reference-return types 2016-02-18 05:10:42 +09:00
UIScrollView.h Add missing reference-return types 2016-02-18 05:10:42 +09:00
UIScrollViewBar.cpp Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places. 2015-10-28 16:56:35 +09:00
UIScrollViewBar.h Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
UISlider.cpp rollback uislider 2015-12-22 20:03:56 +08:00
UISlider.h Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 2016-01-09 18:01:56 +08:00
UIText.cpp update for text clone 2015-12-10 13:17:31 +08:00
UIText.h Fix some typos in docs 2016-01-11 19:23:05 +09:00
UITextAtlas.cpp Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UITextAtlas.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UITextBMFont.cpp remove error logic 2015-12-24 14:39:15 +08:00
UITextBMFont.h remove error logic 2015-12-24 14:39:15 +08:00
UITextField.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
UITextField.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
UIVBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIVBox.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UIVideoPlayer-android.cpp updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
UIVideoPlayer-ios.mm adds tvOS support 2015-12-28 15:59:36 -08:00
UIVideoPlayer.h adds tvOS support 2015-12-28 15:59:36 -08:00
UIWebView-inl.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIWebView.cpp remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
UIWebView.h adds tvOS support 2015-12-28 15:59:36 -08:00
UIWebView.mm adds tvOS support 2015-12-28 15:59:36 -08:00
UIWebViewImpl-android.cpp updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
UIWebViewImpl-android.h crystax-ndk-10.3.0 needs <stdint.h> to be included here. 2015-12-17 12:08:14 +08:00
UIWebViewImpl-ios.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIWebViewImpl-ios.mm adds tvOS support 2015-12-28 15:59:36 -08:00
UIWidget.cpp fix uiWidget clipping error with Node 2015-12-23 16:05:52 +08:00
UIWidget.h Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00