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

13304 Commits

Author SHA1 Message Date
coulsonwang a67f729610 fix drawNode (#19773) 2019-05-29 19:06:43 -07:00
coulsonwang 8faf4a758f get supported depthStencil pixel format (#19774) 2019-05-28 19:46:55 -07:00
coulsonwang 9b0d36c6a9 [Node::Light] fix no light effects on iPhone6 and iPhone6s (#19751) 
* [Node::Light] fix no light effects on iPhone6 and iPhone6s

* add TODO
 2019-05-27 22:59:37 -07:00
coulsonwang 000a5e124b fix location (#19764) 2019-05-27 19:14:55 -07:00
minggo 23a21ef298
Remove jsb related (#19729) 
* remove jsb related codes
* update 3rd party
 2019-05-24 00:00:51 -07:00
coulsonwang a61e408189 set render target flag correcttly (#19730) 2019-05-21 18:53:15 -07:00
coulsonwang 97431b1197 [ParticleSpriteFrameTest] remove getName() in Texture2D (#19740) 2019-05-21 18:49:11 -07:00
minggo 9cb539e0d0
fix base/CMakeLists.txt (#19575) (#19728) 2019-05-17 01:34:49 -07:00
minggo 39a051a58d
use CC_SAFE_DELETE_ARRAY instead of CC_SAFE_DELETE (#19580) (#19727) 2019-05-17 00:42:51 -07:00
coulsonwang 9c0033e1e7 Feature/draw in rect (#19664) 
* Texture2D draw in point and draw in rectangle tests work

* optimize code

* fix compile error

* make initProgam() private
 2019-05-16 18:14:14 -07:00
coulsonwang 2deea28f49 fix scissor rectangle setting 2019-05-16 13:48:44 +08:00
coulsonwang 2d02e23fbd Feature/update device info (#19712) 
* update DeviceInfo

* remove unneeded code

* fix indentation

* add FeatureSet enum for metal

* revert code
 2019-05-15 18:26:00 -07:00
coulsonwang 2a0ded38a2 [Texture2D Test17/18] add methods to convert BGRA8888 format (#19716) 
* [Texture2D Test17/18] add methods to convert BGRA8888 format

* use size_t and ssize_t when necessary

* fix compile error
 2019-05-15 18:17:26 -07:00
minggo a572d088d1
check metal support (#19710) 2019-05-14 01:38:14 -07:00
Arnold 3d314f29ea rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19695) 2019-05-13 17:59:29 -07:00
coulsonwang ac0f9286bf fix lineColor.vert shader (#19684) 2019-05-09 20:30:37 -07:00
coulsonwang cacdc4f140 fix buffer usage (#19685) 2019-05-09 20:30:06 -07:00
Arnold 6dc547080f [cpp-tests] fix fileutils list file, reject empty paths (#19681) 
* protect empty string

* enable tests cases
 2019-05-08 19:21:25 -07:00
Arnold d6b8e994a4 fix mac retina support (#19672) 2019-05-07 18:07:52 -07:00
Arnold 62dc64a8d1 [cpp-tests] camera3dtests adjust button position (#19673) 
* reduce log 1

* fix camera3d test/2 button position
 2019-05-07 18:07:37 -07:00
minggo 1a68f6c4b6
Shader precision (#19668) 2019-05-07 00:48:51 -07:00
minggo 70fed45ed8
Merge pull request #19650 from Mee-gu/feature/ReloadBuffer 
add methods for reloading buffer data outside the buffer when necessary
 2019-05-06 00:39:04 -07:00
Arnold ceb8fa1166
re-run genbindings 2019-05-06 09:52:17 +08:00
Arnold 401ce1ee1c
run genbinding 2019-05-06 09:43:40 +08:00
Arnold 460c9d2edd
rename restore 2019-05-06 09:43:40 +08:00
Arnold 58722a5c3d
fix state block 2019-05-06 09:43:40 +08:00
Arnold 98d5f37a30 fix lua-tests errors (#19646) 
* enable test case

* save

* generate enum classes

* save

* autobindg backend interface

* safe

* fix typos

* fix setUniform

* enable draw primitives and fast tmx tiled map

* save all

* update

* fix compile error on mac

* fix locations

* fix locations

* deduce vertexlayout

* clean

* compile on mac

* fix resource path

* save

* update bindings-generator

* remove unused code

* rename ccbackend to ccb

* remove todo
 2019-05-05 00:26:34 -07:00
coulsonwang 35951d6952 add private specifier 2019-05-05 14:34:44 +08:00
Arnold 1ac3af6c90 compile & run on linux (#19651) 2019-05-04 19:57:53 -07:00
coulsonwang c97a8a953c add support non-pow of two for metal (#19654) 2019-05-04 19:45:06 -07:00
coulsonwang 7ca39dd08e remove unneeded function and rename function to more readable 2019-04-30 15:19:53 +08:00
coulsonwang 375f52fc87 rename 2019-04-30 13:39:38 +08:00
coulsonwang 8414db94ec make sure to store data once 2019-04-30 11:11:03 +08:00
coulsonwang 5771b4236d add methods for reloading buffer data outside the buffer when necessary 2019-04-30 10:31:22 +08:00
coulsonwang 7ee0b65bb6 [Feature] fix spirte, label test when EGL context lost (#19612) 
* [BugFix] fix compile error

* [Feature] fix spirte, label test when EGL context lost

* [Feature] map uniform location

* [Feature] remove unneeded codes

* [Feature] add BufferManager

* [Feature] fix compile error

* [Feature] add files

* [Feature] remove unneeded codes

* [Feature] no need to release opengl resource

* [Feature] update BufferManager

* 1. reCreate frame buffer when needed.
2. initial texture when come back to foreground

* [Feature] add Program and Buffer event listener

* [FixTerrain] need check location had used before

* fix compile error

* add updateTextureDescrptor function for TextureMTL, since TextureMTL creation was move to Texture2D constructor.

* [FixDrawNode] record buffer data when needed

* [FixShaderTest] add nullptr judgement

* [FixShaderText] no need to reCreate ProgramState when come back to foreground

* [FixRenderTexture] retain the render texture image

* [Feature] optimize buffer memory

* fix compile error

* fix CI test fail
 2019-04-29 18:51:45 -07:00
John c259918d03 Optimize cases where loop variable is unecessarily copied in a range-for loop. (#19637) (#19640) 
Pass by const reference when appropriate.
 2019-04-27 18:20:22 -07:00
John d89f1d04b4 remove redundant user-defined copy constructor and destructor, (#19638) 
as compiler auto-generated ones are working fine.
 2019-04-25 17:59:25 -07:00
John 22a43fbc83 rewrite parseIntegerList with better performance (#19629) 2019-04-21 18:51:23 -07:00
minggo fd792813d2
Optimize calls to std::string::find() and friends (#19624) 2019-04-21 18:44:19 -07:00
minggo 34517748c7
prefer delegate constructor over new(this) (#19623) 2019-04-19 03:20:15 -07:00
minggo e8993c9860
Remove jsb/h5 (#19621) 
* remove h5 engine

* remove jsb codes

* remove js tests

* remove js templates and tojs

* remove h5 submodule
 2019-04-18 23:56:12 -07:00
minggo 60272f6b88
fix bug that SimpleAudioEngine can not change effect volume (#19605) 2019-04-14 23:52:52 -07:00
CocosRobot 212abc4ea0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19600) 2019-04-10 18:51:34 -07:00
minggo 62d20a9825
Add clear request and responses method to httpclient (#19598) 
* Added functionality to clear pending responses and requests in the http client

* Responses and Requests now are processed in similar way

* Fix for clearing the http requests

* Added tests for HttpClient::clearResponseAndRequestQueue
 2019-04-10 18:33:55 -07:00
minggo c3a0205652
ReFix bug: PremultipliedAlpha is not working for png (#19597) 2019-04-10 18:33:26 -07:00
minggo ffcf627c13
Ui video player new style looping input options 2019-04-10 18:33:05 -07:00
minggo 5c29e0066f
Add Android P cutout area support (#19595) 
* Add Android P cutout area support
Related #19285

* coding style fix

* Update AppActivity.java

Fix android build

* suppress lint new api errors
 2019-04-10 18:32:27 -07:00
minggo f7f0c48cae
Checking, does the touch is within the height of the line, not the height of the sprite? (#19394) (#19594) 2019-04-10 18:32:09 -07:00
minggo 1f7c0c9408
If path to file is tool long crash is possible. (#19593) 
* If path to file is tool long crash is possible.

If path to file is tool long crash is possible, because of chart buffer overflow.

* Incorrect replacement. Using iterator is better.

* Style fix

* Correct naming
 2019-04-10 18:31:50 -07:00
minggo 0a9e66a16c
Font atlas texture initialization delayed (#19592) 2019-04-10 18:31:29 -07:00