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

949 Commits

Author SHA1 Message Date
halx99 3ebb1f57c0 Fix next drawable maybe nil crash[ci build] (#310) 2020-12-17 15:31:16 +08:00
halx99 b92c3d30c4 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 eb2917fbf6 Merge: d467b647e2 29819491f7 
Merge branch 'master' of https://github.com/c4games/engine-x
 2020-12-16 12:47:04 +08:00
halx99 14f38d0ebc Sync luabinding config file 2020-12-16 12:46:37 +08:00
halx99 808fdd6494 Update README.md 2020-12-16 12:33:22 +08:00
halx99 86e0340b9d Sync yasio [ci build] 2020-12-15 18:58:04 +08:00
halx99 3a49f0e064 Merge: c3ad19df96 c95e0466e1 
Merge pull request #308 from c4games/refactor-android-run-on-gl-thread

Refactor android runOnGLThread
 2020-12-10 16:56:14 +08:00
halx99 78aaf568c6 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
halx99 ca4597a1ff Refactor android runOnGLThread 
Ensure the callback run engine core mainLoop,
This commit can solve any weird behaviors, such as:
a. text render maybe missing charactors when bring from back to frontend
b. some renderer objects alpha may present black at sdk callback call
c. some other things
All above behavior is caused gl state not ready when go back to game activity from sdk activity
 2020-12-09 15:13:57 +08:00
aismann 0fab6141b6 same/correct wording style 2020-12-03 21:33:52 +01:00
halx99 eb2fcc36b9 fix link error on macOS Big Sur 11.01 
Follow lib removed by Apple
1. /usr/lib/libz.dylib
2. /usr/lib/libiconv.dylib
 2020-12-02 21:59:57 -08:00
halx99 5fe25cb0aa fix README.md markdown syntax 2020-12-02 20:49:08 -08:00
halx99 32891603ee fix libjpeg-turbo can't build with combined archs 
such as (armv7,arm64)
 2020-12-02 20:45:06 -08:00
halx99 04db04ad93 Merge: 3f4178cc27 dbf81d7511 
Merge pull request #295 from aismann/master

CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 571adc605a fix ci 2020-12-02 03:33:53 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann fd70034958 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 73b2b175d9 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
halx99 c7c58ae3cc Merge: 2c93318d37 58ddd6e085 
Merge pull request #294 from aismann/patch-1

Update README.md
 2020-12-01 02:12:41 -08:00
halx99 43f5a305c8 Merge: 079ecdbbec 5e249bf6f8 
Merge pull request #293 from aismann/master

Chipmunk2D and Box2D works together now (add two new classes) and FIX  ImGuiEXTTest window size problem
 2020-12-01 01:52:47 -08:00
aismann 18cc4a9eb4 Update README.md 
change wiki link:  https://github.com/c4games/engine-x-wiki
 2020-12-01 10:32:09 +01:00
aismann 91843b3fae Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
Acc 73f5334a3e Update README_CN.md 2020-12-01 12:17:09 +08:00
halx99 c70ccf6b36 Update issue_template.md 2020-11-29 12:39:18 +08:00
halx99 315e42b126 Merge: 4c1ff6bd01 369bef3614 
Merge pull request #286 from rh101/add-center-vertical-layout-support

Add support for center vertical layout
 2020-11-26 23:43:25 -08:00
halx99 cc7366845e Merge: 74add84559 f113e1f2ed 
Merge pull request #285 from rh101/fix-listview-dimensions

Fix ListView dimensions when child elements are scaled
 2020-11-26 23:08:30 -08:00
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