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

654 Commits

Author SHA1 Message Date
halx99 dcc4c8d385 Sync official fix 2020-10-17 21:58:15 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 78ced146f3 Update dev version [skip appveyor][skip travis] (#237) 2020-10-16 20:23:14 +08:00
halx99 5401bbf821 Simplfy hsv color 2020-10-16 17:23:29 +08:00
halx99 567f55d6fb fix clear flow for rendertexture and grid since we use clearCommand to clear renderTarget, see #233 2020-10-16 16:25:10 +08:00
halx99 c594e3789c Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
halx99 a0034c48a0 fix #233 (#235) 2020-10-16 01:41:36 +08:00
halx99 880c274995 fix #233 2020-10-15 10:22:18 +08:00
halx99 b3a9a9fa04 Sync build script 2020-10-08 23:25:32 +08:00
halx99 5afa150982 Sync official v4 tools 2020-10-08 22:32:07 +08:00
halx99 958922bf6d Add setDispatchOnWorkThread support 2020-10-08 00:00:14 +08:00
halx99 257e5ce0e0 Use move assignment 2020-10-07 23:59:26 +08:00
halx99 1f8431b7c8 Use pyenv manage python version for travis-ci (#229) 2020-10-07 22:45:05 +08:00
halx99 c3822d169b Android travis ci [skip appveyor] (#228) 
Set python to 2.7.12
 2020-10-07 12:35:08 +08:00
halx99 d535b47145 win32 dll improvements 2020-10-07 00:15:11 +08:00
halx99 11ffba3758 API qualifiers improments 2020-10-07 00:07:53 +08:00
halx99 0901f1d9eb Build mac with alsoft support (#226) 
* Build mac with alsoft support

* Add missing dep for mac

* Update CocosConfigDepend.cmake
 2020-10-06 20:55:38 +08:00
halx99 eda4e3e1a2 build mac with alsoft 2020-10-06 16:50:06 +08:00
halx99 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 5ef9214d19 fix warning 2020-10-06 12:31:17 +08:00
halx99 3214a76297 Refine HttpClient (#224) 2020-10-05 08:32:48 +08:00
halx99 89d80ce24f Refine HttpClient 2020-10-05 02:40:38 +08:00
halx99 3fadbb3928 fix #223 2020-10-05 00:10:31 +08:00
halx99 5b5ab83830 Change access qualifier 2020-10-05 00:09:12 +08:00
halx99 79e04aad3c Add custom hosts support for HttpReuqest 
refer to: https://curl.haxx.se/libcurl/c/CURLOPT_RESOLVE.html
 2020-10-04 23:44:52 +08:00
halx99 0e987a7a0d Move isPOT to ccUtils.h for reuse 2020-10-04 23:43:57 +08:00
halx99 99498c5b30 Refine code 2020-10-04 23:41:01 +08:00
halx99 3b70b21430 fix lua binding, remove unused initWithBackendTexture 2020-10-03 18:04:56 +08:00
halx99 4592656b28 UserDefault int64_t 2020-10-02 19:52:32 +08:00
halx99 a0ee504406 Delete duplicated _mv (#220) 2020-09-26 12:33:14 +08:00
halx99 a2288d08db Fix depth stencil state and pipeline state mismatch 2020-09-25 23:16:48 +08:00
halx99 2b6cb88167 Clearly texture usage and TextureGL initWithZeros usage (#219) 
* Clearly texture usage and TextureGL initWithZeros usage

* More properly function name
 2020-09-25 15:04:55 +08:00
halx99 4a35122ab0 Remove dep 2020-09-25 13:49:23 +08:00
halx99 f93a26a7de Delete file ant.properties 2020-09-25 13:17:03 +08:00
halx99 3820cffc33 Sync feature from b2a0cb5e2f 2020-09-25 13:13:54 +08:00
halx99 1c57632e51 Delete unused source files 2020-09-25 13:08:39 +08:00
halx99 cca0739793 Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
aismann 94212bc973 Update README.md 2020-09-22 12:14:39 +02:00
halx99 ad62747456 fix #213 2020-09-22 17:34:52 +08:00
halx99 9790c31529 fix macro CC_LOG_TO_CONSOLE doesn't work for win32 2020-09-22 17:23:19 +08:00
halx99 f4c59db36f Bump version, alpha17 is in developing [skip appveyor][skip travis] 2020-09-22 17:01:11 +08:00
halx99 26924879be fix AtlasNode, needs update atlas values when ignore content scale factor changed 2020-09-22 16:35:24 +08:00
halx99 3eb2d51df9 Refactor render pipeline state (#211) 
* Refactor pipeline state
* Cache DepthStencil state for MTL renderer backend
 2020-09-22 16:32:17 +08:00
halx99 7bee993bd0 Reduce depthStencil state create, don't create it at per draw call 2020-09-21 22:58:45 +08:00
halx99 c97956d28f Remove unused param for setRenderPipeline 2020-09-21 22:35:18 +08:00
halx99 6e7e117a0d RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
halx99 bb6faed0a2 fix macro 2020-09-21 11:38:21 +08:00
halx99 03ae85f2f4 Merge: 22a4586af9 03e5a1bd9a 
Merge pull request #209 from halx99/delete-copy-stubs

Explicit delete copy stubs for CustomCommand
 2020-09-16 22:45:38 -07:00
halx99 a14cb93bdc fix ci warnings 2020-09-17 12:13:59 +08:00
halx99 ac2e8e4bb6 fix ci 2020-09-17 12:10:08 +08:00