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

38330 Commits

Author SHA1 Message Date
halx99 e2697b89be Sync from official-v4 pr 2020-08-14 18:57:08 +08:00
HALX99 6dd5552150
Merge pull request #160 from halx99/fix-157 
fix-157
 2020-08-13 23:47:13 +08:00
halx99 a0ca3487ed Cleanup unused code for min support iOS 2020-08-13 23:03:55 +08:00
halx99 b4f0ade233 fix-157 2020-08-13 22:35:41 +08:00
HALX99 e91244ed81
Merge pull request #158 from halx99/fix-156 
Simplify audio source again, merge audio sources
 2020-08-13 01:16:46 +08:00
HALX99 d4eea74a85
fix compile issue without alsoft 2020-08-13 00:41:30 +08:00
halx99 79dc84e3d7 fix ci android build issue. 2020-08-12 18:53:33 +08:00
halx99 1d35bd9d0a Tidy code 2020-08-12 18:40:04 +08:00
halx99 3e2161ea01 Simplify audio source again, merge audio sources 2020-08-12 17:00:07 +08:00
halx99 f88dfdc167 FreeType: Output missing char in .ttf at _DEBUG compiling mode 2020-08-12 14:24:06 +08:00
halx99 edc8424b45 Fix README_CN.md markdown format [skip travis][skip appveyor] 2020-08-10 16:12:35 +08:00
halx99 6969a2b189 Refine README 2020-08-10 16:05:29 +08:00
HALX99 bacc7dea66
Merge pull request #155 from halx99/fix-ninja 
Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja
 2020-08-10 15:52:45 +08:00
halx99 bcc00eaffe Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
halx99 0b728e076a Remove unnecessary code 2020-08-10 00:21:56 +08:00
halx99 adc97af519 Optimize YAsioTest, see #150 2020-08-10 00:20:29 +08:00
HALX99 a72a75886d
Merge pull request #154 from halx99/refine-cp-integrate 
Disable double use in chipmunk_types.h instead CMakeLists.txt
 2020-08-09 23:19:32 +08:00
halx99 0f1dcc86dc Disable double use in chipmunk_types.h instead CMakeLists.txt more stable for ENGX 2020-08-09 22:41:06 +08:00
HALX99 4162173dc3
Merge pull request #153 from aismann/patch-4 
Polygons looks correct now
 2020-08-08 16:44:47 +08:00
aismann c5f1e242e3
Polygon looks correct now 
Tested with Clipper 6.x and new poly2tri
 2020-08-08 09:57:17 +02:00
halx99 19b2c3366f Sync macro 2020-08-07 23:55:25 +08:00
halx99 175ee0fd18 By default, make cocos2d::log multi-threading safe 2020-08-07 23:52:41 +08:00
HALX99 8e89fb2b49
Merge pull request #152 from aismann/patch-3 
OpenGL 'works' better...
 2020-08-07 15:00:24 +08:00
aismann b7b2687758
OpenGL 'works' better... 2020-08-07 08:10:12 +02:00
halx99 44c6fbaf12 Naming style 2020-08-07 00:39:55 +08:00
halx99 4c56d6587e Sync optimize code 2020-08-06 19:58:24 +08:00
halx99 c85f1c469a Make CCValue compatible official cocos2d-x v3/v4 2020-08-06 19:39:50 +08:00
halx99 b6875eb8e0 Sync optimize code from v3 2020-08-06 17:37:34 +08:00
halx99 224ba0a812 Update build guide [skip appveyor] [skip travis] 2020-08-06 16:01:00 +08:00
halx99 4481e21bed Refine Android build guide 2020-08-06 15:45:59 +08:00
halx99 4eb4660c9d Reorder members of Node, sizeof(Node) decrease from 640 to 616 on 32bit application 2020-08-06 13:30:35 +08:00
halx99 816c3b2d79 Update readme [skip appveyor][skip travis] 2020-08-05 18:45:21 +08:00
halx99 528187a0fc python3 also works for CMake build system 2020-08-05 18:31:24 +08:00
halx99 2149ca640c Merge branch 'master' of https://github.com/c4games/engine-x into master 2020-08-05 18:12:31 +08:00
halx99 3cf637418f Update features [skip appveyor] [skip travis] 2020-08-05 18:11:52 +08:00
HALX99 137ded73a5
Merge pull request #145 from halx99/spine-3.8 
Sync spine code and resource to 3.8
 2020-08-05 02:38:59 -07:00
halx99 bda1fce2b1 fix console output error on win32, see #144 2020-08-05 17:30:30 +08:00
halx99 f38f76c1a1 Sync spine code and resource to 3.8 2020-08-05 17:04:57 +08:00
halx99 b84b3fe339 Update fairygui-tests project name for android 2020-08-05 16:33:13 +08:00
halx99 ef47ff48df Add missing console tool 2020-08-05 14:10:09 +08:00
halx99 90c18ad338 Sync fairygui-tests settings for ios 2020-08-05 13:33:31 +08:00
halx99 f6c3442537 Sync fairygui-tests settings for android 2020-08-05 13:32:14 +08:00
halx99 428ff263b3 Add missing optimize from v3 2020-08-05 13:10:37 +08:00
halx99 421cf7b1ad win32 cover wide API use, remove unused long getFieSize(const std::string&) 2020-08-05 12:24:31 +08:00
halx99 66a198ab2b utf-8 file path 2020-08-05 12:17:57 +08:00
halx99 0b89fe5f2b fix lua compile issue 2020-08-04 22:38:57 +08:00
HALX99 7cfda40e07
Finish dragonbones, all extensions can be remove one by one (#142) 
* Finish dragonbones, all extensions can be remove one by one, by default, all extensions are enabled
 2020-08-04 21:13:26 +08:00
halx99 f5c1b1a3df Refine readme [skip travis][skip appveyor] 2020-08-04 17:31:54 +08:00
halx99 1a4727dbc4 Refine typo [skip travis][skip appveyor] 2020-08-04 17:13:37 +08:00
halx99 2a175908c1 Refine typo 2020-08-04 16:57:52 +08:00