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

38007 Commits

Author SHA1 Message Date
halx99 b50bea8702 Refine code style 2020-09-08 16:15:40 +08:00
halx99 9de0e06808 fix typo [skip appveyor][skip travis] 2020-09-08 15:55:16 +08:00
halx99 1148248a7c Update readme files [skip appveyor][skip travis] 2020-09-08 15:53:56 +08:00
halx99 5b3c7f0d81 Update ImGuiEXT readme[skip appveyor][skip travis] 2020-09-08 15:15:25 +08:00
HALX99 128ac5b2e0
Merge pull request #199 from halx99/imgui-hdpi 
ImGuiEXT improvements
 2020-09-08 00:07:16 -07:00
halx99 a824eb4050 Checking condition for dirty ImGui device objects [skip appveyor][skip travis] 2020-09-08 14:21:26 +08:00
halx99 7a15d5b74f Update CMake scripts and readme 2020-09-08 13:44:59 +08:00
halx99 090cd1002b Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
HALX99 60123b4941
fix travis.yml[skip appveyor] 2020-09-08 09:52:17 +08:00
HALX99 55748abccf
Simplify travis.yml [skip appveyor] 2020-09-08 08:08:39 +08:00
HALX99 c2c7cb2a96
fix travis.yml [skip appveyor] 2020-09-08 07:54:39 +08:00
halx99 500e913517 ImGUIEXT addRenderLoop support global without any target scene 2020-09-07 23:21:15 +08:00
HALX99 cde039b34b
More cleary comment [skip appveyor][skip travis] 2020-09-07 21:25:22 +08:00
HALX99 c251213953
Update CCImGuiEXT.h 2020-09-07 21:22:03 +08:00
HALX99 c01b11dbb0
Update ImGUIEXT readme [skip appveyor][skip travis] 2020-09-07 20:52:16 +08:00
halx99 e005bb15fe ImGuiEXT: hdpi support, Add APIs: scaleAllByDPI, addFont, clearFonts for more easy to use 2020-09-07 20:31:50 +08:00
halx99 4d0375e7a8 ImGuiEXT manage ImGui render loop more clearly 2020-09-07 19:15:53 +08:00
halx99 6e4cee5855 Refine code 2020-09-07 14:15:09 +08:00
halx99 600f14b834 Merge branch 'master' of https://gitee.com/c4games/engine-x into master 2020-09-06 17:01:21 +08:00
halx99 556e0d05d3 Move getFileDataFromZip from FileUtils to ZipFile and mark it as deprecated 2020-09-06 17:00:20 +08:00
HALX99 3629cd7120
Merge pull request #198 from c4games/halx99-patch-1 
fix mac build
 2020-09-05 21:58:39 -07:00
HALX99 6163bd3474
fix link error 
see: https://github.com/curl/curl/issues/5210
 2020-09-06 11:18:04 +08:00
HALX99 e909cf9c4a
Update config.json 2020-09-05 23:57:38 +08:00
halx99 d9cd3e1256 Mac currently dosn't works on multi-viewports 2020-09-05 23:29:16 +08:00
halx99 d401cbfd75 fix mac compile error 2020-09-05 22:33:18 +08:00
halx99 2d5fb7f77d Add CC_REDUCE_PAUSED_CPU_USAGE ccConfig.h to control whether reduce cpu usage after paused 2020-09-05 17:12:30 +08:00
halx99 cc2c524573 Refine extension ImGui, and rename director to ImGuiEXT 2020-09-05 17:10:09 +08:00
HALX99 e3e3352440
Merge pull request #194 from halx99/ImGuiEXT 
Add Extension ImGui
 2020-09-04 04:24:01 -07:00
halx99 9cb9a0e455 fix ci warnings 2020-09-04 18:34:15 +08:00
halx99 81e4c28d24 Fix mac [skip appveyor] 2020-09-04 18:16:13 +08:00
halx99 53509b8833 Fix glviewimpl for osx 2020-09-04 17:58:34 +08:00
halx99 76cf3357cd fix .travis.yml 2020-09-04 17:19:51 +08:00
HALX99 3c59765f29
Merge pull request #195 from c4games/test-ci 
Update README.md
 2020-09-04 02:04:17 -07:00
HALX99 255a1b086a
Update README.md 2020-09-04 17:03:46 +08:00
HALX99 fa0e1e0204
test 2020-09-04 17:03:25 +08:00
halx99 40b5efc011 fix .travis.yml ident, update readme [skip appveyor] 2020-09-04 16:55:13 +08:00
halx99 743b414bf1 Enable mac build for ci 2020-09-04 16:47:32 +08:00
halx99 d9c4be96a2 Add ImGuiEXT extension support 2020-09-04 16:13:40 +08:00
halx99 8bb706d70e Add utils::makeInstance and utils::newInstance 2020-09-04 11:28:16 +08:00
HALX99 36c25dc889
Should set _mtlCommandBuffer to nil after release 2020-09-03 22:26:21 +08:00
HALX99 047bcae9ea
Merge pull request #192 from halx99/fix-gl-error-502 
Fix GL renderer backend API updateCompressedSubData incorrect
 2020-09-03 03:46:16 -07:00
halx99 b3361b6d70 Fix GL renderer backend API updateCompressedSubData will cause OpenGL 502 error 2020-09-03 18:03:43 +08:00
HALX99 7a2f91e514
ASTC6x6 support and more comment about bpp usage in engine (#191) 
* ASTC6x6 support and more comment abount bpp usage in engine

* fix log output

* Comment astc compression tool download url

* Add command line comment for astcenc tool [skip travis][skip appveyor]

* Add astc_6x6 test image[skip appveyor][skip travis]

* astc_6x6 mtl

* Refine log info[skip appveyor][skip travis]

* Empty line[skip appveyor][skip travis]
 2020-09-03 18:01:40 +08:00
halx99 ff3becb49d Add getGPUHandler for backend::Texture for some purpose use 2020-09-02 13:00:32 +08:00
halx99 8ec6df624e Remove unused member 'func' from CustomCommand, use CallbackCommand instead 2020-09-02 12:59:34 +08:00
HALX99 2539e78774
Merge pull request #188 from halx99/etc2-support 
Add etc2 compressed texture support
 2020-09-01 00:16:01 -07:00
halx99 8cad7319f6 Use uint8_t instead unsigned char for byte buffer [skip appveyor][skip travis] 2020-09-01 14:57:18 +08:00
halx99 cf5c4f38c3 No need check GL_ETC1_RGB8_OES for ETC compression formats [skip appveyor][skip travis] 2020-09-01 14:32:52 +08:00
halx99 63487d6c57 Remove unnecessary macro GL_ETC1_RGB8_OES check 2020-09-01 13:39:15 +08:00
halx99 5bda5f97a3 Remove unused comment [skip appveyor][skip travis] 2020-09-01 13:29:41 +08:00