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

37400 Commits

Author SHA1 Message Date
Arnold 45caf37c65 update submodule (#20362) 2019-11-26 23:40:51 +08:00
minggo 514834c4c0 use sprite to create editbox (#20371) 2019-11-26 23:40:48 +08:00
codetypes 4310342862 missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
HALX99 3cab821c25
Merge pull request #9 from simdsoft/fbs-fix 
fix compile issue caused by fbs
 2019-11-26 07:02:31 -08:00
halx99 259d67b60d fix ci warnings 2019-11-26 22:37:20 +08:00
halx99 37d2952958 fix missing includes 2019-11-26 22:17:57 +08:00
halx99 073ad46a73 change GLubyte to uint8_t 2019-11-26 18:40:39 +08:00
halx99 df81bffdd2 add missing include file 2019-11-26 18:07:51 +08:00
halx99 644eef9978 add missing include file 2019-11-26 17:51:16 +08:00
halx99 b434678189 fix compile issue caused by fbs 2019-11-26 16:37:39 +08:00
HALX99 73a63bb53b
Merge pull request #7 from simdsoft/fix-ud 
Remove tinyxml2, sync ios & android platform.
 2019-11-25 23:59:14 -08:00
halx99 08b8f087c2 Remove tinyxml2, sync ios & android platform. 2019-11-26 12:11:56 +08:00
HALX99 4bd8c03dba
Merge pull request #6 from simdsoft/GLenum_to_ALenum 
fix typo, GLenum to ALenum
 2019-11-25 20:09:33 -08:00
halx99 bf807f8969 fix prid 2019-11-26 10:21:21 +08:00
HALX99 8546d4d7e1
Update AudioEngineImpl.mm 2019-11-26 09:54:25 +08:00
HALX99 2f2633ec91
fix typo, GLenum to ALenum 2019-11-26 03:07:55 +08:00
HALX99 47c02393ad
Merge pull request #5 from simdsoft/update-deps-4 
update-deps-4
 2019-11-25 11:03:54 -08:00
HALX99 2caaa37ef8
update-deps-4 2019-11-26 02:50:00 +08:00
HALX99 8ce225fd0e
Merge pull request #4 from simdsoft/update-deps-3 
update external to v5-deps-3
 2019-11-25 10:48:18 -08:00
halx99 7efc643e54 fix ios compile issue, merge header AudioCache.h 2019-11-26 02:33:54 +08:00
HALX99 b723ae8edb
Update config.json 2019-11-26 01:37:28 +08:00
HALX99 9a1c67031a
Merge pull request #3 from simdsoft/update-readme 
Update README.md
 2019-11-25 09:36:20 -08:00
HALX99 8cb40c339a
Update ProgramStateRegistry.cpp 2019-11-25 21:23:29 +08:00
HALX99 9e7ffd7eaf
update deps to v5-deps-2 2019-11-25 21:13:58 +08:00
HALX99 9aeb04de4b
fix CMakeLists.txt for apple 2019-11-25 20:55:41 +08:00
HALX99 60662af671
skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 72c1f27ce4 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 20:26:43 +08:00
halx99 6078a4c922 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
HALX99 dcb1d57d46
Update README.md 2019-11-25 20:08:29 +08:00
HALX99 aad1a18a8f
Temporary disable auto luabindings push 2019-11-25 19:48:31 +08:00
HALX99 3c416b7a3f
Update .travis.yml 2019-11-25 19:26:08 +08:00
halx99 c25ff48270 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 18:51:05 +08:00
halx99 96f72d8532 Optimize CCDownloader, stop thread properly. 2019-11-25 18:50:50 +08:00
HALX99 62cf517836
Update README.md 2019-11-25 18:33:37 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 1bcac58aad fix AudioInfo construct. 2019-11-25 17:21:07 +08:00
halx99 3ef5ab500c Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 8729ecb461 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 17:06:24 +08:00
halx99 5f1dc7c748 Use toString instead. 2019-11-25 17:06:01 +08:00
HALX99 6000f7b796
Update README.md 2019-11-25 15:01:25 +08:00
HALX99 e1d1363da4
Update README.md 2019-11-25 14:59:57 +08:00
HALX99 0ed6d304f7
Add build status. 2019-11-25 14:59:33 +08:00
HALX99 764109d93e
Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 2c48f4e4f7 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 14:39:46 +08:00
halx99 5f1a2b05a6 Sync 3rd 2019-11-25 14:38:12 +08:00
HALX99 f2be8795ba
Update README.md 2019-11-25 13:12:51 +08:00
HALX99 dd95fc8914
Update README.md 2019-11-25 13:08:46 +08:00
HALX99 30dbdda988
Update README.md 2019-11-25 10:28:17 +08:00
HALX99 902d6f1f8b
Update README.md 2019-11-25 10:27:09 +08:00
HALX99 a1c4bc46eb
Update README.md 2019-11-25 10:24:20 +08:00