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

26 Commits

Author SHA1 Message Date
CocosRobot 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
minggo 9d3d869c9d make webview can clean cached data (#17130) 
* make webview can clean cached data

* add implementatoin
 2017-01-10 11:30:11 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
alecmilne 5daaa6e49b Adding setBounce to webview (#15623) 
* Adding setBounce to webview

This makes the .bounces of the scrollview section of webview publically accessible

When set to true it stops the grey over scroll of webviews

* Adding empty function for setBounces to Android

* Adding empty setBounces function for tizen

* Adding comments for empty Android and Tizen setBounce functions

* Small comment text change
 2016-05-24 18:27:59 +08:00
zilongshanren 3ae5b1075b fix native control onEnter issue 2016-05-16 16:14:16 +08:00
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +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
Ricardo Quesada 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
dimon4eg 27d5ad920e Update comment 2015-10-21 16:55:45 +03:00
zilongshanren 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
samuele3hu 9477e89723 Fix the compile error on the win32 2015-04-20 11:46:48 +08:00
jianglong0156 8f8599a49b uiWebView constructor add CC_CONSTRUCTOR_ACCESS 2015-04-15 17:54:09 +08:00
VisualSJ a29becb185 [ci skip] Add javascript notes... 
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
 2015-03-30 21:38:32 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments 
Conflicts:
	cocos/base/CCIMEDelegate.h
 2015-03-30 10:56:42 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
Jeff 6152b70945 LE 2014-09-18 16:33:46 +08:00
Jeff b9ec99d7f4 compile error & code spelling error 
1.fix compile error on win32
2.modify spelling error
 2014-09-18 11:52:23 +08:00
Jeff 27919dad77 add simple implement of WebView for win32 
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
 2014-09-17 22:30:15 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
andyque 71b6be678e fix header guard 2014-09-15 16:56:51 +08:00
andyque 043acb2fd4 rename webview to UIWebView 2014-08-29 11:28:28 +08:00