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

38772 Commits

Author SHA1 Message Date
halx99 22a4586af9 Sync pr from https://github.com/cocos2d/cocos2d-x/pull/20580 2020-09-17 12:05:31 +08:00
halx99 e8ce296dd3 Add Label crashing test case for https://github.com/cocos2d/cocos2d-x/issues/20523 2020-09-17 11:49:47 +08:00
halx99 dbf23f4826 Explicit delete copy stubs for CustomCommand 2020-09-17 11:41:14 +08:00
HALX99 fd5bb2586d
Merge pull request #208 from c4games/halx99-patch-3 
fix #206
 2020-09-16 07:59:53 -07:00
halx99 5554143993 suppressing invalid offset warning [skip appveyor][skip travis] 2020-09-16 22:57:55 +08:00
HALX99 80e5152596
Decrease pod offset 2020-09-16 21:26:14 +08:00
HALX99 3464e4e1a4
fix #206 2020-09-16 21:22:37 +08:00
halx99 436bb5bb0e ImGui multi-viewports Compatible with desktop GLES 2020-09-16 20:16:32 +08:00
halx99 fdb29d65c2 Needs recalculate max items when AtlasNode::setIgnoreContentScaleFactor 2020-09-16 13:34:20 +08:00
halx99 fd69e066ae check null also 2020-09-15 16:03:00 +08:00
halx99 f1f1504f1e Merge branch 'master' of https://github.com/c4games/engine-x into master 2020-09-15 16:01:59 +08:00
halx99 2d2d0e7ee6 Take care PBO use on android 2020-09-15 16:01:44 +08:00
HALX99 b01be2f2eb
CMake: Add missing CC_FORCE_USE_GLES for win 2020-09-15 14:22:19 +08:00
halx99 24ddc710e8 captureScreen compatible, saveFile at offthread 2020-09-15 14:12:00 +08:00
HALX99 51980b6edf
Fixup 
OpenGL: read screen pixels only works: AFTER_DRAW and BEFORE_END_FRAME
 2020-09-14 17:43:44 +08:00
HALX99 9b2f934b47
Needs readPixels at CallbackCommand 
Avoid read dirty pixels
 2020-09-14 17:20:07 +08:00
halx99 a9f1c43127 fix fbo attachment texture bind error 2020-09-13 19:17:49 +08:00
halx99 c5d6f35d9d Refine code 2020-09-13 19:16:59 +08:00
HALX99 c73e77e66f
Merge pull request #203 from halx99/refactor-capture 
Refactor capture feature, fix data race reported by xcode
 2020-09-13 02:50:54 -07:00
HALX99 961b023bfa
Remove unused CaptureCallbackCommand (#2) 2020-09-13 14:53:17 +08:00
halx99 2c496b7393 Refine comment 2020-09-13 13:30:41 +08:00
halx99 782e0c61bb No need CaptureCommand for capture screen or node 2020-09-13 13:27:50 +08:00
halx99 9c6a3d2837 Metal screen framebuffer only set/restore 2020-09-13 12:55:35 +08:00
halx99 f9c2e3b856 Make capture API public to Renderer 2020-09-13 11:11:48 +08:00
halx99 4e3acb6f2b UtilsGL::readPixels also use PBO if available 2020-09-12 23:26:40 +08:00
HALX99 42be4daed4
Update comment [skip appveyor] [skip travis] 2020-09-12 20:44:08 +08:00
halx99 c4c64ffd3f No need enqueue, commit will do it automatically 2020-09-12 16:44:16 +08:00
halx99 682b4f685e Refine code 2020-09-12 15:34:09 +08:00
halx99 185d0f9ec0 Sync config file 2020-09-12 15:02:47 +08:00
halx99 3d2ab83cab Remove test stubs 2020-09-12 14:52:39 +08:00
halx99 2b991b20b2 a. Refine captureScreen, glReadPixels shoud from glviewport's origin. 
b. Sets desktop GL min version from 2.0 to 2.1
 2020-09-12 14:50:48 +08:00
halx99 378e38de11 Add more clearly comment [skip appveyor] 2020-09-11 20:17:31 +08:00
halx99 0b6ab08d7a fix travis no output [skip appveyor] 2020-09-11 19:34:01 +08:00
halx99 de0b49ab67 fix travis timeout 2020-09-11 19:00:21 +08:00
halx99 8c7ce70ef6 fix warn [skip appveyor] 2020-09-11 18:46:15 +08:00
halx99 7249325ff4 Use glMapBuffer if available 2020-09-11 17:32:08 +08:00
halx99 5d5c948218 fix ci 2020-09-11 14:45:45 +08:00
halx99 af21cdba50 fix ci 2020-09-11 13:38:05 +08:00
halx99 efc5a00b60 Remove comment 2020-09-11 12:39:16 +08:00
halx99 ecb8738b33 Renaming stubs relative capture command 2020-09-11 12:23:33 +08:00
halx99 0e99525283 Remove unused comment 2020-09-11 12:14:40 +08:00
halx99 04358791ec v4 captureScreen API compatiable, gl needs flip always for capture 2020-09-11 11:57:55 +08:00
HALX99 4eb3b05e45
Remove todo comment [skip appveyor][skip travis] 2020-09-11 02:19:19 +08:00
HALX99 d346204936
Update CCRenderTexture.cpp 2020-09-11 01:46:12 +08:00
halx99 6497a92ec7 finish gl backend 2020-09-11 01:19:10 +08:00
halx99 4f4529bca5 Prepare 2020-09-11 00:14:03 +08:00
halx99 874946fccb Tidy code 2020-09-11 00:10:44 +08:00
halx99 fdd8321d28 Remove unused API, TODO: unify to Utils::readPixels 2020-09-10 23:11:43 +08:00
halx99 a7b0850d2f Add comment 2020-09-10 21:41:52 +08:00
halx99 2a50ae6cf8 Refine code 2020-09-10 21:38:24 +08:00