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

46 Commits

Author SHA1 Message Date
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
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 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 bf392e7fa0 Optimize CCDownloader, stop thread properly. 2019-11-25 18:50:50 +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 f59bcb1ab0 Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 a56cddfefe Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 442012b525 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 2b5ce77ac7 lua53 compat, both lua51, lua52, luat3, luajit are supported. 2019-11-25 01:59:08 +08:00
halx99 8333e4c06e Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-24 23:16:11 +08:00
halx99 441e1f1283 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 8706af9878 Remove unused log. 2019-11-24 21:02:41 +08:00
halx99 4d92a64c03 Use xsxml for sax parser, rapidxml could be removed 2019-11-24 21:01:15 +08:00
halx99 f2159823ed Remove xxtea. 2019-11-24 19:17:23 +08:00
halx99 08b05240ab Remove websockets, sync lua bindings. 2019-11-24 19:16:13 +08:00
halx99 7856224ff2 Refactor CCDownloader, use curl for all platforms. 2019-11-24 15:43:28 +08:00
halx99 06664e442f Remove websockets. 2019-11-24 15:08:59 +08:00
halx99 dc5d2230c0 Refactor AudioEngine, fix compile issue. 2019-11-24 15:07:48 +08:00
halx99 f176bb0803 Refactor AudioEngine implementation, use OpenAL for all platforms. 2019-11-24 14:54:45 +08:00
halx99 3bb4edfbf9 Merge: 179ec6ed67 e9305431da 
Merge pull request #13 from cocos2d/v4

sync V4
 2019-11-23 20:20:02 -08:00
halx99 de90f4693b fix edit box position error (#20358) 2019-11-24 00:27:19 +08:00
halx99 b9d52cc264 fix ci error 2019-11-23 21:25:17 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00