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

38476 Commits

Author SHA1 Message Date
halx99 e0be836453 More clearly comment 2020-08-29 19:51:42 +08:00
halx99 ef755ba3ad More clearly comment for multi-textures support 2020-08-29 17:39:17 +08:00
halx99 59ef3e6ef0 Remove unused comment [skip appveyor][skip travis] 2020-08-29 16:59:15 +08:00
halx99 baa4447973 fix multi-texture2d support 2020-08-29 16:56:48 +08:00
halx99 06cf13d962 Remove cmake message print 2020-08-29 01:40:55 +08:00
halx99 2bc966efb6 fix #183 2020-08-29 01:39:27 +08:00
HALX99 0653090a62
Merge pull request #182 from halx99/leve-one-tmxlayermap 
Only leave one TMXLayer & TMXTileMap
 2020-08-28 03:13:36 -07:00
halx99 50fe831d7a fix ci 2020-08-28 17:26:30 +08:00
halx99 8b7505e171 Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 ae99a5965b Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 fa9b2c3fca Code improvement 2020-08-28 15:01:25 +08:00
minggo 56e0b77c8c close keyboard when Done is pressed (#20341) 
* close keyboard when Done is pressed
 2020-08-28 14:50:52 +08:00
HALX99 7a833d3b0a
Merge pull request #180 from halx99/ios-gles-backport 
Add switch renderer backend to GLES for iOS, win32
 2020-08-27 22:43:49 -07:00
halx99 1975ad1f94 Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS 2020-08-28 12:57:00 +08:00
halx99 9ae19df7e0 Improve listFiles for win32, use std::move avoid string deep copy 2020-08-28 11:05:32 +08:00
halx99 0fd2364429 fix #179 2020-08-28 11:04:14 +08:00
halx99 6bc615d2b9 Merge branch 'master' of https://github.com/c4games/engine-x into master 2020-08-27 17:37:49 +08:00
halx99 f36866a99b Make logical more clearly 2020-08-27 17:35:30 +08:00
HALX99 313a2ac09b
Merge pull request #176 from c4games/test 
Strange to fix .appveyor.yml does't work
 2020-08-27 00:22:48 -07:00
HALX99 75a210d696
Delete ios.toolchain.cmake 
Unused
 2020-08-27 14:12:11 +08:00
HALX99 946af43215
Update .appveyor.yml 2020-08-27 13:54:27 +08:00
halx99 888020a27f Update README [skip appveyor][skip travis] 2020-08-27 12:59:48 +08:00
halx99 2da09a01b9 Refine readme, remove unnecessary step for ios build guide 2020-08-27 12:51:35 +08:00
halx99 c1c3faf546 fix mssing sources 2020-08-27 12:44:30 +08:00
halx99 1c76fd48ce Make UserDefault encrypt/decrypt algorithm can be customlized 2020-08-27 12:37:20 +08:00
HALX99 33c5fe6553
Merge pull request #175 from halx99/freetype-stream-parsing 
Freetype stream parsing
 2020-08-26 21:26:22 -07:00
halx99 d4aa6900c3 By default, disable stream parsing 2020-08-27 11:40:44 +08:00
halx99 bf3a608c01 freetype stream parsing support, reduce memory use on FontCache 2020-08-27 11:35:55 +08:00
HALX99 f85c34acd9
Merge pull request #174 from halx99/rename-filestream 
Rename PXFileStream to CCFileStream
 2020-08-26 20:33:21 -07:00
halx99 c3b823586b Refine code style 2020-08-27 10:19:21 +08:00
halx99 26471dc766 fix ci compile 2020-08-27 00:49:07 +08:00
halx99 fe4d26cea1 Rename PXFileStream to CCFileStream 2020-08-27 00:21:44 +08:00
halx99 9e8ace195c fix compile warning and uninitialized member variable ActionTimeline::_loop 2020-08-26 15:26:06 +08:00
halx99 1f03e40b59 Merge branch 'master' of https://github.com/c4games/engine-x into master 2020-08-26 12:46:51 +08:00
halx99 6be52c29e7 Sync LayoutHelper APIs 2020-08-26 12:46:41 +08:00
HALX99 9d7d1e40fb
Merge pull request #172 from halx99/kill-api 
Add API 'utils::killCurrentProcess' to kill game immidiately
 2020-08-25 20:44:04 -07:00
halx99 d54f724f94 finish killCurrentProcess implementation on windows 2020-08-26 10:36:33 +08:00
halx99 3d1b042092 Add utils::killCurrentProcess API to kill game immidiately 2020-08-25 23:12:26 +08:00
HALX99 c596975a93
Merge pull request #171 from halx99/feature-170 
Add utils::createInstance to instead macro CREATE_FUNC
 2020-08-24 23:55:37 -07:00
halx99 1740c444f8 fix warning 2020-08-25 14:47:51 +08:00
halx99 5c850e00ac fix ci 2020-08-25 14:08:17 +08:00
halx99 d150e7cbc4 Add utils::createInstance to instead macro CREATE_FUNC 2020-08-25 13:49:45 +08:00
halx99 ccc4bcac63 Update al format enum 2020-08-24 19:04:08 +08:00
halx99 3727d13047 Update readme files [skip appveyor][skip travis] 2020-08-24 01:33:45 -07:00
halx99 a2751dc651 fix markdown format [skip appveyor] [skip travis] 2020-08-24 01:30:47 -07:00
halx99 c1604b8b91 Comment something 2020-08-24 01:28:55 -07:00
halx99 7cd25f5a66 Improve ios CMake scripts 2020-08-24 01:26:12 -07:00
HALX99 a501aaa189
Merge pull request #169 from aismann/patch-7 
Update README.md
 2020-08-24 00:34:38 -07:00
halx99 a8af2a9344 Improve engine CMakeLists.txt for ios 
benefit: Now engine can build without ios.toolchain.cmake,
because we solvoe follow issues:
a. fix cmake try_compile failed with arm device without
b. fix try_compile/compile will failed with device on armv7
c. fix thread local storage require:
   1. deployment target >= 9.0 (arm64)
   2. deployment target == 10.x (armv7)
 2020-08-24 15:31:45 +08:00
aismann 7e5bf653fb
Update README.md 
Typo fix
 2020-08-24 09:09:02 +02:00