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

37917 Commits

Author SHA1 Message Date
halx99 dda5628876 Sync missing fixs from v3, see: https://github.com/cocos2d/cocos2d-x/pull/19240 2020-07-30 17:07:38 +08:00
halx99 58c4fb32c1 Sync fix from v3, see also: https://github.com/cocos2d/cocos2d-x/pull/20509 2020-07-30 10:59:50 +08:00
HALX99 aae79a55b0
Merge pull request #121 from halx99/fix-issue-120 
fix #120
 2020-07-29 11:30:11 -05:00
halx99 34d7f3d5c8 fix #120 2020-07-30 00:01:31 +08:00
HALX99 06600f4524
Merge pull request #118 from halx99/optimize-3rd-links 
Optimize link, remove -Wl,--whole-archive for linking 3rd libs.
 2020-07-29 06:28:10 -05:00
halx99 da7e235b25 Optimize link, remove -Wl,--whole-archive for linking 3rd libs. 2020-07-29 18:55:45 +08:00
HALX99 3580ff3f19
Merge pull request #117 from halx99/deps-49 
Update deps-49 use source build for chipmunk-7.0.3 to fix android compile issue
 2020-07-29 05:44:27 -05:00
halx99 03a7dbadbb fix chipmunk float precision mismatch on cmake script 2020-07-29 18:19:23 +08:00
halx99 6643bbbaa6 Update deps-49 to fix android compile issue 2020-07-29 17:59:10 +08:00
HALX99 e013223106
Merge pull request #116 from aismann/patch-1 
Update CCPhysicsDebugNode.cpp
 2020-07-28 19:29:42 -05:00
aismann 2f2f3f9961
Update CCPhysicsDebugNode.cpp 
class "cpShape" has no member "CP_PRIVATE"
 2020-07-28 21:29:08 +02:00
HALX99 af6cae61eb
fix mismatch of float precision of chipmunk 7.0.3 2020-07-29 00:21:31 +08:00
HALX99 1df3f3489b
Update config.json 2020-07-23 12:54:28 +08:00
halx99 d1cd05c0c8 Copy angle binaries 2020-07-23 10:32:50 +08:00
HALX99 06196f2b2c
Merge pull request #113 from halx99/try-cpp14 
Try cpp14
 2020-07-23 08:51:22 +08:00
halx99 ab4137aacc Try cpp14 2020-07-23 00:10:50 +08:00
halx99 2769ae46e2 Use default mini deployment target to ios 9.0 2020-07-23 00:03:53 +08:00
halx99 a735abaf65 Take care _programState use 2020-07-21 23:11:03 +08:00
halx99 d90aa8708f Remove unused 2020-07-21 23:09:40 +08:00
halx99 c67bc05127 Update cmake toolchain 2020-07-21 23:06:54 +08:00
halx99 b005629046 Merge branch 'master' of https://github.com/c4games/engine-x 2020-07-21 23:06:01 +08:00
halx99 7322e690eb fix compile issue on iOS 2020-07-21 23:05:25 +08:00
halx99 8588e46201 Update readme.txt 2020-07-21 20:13:44 +08:00
halx99 26fb5a596c Add ccs-res 2020-07-20 18:47:47 +08:00
halx99 20ebd388da Add console scripts & bindings-generator 2020-07-20 18:46:15 +08:00
halx99 a70b43af1e Remove a submodules. 2020-07-20 18:41:45 +08:00
halx99 41ad75bdb3 fix lua link error 2020-07-20 17:00:48 +08:00
HALX99 5686e15746
Merge pull request #109 from halx99/win-utf8 
Improve utf-8 path on win32, explicit call wide version of system API.
 2020-07-10 16:56:18 +08:00
HALX99 db0ed5bd59
Merge pull request #111 from halx99/fix-type-error 
fix type error, well xxhash never generate 0 for validate draw command.
 2020-07-10 16:42:57 +08:00
halx99 a3a65b0320 fix appveyor ci [skip travis] 2020-07-10 16:41:59 +08:00
halx99 87635cfa81 fix compile issue 2020-07-10 16:00:21 +08:00
HALX99 7624df74f3
Merge pull request #110 from halx99/fix-angle 
Correct feature test when use angle backend
 2020-07-10 15:56:41 +08:00
halx99 d20d3fd241 fix type error, well xxhash never generate 0 for validate draw command. 2020-07-10 15:55:31 +08:00
halx99 7b82d47fcf Correct feature test when use angle backend 2020-07-10 15:16:44 +08:00
halx99 c9e1df125a Improve utf-8 path on win32, explicit call wide version of system API. 2020-07-10 15:14:16 +08:00
HALX99 851d301574
Update README.md 2020-07-10 13:53:53 +08:00
halx99 e5815f9cd8 Adapte glfw-3.4 2020-07-03 11:08:39 +08:00
HALX99 96bbca0c53
Update README.md 2020-06-19 18:26:24 +08:00
HALX99 ef21740a4e
Merge pull request #108 from halx99/master 
Optimzie writeStringToFile
 2020-06-14 16:29:40 +08:00
HALX99 58403292cd
Merge pull request #107 from halx99/master 
Auto copy angle lib to target bin directory
 2020-06-14 16:23:58 +08:00
halx99 bfd1709ab7 Optimzie writeStringToFile 2020-06-14 15:54:55 +08:00
halx99 208bc9fe6f ios don't support thread local storage 2020-06-14 15:52:15 +08:00
halx99 786ad14b68 fix ios compile error 2020-06-14 13:58:29 +08:00
halx99 47966b8dfe update 3rds to v40 2020-06-14 12:53:32 +08:00
halx99 93a3452261 finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
HALX99 80f33f376c
Merge pull request #105 from halx99/master 
Support use google angle on windows.
 2020-06-12 13:33:29 +08:00
halx99 3d3fea28c6 Support use google angle support on windows. 2020-06-12 12:42:58 +08:00
HALX99 9c94103e53
Merge pull request #104 from halx99/master 
Sync some good PRs from official
 2020-06-12 12:32:46 +08:00
halx99 cd656f8b8b fix label not rendering 2020-06-12 11:34:02 +08:00
halx99 9da96e3e1a Sync from: https://github.com/cocos2d/cocos2d-x/pull/20531 2020-06-12 11:24:10 +08:00