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

37416 Commits

Author SHA1 Message Date
coulsonwang 9bea7a3255 fix crash when using compressed pixel format (#19794) 2019-06-04 18:30:16 -07:00
minggo 46ffa8e03d
remove PROP_BUILD_TYPE (#19795) 
since only support cmake now
 2019-06-04 18:29:58 -07:00
coulsonwang 655d0d3404 [TileMapTest] Depth write state setting should not depended on the depth test flag (#19792) 2019-06-04 03:09:47 -07:00
coulsonwang 59d5f97d30 fix compile error (#19788) 2019-06-03 19:52:16 -07:00
coulsonwang 7c29811c81 vertex shader does not need header define (#19785) 2019-06-03 19:43:19 -07:00
coulsonwang bf93892ec9 bind texture target (#19786) 2019-06-03 18:25:32 -07:00
coulsonwang 89ba801628 add compressed format for metal (#19762) 2019-06-03 03:34:28 -07:00
coulsonwang 10b2799051 Feature/fix mipmap issues (#19753) 
* fix mipmap

* fix mipmap issues

* remove unneeded code

* fix

* remove Texture2D::PixelFormat, add backend::PixelFormat

* fix lua compile error

* reset *.tps files

* fix compile error

* fix compile error
 2019-06-02 18:39:51 -07:00
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 254c57a347 add test cases (#19741) 2019-05-21 19:00:05 -07:00
coulsonwang a61e408189 set render target flag correcttly (#19730) 2019-05-21 18:53:15 -07:00
coulsonwang a066ac729f add subTitle (#19731) 2019-05-21 18:52:40 -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
minggo 65fda3df81
Merge pull request #19721 from Mee-gu/feature/ClippingNode 
fix scissor rectangle setting
 2019-05-16 01:38:56 -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
coulsonwang 833ab9bb81 need specify font path when use as system font (#19692) 
* need specify font path when use as system font

* set custom fonts
 2019-05-13 18:31:46 -07:00
Arnold 825c4aa3f7 remove bad test case (#19704) 2019-05-13 18:01:04 -07:00
Arnold e52a35708e enable tests (#19702) 2019-05-13 18:00:27 -07:00
Arnold 3d314f29ea rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19695) 2019-05-13 17:59:29 -07:00
Arnold bd76e891d5 [cpp-tests] SpritePolygonTest invoke `UISlide::setPercent` after initialization (#19676) 
* delay onProgressChange event when setProgress

* Revert "delay onProgressChange event when setProgress"

This reverts commit a9ad090f513f08e1103a0fd793d02f26600e52b3.

* setPercent after initialization
 2019-05-09 20:31:10 -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 ce7a6eadbe fix localization tests (#19675) 2019-05-09 01:30:19 -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
Arnold 0f2e5f513b fix downloader url (#19674) 2019-05-07 18:07:17 -07:00
Arnold 8a7d6a77f5 merge (#19669) 2019-05-07 00:50:29 -07:00
minggo 1a68f6c4b6
Shader precision (#19668) 2019-05-07 00:48:51 -07:00
minggo e401bfd265
Merge pull request #19667 from PatriceJiang/cocos_run_on_linux 
fix `cocos run` on linux
 2019-05-06 18:42:33 -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
minggo 33ec1dcd67
Merge pull request #19665 from PatriceJiang/metal-fix-stateblock 
fix RenderState::StateBlock
 2019-05-05 20:46:03 -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 2641e5a88a
update submodule 2019-05-05 18:28:25 +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