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

38566 Commits

Author SHA1 Message Date
aismann 4ef25e25cf same/correct wording style 2020-12-03 21:33:52 +01:00
halx99 ac9884026e Update pugixml to 1.11 2020-12-03 22:04:33 +08:00
halx99 62fdacb849 Update jpeg version readme [ci build] 2020-12-03 16:16:18 +08:00
halx99 4bad52d007 fix android build for libjpeg-turbo [ci build] 2020-12-03 15:44:43 +08:00
halx99 82ee7e7c61 fix android build for libjpeg-turbo [ci build] 2020-12-03 15:30:44 +08:00
halx99 5056eb9ef2 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 b911741252 fix libjpeg-turbo can't build with combined archs 2020-12-02 21:18:13 -08:00
halx99 098ee5e06f fix README.md markdown syntax 2020-12-02 20:49:08 -08:00
halx99 57ca23ec25 fix libjpeg-turbo can't build with combined archs 
such as (armv7,arm64)
 2020-12-02 20:45:06 -08:00
HALX99 bb9b40689c
Merge pull request #295 from aismann/master 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
HALX99 3f4178cc27
Merge pull request #296 from halx99/nsgl-compat 
Use cmake variable 'CC_COMPAT_GL' to control renderer backend
 2020-12-02 04:09:01 -08:00
halx99 f713ca6baa fix ci 2020-12-02 03:33:53 -08:00
halx99 108399ede3 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann dbf81d7511 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 72be372699 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 8b4b39bc7a
Merge pull request #294 from aismann/patch-1 
Update README.md
 2020-12-01 02:12:41 -08:00
HALX99 2c93318d37
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 58ddd6e085
Update README.md 
change wiki link:  https://github.com/c4games/engine-x-wiki
 2020-12-01 10:32:09 +01:00
aismann 5e249bf6f8 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
halx99 079ecdbbec fix #291 [ci build] 2020-12-01 14:49:14 +08:00
HALX99 b7ae37994b
Merge pull request #290 from anssser/patch-1 
Update README_CN.md
 2020-11-30 20:48:06 -08:00
Acc 5b809c2f7b
Update README_CN.md 2020-12-01 12:17:09 +08:00
halx99 b4f5953fc4 Sync 2020-11-30 13:26:25 +08:00
HALX99 677b5d4954
Update issue_template.md 2020-11-29 12:39:18 +08:00
HALX99 7fd68a77dc
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 4c1ff6bd01
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 74add84559
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
HALX99 289bc4fccc
Merge pull request #283 from rh101/allow-user-program-type 
Allow user to set custom program type value
 2020-11-26 22:57:14 -08:00
rh101 17f3959a13 Allow user to set custom program type value 2020-11-27 17:26:02 +11:00
rh101 369bef3614 Add support for center vertical layout 2020-11-27 17:24:07 +11:00
rh101 f113e1f2ed Fix ListView dimensions when child elements are scaled. 2020-11-27 17:02:31 +11:00
rh101 ee996a5cfb Ensure global Z is correctly set on all child items of EditBox 2020-11-27 16:59:34 +11:00
halx99 192a59f39e Sync extension fairygui 2020-11-26 17:40:32 +08:00
HALX99 fb7343ad5d
Merge pull request #281 from aismann/patch-3 
Update README.md
 2020-11-25 23:01:29 -08:00
aismann 65b659356a
Update README.md 
one 'OpenAL Soft' forgotten, fixed
 2020-11-26 07:27:47 +01:00
HALX99 562022c5ed
Merge pull request #279 from aismann/patch-1 
Update README.md
 2020-11-25 22:23:28 -08:00
HALX99 1d4b5470de
Merge pull request #280 from aismann/patch-2 
Update README.md
 2020-11-25 22:23:13 -08:00
aismann 9b419f3b01
Update README.md 
small corrections
 2020-11-26 06:16:33 +01:00
aismann 3d3e099e26
Update README.md 
small improvements
 2020-11-26 06:15:20 +01:00
HALX99 f9e4221872
Update README.md 2020-11-26 09:40:56 +08:00
halx99 25b6c1c5f4 Sync yasio to 3.34.0 [ci build] 2020-11-26 00:26:54 +08:00
halx99 f543356bb7 Sync yasio to 3.33.4 [ci build] 2020-11-25 19:07:21 +08:00
halx99 1a9d91127f fix cocos chmod 2020-11-24 19:08:28 -08:00
halx99 596302509c Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-24 18:10:47 +08:00
halx99 5821233e45 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614 2020-11-24 18:10:28 +08:00
HALX99 7e55ef9bd1
Update README.md 2020-11-24 17:27:48 +08:00
halx99 9b51c1c614 Sync yasio to 3.33.9 2020-11-24 16:52:03 +08:00
HALX99 d31566c157
Merge pull request #277 from aismann/master 
Update cocos.bat
 2020-11-23 01:27:53 -08:00
Eismann a606572775 Update cocos.bat 2020-11-23 09:55:07 +01:00
HALX99 a10d7701b8
Merge pull request #276 from aismann/master 
Same as on 3.17 (with small changes)
 2020-11-22 23:43:18 -08:00