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

38330 Commits

Author SHA1 Message Date
coulsonwang 85ac704687 fix incorrect hash structure for RenderPipeline (#20373) 
* fix incorrect hash structure for RenderPipeline
 2019-11-30 16:54:50 +08:00
Saber Haj Rabiee 06804691c7 Fix to properly delete easingParams array (#20375) 2019-11-30 16:54:46 +08:00
HALX99 c42e5962a8
Merge pull request #15 from simdsoft/upto-deps-8 
update deps & optimize audio framework.
 2019-11-30 00:46:16 -08:00
halx99 35f2ec6897 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
halx99 87e7d3b62a fix compile issue 2019-11-30 14:32:18 +08:00
halx99 9bbc68cecd Sync audio header files 2019-11-30 14:21:36 +08:00
HALX99 7d88a0c665
Update config.json 2019-11-30 07:25:38 +08:00
HALX99 fafa3ab1ea
Merge pull request #14 from simdsoft/upto-deps-7 
update to deps-7
 2019-11-29 15:19:39 -08:00
HALX99 5a2e9e4930
Update run-script.sh 2019-11-30 07:08:58 +08:00
halx99 9c0ef83757 optimize 2019-11-30 06:55:32 +08:00
halx99 8ad51f748d Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-30 06:48:25 +08:00
HALX99 cfeaec9582
Update config.json 2019-11-30 06:19:15 +08:00
halx99 9807664441 fix indent 2019-11-30 06:17:33 +08:00
HALX99 4e671a97b9
Update run-script.sh 2019-11-30 06:15:54 +08:00
halx99 121e09ee0d ogg for ios 2019-11-30 06:11:17 +08:00
halx99 ded0e81e5a Use macro CC_BUILD_WITH_DRANGBONES to control whether build dragonbones, default is disabled. 2019-11-30 01:32:12 +08:00
HALX99 4c57458c48
Merge pull request #13 from simdsoft/fix-error 
fix xcode compile error
 2019-11-27 18:48:55 -08:00
HALX99 c1a0e57c41
Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
HALX99 c6479764cb
Merge pull request #12 from simdsoft/upto-deps-6 
update to deps-6
 2019-11-27 17:55:49 -08:00
HALX99 ed27ef3ea0
Update config.json 2019-11-28 02:52:43 +08:00
halx99 02c18d656a use S_ISREG to check is a regular file? 2019-11-27 15:41:30 +08:00
halx99 4a040efbf6 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 d716d9511e Remove unused function. 2019-11-27 14:44:30 +08:00
halx99 2a6cda73d7 don't convert path to utf-8 on win32 platform 2019-11-27 14:34:40 +08:00
HALX99 703a058aac
Merge pull request #11 from simdsoft/sync-v4 
Sync v4
 2019-11-26 08:49:56 -08:00
HALX99 f8e6c06286
Merge pull request #10 from simdsoft/v5-deps-5 
update deps to v5-deps-5
 2019-11-26 08:28:03 -08:00
Arnold cea283c489 fix appvenyor env (#20372) 2019-11-26 23:40:57 +08:00
coulsonwang abc25ae04a adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
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 8ff2ea18c2 fix update 2019-11-26 23:37:27 +08:00
HALX99 071a882533
update deps to v5-deps-5 2019-11-26 23:04:04 +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