Commit Graph

1594 Commits

Author SHA1 Message Date
halx99 1051d38562 Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-18 12:16:36 +08:00
halx99 53122216ee Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
halx99 a708c2f904 Improve lua framework code 2020-11-17 23:17:40 +08:00
halx99 acc064770c fix #263 2020-11-17 21:57:35 +08:00
halx99 7852cb21e5 fix #262 2020-11-16 22:38:18 +08:00
halx99 cd34ea9c4d fix compile issue 2020-11-16 14:19:56 +08:00
wtfdnvxk f5fcd5592c
Update lua_module_register.cpp
extend lua by register extensions
2020-11-11 16:53:00 +08:00
halx99 d1f0a287ac Remove ENABLE_CJSON_GLOBAL from cmake 2020-11-11 16:37:33 +08:00
halx99 0bc8728342 mandatory yasio for lua bindings 2020-11-11 15:51:46 +08:00
halx99 e0a36031c9 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 5da2894e1b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 c5493b4230 Update extension spine README.md 2020-11-04 23:28:51 +08:00
halx99 f90046f0ac Tidy extension spine folder structure [ci build] 2020-11-04 23:17:05 +08:00
halx99 d5d11d203a fix lua bindings [ci build] 2020-11-04 19:35:58 +08:00
halx99 c9873122b5 spine-c runtime compatible [ci build] 2020-11-04 19:10:02 +08:00
halx99 9d0cb09f5d Remove Sprite::updateShaders [ci build] 2020-10-31 20:08:32 +08:00
halx99 645364864b Optimize FUISprite::setGrayed for engine-x 2020-10-31 13:58:47 +08:00
halx99 3fa65521e3 Sync https://github.com/EsotericSoftware/spine-runtimes/pull/1801 2020-10-27 17:08:26 +08:00
HALX99 9156bc122c
Update README.md 2020-10-25 22:01:32 +08:00
halx99 863bd35676 Finish #244 2020-10-25 16:25:08 +08:00
halx99 975ef2ff61 Lock name 2020-10-24 21:57:36 +08:00
halx99 4a93071ab0 Simplify interface include for extension GUI 2020-10-22 23:14:58 +08:00
halx99 a09d53bf05 Remove unused comment 2020-10-22 21:32:09 +08:00
halx99 b8834bc086 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 c9dda9145e fix lua bindings build 2020-10-21 17:58:05 +08:00
HALX99 0a1af78a0e
Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 834cf88a8a Fix compile error at non-win32 platforms 2020-10-21 10:57:37 +08:00
halx99 86f3c58c39 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 d88518f508 fix compile error when disable script 2020-10-20 17:45:50 +08:00
HALX99 7f2b8dfac5
fix ci 2020-10-20 00:34:14 +08:00
halx99 25cc511532 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 bd76794a36 fix lua compile on android, link needs to fix later 2020-10-19 20:01:13 +08:00
halx99 cdaed31389 fix lua build on android 2020-10-19 19:56:48 +08:00
halx99 d87af8e76a fix ci 2020-10-18 16:54:45 +08:00
halx99 e2d5d9423a fix ci 2020-10-18 15:48:06 +08:00
halx99 adf09cf173 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
halx99 6448083c7d Remove deprecated sources, remove old extension GUI 2020-10-18 00:27:23 +08:00
halx99 8f1ae3cee2 delete for rename 2020-10-18 00:24:34 +08:00
halx99 c7a2582afa Enable yasio lua bindings for lua projects by default. can use cmake parameter: BUILD_YASIO_LUA to control it. 2020-10-17 23:46:59 +08:00
halx99 c6d8d395a3 fix #234, spine custom shader doesn't work. 2020-10-17 22:00:53 +08:00
halx99 9e46cdc192 Sync official fix 2020-10-17 21:58:15 +08:00
HALX99 90ecc475f0
Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 2f934aeedc Simplfy hsv color 2020-10-16 17:23:29 +08:00
HALX99 b342ebd7ae
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 b5780531d5 win32 dll improvements 2020-10-07 00:15:11 +08:00
halx99 4130fbd729 Refine code 2020-10-04 23:41:01 +08:00
HALX99 235f09f635
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
HALX99 5a32bcfdaf
RenderTarget abstract, in-progress (#210)
RenderTarget abstract
2020-09-21 22:10:50 +08:00
halx99 436bb5bb0e ImGui multi-viewports Compatible with desktop GLES 2020-09-16 20:16:32 +08:00
halx99 165b588a10 Add ImGuiEXT::end to end game 2020-09-10 17:53:17 +08:00