Commit Graph

2323 Commits

Author SHA1 Message Date
halx99 bcb96e66ee Merge: 289bc4fccc ee996a5cfb
Merge pull request #282 from rh101/fix-editbox-globalz

Ensure global Z is correctly set on all child items of EditBox
2020-11-26 23:00:14 -08:00
rh101 220ef7a6bf Allow user to set custom program type value 2020-11-27 17:26:02 +11:00
rh101 11e78b27c0 Add support for center vertical layout 2020-11-27 17:24:07 +11:00
rh101 25bf822fb8 Fix ListView dimensions when child elements are scaled. 2020-11-27 17:02:31 +11:00
rh101 35e57843c8 Ensure global Z is correctly set on all child items of EditBox 2020-11-27 16:59:34 +11:00
halx99 910c1d95a7 Sync extension fairygui 2020-11-26 17:40:32 +08:00
aismann 1239c3c8da Update README.md
one 'OpenAL Soft' forgotten, fixed
2020-11-26 07:27:47 +01:00
halx99 d121a3ccf8 Merge: 1d4b5470de 3d3e099e26
Merge pull request #279 from aismann/patch-1

Update README.md
2020-11-25 22:23:28 -08:00
aismann 47d7c19448 Update README.md
small corrections
2020-11-26 06:16:33 +01:00
aismann ac7d188b65 Update README.md
small improvements
2020-11-26 06:15:20 +01:00
halx99 cf24cf3a36 Sync yasio to 3.33.4 [ci build] 2020-11-25 19:07:21 +08:00
halx99 1353c00758 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614 2020-11-24 18:10:28 +08:00
halx99 3f0d17b520 Merge: a10d7701b8 a606572775
Merge pull request #277 from aismann/master

Update cocos.bat
2020-11-23 01:27:53 -08:00
Eismann 381189f726 Update cocos.bat 2020-11-23 09:55:07 +01:00
halx99 a300b75a2f Merge: 0d04e20b50 eee60b9d99
Merge pull request #276 from aismann/master

Same as on 3.17 (with small changes)
2020-11-22 23:43:18 -08:00
Eismann b51545ac54 Same as on 3.17 (with small changes) 2020-11-23 07:46:09 +01:00
halx99 7122b5043a fix metal znear range for viewport
https://developer.apple.com/documentation/metal/mtlrendercommandencoder/1515527-setviewport?language=objc
2020-11-23 09:30:51 +08:00
Eismann e08b35755b Update Box2dTest.h 2020-11-20 07:05:21 +01:00
Eismann d126affebf Update CMakeLists.txt 2020-11-20 06:38:09 +01:00
Eismann 232fea1442 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
Eismann 7179435c80 Add BOX2D test
Add BOX2D test
2020-11-20 04:51:47 +01:00
halx99 a189fb0613 Update README_CN.md 2020-11-19 23:38:05 +08:00
halx99 b14d9a7eb3 Update README.md 2020-11-19 23:37:19 +08:00
aismann 26d42ede1d Update README.md 2020-11-19 08:40:49 +01:00
halx99 61d82bf642 Merge: 1059485e52 44a02b7ea7
Merge pull request #269 from aismann/patch-13

Update README.md
2020-11-18 22:34:08 -08:00
aismann 04e1dfea60 Update README.md 2020-11-19 07:18:00 +01:00
aismann a96909d0a1 Update README.md 2020-11-19 06:48:12 +01:00
Oren Bengigi f7c9666c41 Fix manifest version greater check 2020-11-18 20:43:49 +02:00
halx99 2281984f6e Merge: d162416f96 bb6ebc3628
Merge pull request #265 from aismann/patch-11

Update README.md
2020-11-18 04:05:31 -08:00
aismann 03d0aa03a6 Update README.md
add some links
2020-11-18 12:50:44 +01:00
aismann 0698ca89a9 Update README.md
some more small stuff (hope thats all ;))
2020-11-18 12:37:28 +01:00
halx99 6e304959a9 Remove unnecessary targets for cpp template 2020-11-18 18:35:00 +08:00
halx99 a842beee1f Refine jni param types 2020-11-18 18:19:14 +08:00
halx99 4bfec74659 Merge: eeafffe2f1 1444881c7f
Merge branch 'master' of https://github.com/c4games/engine-x
2020-11-18 18:18:07 +08:00
halx99 349e435937 jni match natvie API param types 2020-11-18 18:17:55 +08:00
aismann b73e18cafc Update README.md 2020-11-18 09:55:19 +01:00
halx99 dd5f706dff Refine jni methods decls [ci build] 2020-11-18 13:25:00 +08:00
halx99 f75e87c88a Use env ENGINEX_ROOT for templates 2020-11-18 13:01:17 +08:00
halx99 c12701da10 Merge: 53122216ee a708c2f904
Merge branch 'master' of https://github.com/c4games/engine-x
2020-11-18 12:16:36 +08:00
halx99 09e2615e51 Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
halx99 a524d61036 Improve lua framework code 2020-11-17 23:17:40 +08:00
halx99 f6e87217bf fix #263 2020-11-17 21:57:35 +08:00
halx99 ad36cdabdb Delete .gitmodules 2020-11-17 20:37:40 +08:00
halx99 d1fc9712b4 fix UserDefault plain mode stack overflow 2020-11-17 19:50:58 +08:00
halx99 a1d1b21642 Merge: 7852cb21e5 45f1519638
Merge branch 'master' of https://github.com/c4games/engine-x
2020-11-16 22:38:59 +08:00
halx99 c17a21eb8c fix #262 2020-11-16 22:38:18 +08:00
halx99 d3eb17324a Update README_CN.md 2020-11-16 17:41:12 +08:00
halx99 b3ab1a075a Update README.md 2020-11-16 17:40:19 +08:00
halx99 44a7d2a9bd Add missing .a files [ci build] 2020-11-16 16:20:21 +08:00
halx99 0b805564dc CI don't needs download deps manually [ci build] 2020-11-16 16:02:47 +08:00