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

3733 Commits

Author SHA1 Message Date
halx99 51383683ce Merge: 9807664441 4e671a97b9 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-30 06:48:25 +08:00
halx99 7af7b6494c Update config.json 2019-11-30 06:19:15 +08:00
halx99 45dbdc8c7d fix indent 2019-11-30 06:17:33 +08:00
halx99 f66674ab9c Update run-script.sh 2019-11-30 06:15:54 +08:00
halx99 17ffccfdf4 ogg for ios 2019-11-30 06:11:17 +08:00
halx99 9bb13d379d Use macro CC_BUILD_WITH_DRANGBONES to control whether build dragonbones, default is disabled. 2019-11-30 01:32:12 +08:00
halx99 7d183d5a39 Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
halx99 cce30823f7 use S_ISREG to check is a regular file? 2019-11-27 15:41:30 +08:00
halx99 ac789dbf81 a. use win32 api to get fie size; b. use int64_t for file size, c. use stat to check whether file exist for android platform. 2019-11-27 15:09:45 +08:00
halx99 9d53924e4c Remove unused function. 2019-11-27 14:44:30 +08:00
halx99 db27a92625 don't convert path to utf-8 on win32 platform 2019-11-27 14:34:40 +08:00
halx99 d5af773970 Merge: f8e6c06286 cea283c489 
Merge pull request #11 from simdsoft/sync-v4

Sync v4
 2019-11-26 08:49:56 -08:00
halx99 217962e748 Merge: 3cab821c25 8ff2ea18c2 
Merge pull request #10 from simdsoft/v5-deps-5

update deps to v5-deps-5
 2019-11-26 08:28:03 -08:00
Arnold 69b9b1fe4d fix appvenyor env (#20372) 2019-11-26 23:40:57 +08:00
coulsonwang 832ae29932 adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
codetypes 7969eabbed missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 c59a63d273 fix update 2019-11-26 23:37:27 +08:00
halx99 1dde48bebd fix ci warnings 2019-11-26 22:37:20 +08:00
halx99 1cd5dc4c1b fix missing includes 2019-11-26 22:17:57 +08:00
halx99 5cd834809f change GLubyte to uint8_t 2019-11-26 18:40:39 +08:00
halx99 009aa54a0b add missing include file 2019-11-26 18:07:51 +08:00
halx99 09ab1e75d0 add missing include file 2019-11-26 17:51:16 +08:00
halx99 8060560313 fix compile issue caused by fbs 2019-11-26 16:37:39 +08:00
halx99 dd0669b99b Merge: 4bd8c03dba 08b8f087c2 
Merge pull request #7 from simdsoft/fix-ud

Remove tinyxml2, sync ios & android platform.
 2019-11-25 23:59:14 -08:00
halx99 dad6499592 Remove tinyxml2, sync ios & android platform. 2019-11-26 12:11:56 +08:00
halx99 15e690ec7e fix prid 2019-11-26 10:21:21 +08:00
halx99 0e94bc8139 Update AudioEngineImpl.mm 2019-11-26 09:54:25 +08:00
halx99 8e3ecda6f3 fix typo, GLenum to ALenum 2019-11-26 03:07:55 +08:00
halx99 4457c26a7e fix ios compile issue, merge header AudioCache.h 2019-11-26 02:33:54 +08:00
halx99 ada10077b5 Merge: 72c1f27ce4 8cb40c339a 
Merge pull request #3 from simdsoft/update-readme

Update README.md
 2019-11-25 09:36:20 -08:00
halx99 6dc19cfbae Update ProgramStateRegistry.cpp 2019-11-25 21:23:29 +08:00
halx99 fa1b56e251 fix CMakeLists.txt for apple 2019-11-25 20:55:41 +08:00
halx99 00ededdbb4 skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 ba2b8b3b6d Merge: 6078a4c922 aad1a18a8f 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 20:26:43 +08:00
halx99 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 fc5408144c Update README.md 2019-11-25 20:08:29 +08:00
halx99 cf15088dd5 Temporary disable auto luabindings push 2019-11-25 19:48:31 +08:00
halx99 a72ed0c814 Update .travis.yml 2019-11-25 19:26:08 +08:00
halx99 e933eaf3c8 Merge: 96f72d8532 62cf517836 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 18:51:05 +08:00
halx99 bf392e7fa0 Optimize CCDownloader, stop thread properly. 2019-11-25 18:50:50 +08:00
halx99 f23369c9c5 Update README.md 2019-11-25 18:33:37 +08:00
halx99 0536b38509 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 d1982f7c00 fix AudioInfo construct. 2019-11-25 17:21:07 +08:00
halx99 075aadee32 Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 521ff411a5 Merge: 5f1dc7c748 6000f7b796 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 17:06:24 +08:00
halx99 5faf15e10f Use toString instead. 2019-11-25 17:06:01 +08:00
halx99 c088760389 Update README.md 2019-11-25 15:01:25 +08:00
halx99 782fa35963 Update README.md 2019-11-25 14:59:57 +08:00
halx99 d2a10cd495 Add build status. 2019-11-25 14:59:33 +08:00
halx99 f59bcb1ab0 Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00