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

301 Commits

Author SHA1 Message Date
aismann 26d42ede1d Update README.md 2020-11-19 08:40:49 +01:00
halx99 61d82bf642 Merge: 1059485e52 44a02b7ea7 
Merge pull request #269 from aismann/patch-13

Update README.md
 2020-11-18 22:34:08 -08:00
aismann 04e1dfea60 Update README.md 2020-11-19 07:18:00 +01:00
aismann a96909d0a1 Update README.md 2020-11-19 06:48:12 +01:00
halx99 2281984f6e Merge: d162416f96 bb6ebc3628 
Merge pull request #265 from aismann/patch-11

Update README.md
 2020-11-18 04:05:31 -08:00
aismann 03d0aa03a6 Update README.md 
add some links
 2020-11-18 12:50:44 +01:00
aismann 0698ca89a9 Update README.md 
some more small stuff (hope thats all ;))
 2020-11-18 12:37:28 +01:00
halx99 4bfec74659 Merge: eeafffe2f1 1444881c7f 
Merge branch 'master' of https://github.com/c4games/engine-x
 2020-11-18 18:18:07 +08:00
halx99 349e435937 jni match natvie API param types 2020-11-18 18:17:55 +08:00
aismann b73e18cafc Update README.md 2020-11-18 09:55:19 +01:00
halx99 a1d1b21642 Merge: 7852cb21e5 45f1519638 
Merge branch 'master' of https://github.com/c4games/engine-x
 2020-11-16 22:38:59 +08:00
halx99 c17a21eb8c fix #262 2020-11-16 22:38:18 +08:00
halx99 b3ab1a075a Update README.md 2020-11-16 17:40:19 +08:00
halx99 d9fea356fc Since we don't support ios x86 simulator yet, set ios default min deployment target to 9.0 is ok 2020-11-15 21:46:24 -08:00
halx99 b23016612d Add license badge 2020-11-15 17:56:03 +08:00
halx99 0995d94239 Update README.md 2020-11-12 23:09:14 +08:00
halx99 86decdb9a9 Merge: 0a410dbf7f 44fb557458 
Merge pull request #258 from wtfdnvxk/patch-2

fix ios readme build device description
 2020-11-11 01:36:09 -08:00
halx99 f545b0d259 Merge: d1f0a287ac f5fcd5592c 
Merge pull request #257 from wtfdnvxk/patch-1

extend lua by register extensions
 2020-11-11 01:25:21 -08:00
wtfdnvxk 11f30dc4a0 fix ios readme build device description 
if none arch has been defined,then you can use "xcodebuild  -scheme "lua-empty-test" -sdk  iphonesimulator SYMROOT=." to compile the simulator ,or,You can use 'xcodebuild  -scheme "lua-empty-test" -sdk  iphoneos SYMROOT=.' to build in ios device銆?    The Xcode Architectures will show "Standard architecture"
 2020-11-11 17:06:03 +08:00
halx99 052558e83d Merge: 5da2894e1b f80a6ef25c 
Merge branch 'master' of https://github.com/c4games/engine-x into master
 2020-11-08 13:12:06 +08:00
halx99 c98313ac4b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 cd044a2240 Update README for xcode12 build simulator guide 2020-11-07 10:20:59 +08:00
halx99 40545ea81b Update cmake minimal requirement version [skip ci] 2020-10-25 19:12:13 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 38e7d4faab fix win32 badges for github ci 2020-10-24 18:54:39 +08:00
halx99 7b046814fc Migrate to github ci (#247) 2020-10-24 18:41:20 +08:00
halx99 b7fda375c5 Update readme [skip appveyor][skip travis] 2020-10-22 16:59:09 +08:00
halx99 253b82c617 Make setup.py works with python3 2020-10-22 16:53:28 +08:00
halx99 d5a937f70e Update cmake require version to 3.14 for vs2019 [skip appveyor][skip travis] 2020-10-22 11:35:52 +08:00
halx99 d0fe1c8ee1 Bump enter into alpha19 dev status 2020-10-22 11:07:57 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 16cde62341 Update appveyor badge url 2020-10-22 10:40:05 +08:00
halx99 04773c0d07 Sync rename engine 2020-10-22 10:23:41 +08:00
halx99 78ced146f3 Update dev version [skip appveyor][skip travis] (#237) 2020-10-16 20:23:14 +08:00
aismann 94212bc973 Update README.md 2020-09-22 12:14:39 +02:00
halx99 f4c59db36f Bump version, alpha17 is in developing [skip appveyor][skip travis] 2020-09-22 17:01:11 +08:00
halx99 5143f99bf6 Update readme files [skip appveyor][skip travis] 2020-09-08 15:53:56 +08:00
halx99 5a32491164 Update README.md 2020-09-04 17:03:46 +08:00
halx99 170d8eb0f5 test 2020-09-04 17:03:25 +08:00
halx99 4a9b2fb9b5 Merge: f2970e72de 8cad7319f6 
Merge pull request #188 from halx99/etc2-support

Add etc2 compressed texture support
 2020-09-01 00:16:01 -07:00
halx99 09cedf60b2 Improve images decoder 2020-08-31 21:04:47 +08:00
halx99 e96ae229dd Merge: 5ddc84bbee 539e5ca42c 
Merge pull request #189 from aismann/patch-8

Update README.md
 2020-08-31 04:27:33 -07:00
halx99 a87c0bba78 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
aismann 69b751a3fe Update README.md 
Some more better description what ENGX is.
 2020-08-31 12:44:52 +02:00
halx99 fa5d2d198b fix resources relative path to avoid test case crash on mobile 2020-08-31 17:39:29 +08:00
halx99 c338472df8 Move copyright notice to header [skip appveyor][skip travis] 2020-08-31 17:35:01 +08:00
halx99 477aa0c185 Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 8aa751dc2d Update readme files [skip appveyor] [skip travis] 2020-08-31 15:56:50 +08:00
halx99 b73d5603cf Update README [skip appveyor][skip travis] 2020-08-27 12:59:48 +08:00
halx99 e5753f40d6 Refine readme, remove unnecessary step for ios build guide 2020-08-27 12:51:35 +08:00
halx99 bf3457be53 Update readme files [skip appveyor][skip travis] 2020-08-24 01:33:45 -07:00
halx99 5d6582d815 fix markdown format [skip appveyor] [skip travis] 2020-08-24 01:30:47 -07:00
halx99 19a1018ef2 Comment something 2020-08-24 01:28:55 -07:00
halx99 86c70e429b Improve ios CMake scripts 2020-08-24 01:26:12 -07:00
halx99 8678f38feb Merge: a8af2a9344 7e5bf653fb 
Merge pull request #169 from aismann/patch-7

Update README.md
 2020-08-24 00:34:38 -07:00
halx99 3b770e4519 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 688d12662f Update README.md 
Typo fix
 2020-08-24 09:09:02 +02:00
halx99 92647d1a2f Enable strict try compile by default 
Since we solve try_compile failed with code sign for ios device
 2020-08-22 14:15:22 +08:00
aismann cd0b01ebc8 Update README.md 
Some more spelling issues
 2020-08-21 23:11:39 +02:00
halx99 598e15e088 fix markdown format [skip appveyor][skip travis] 2020-08-21 15:16:08 +08:00
halx99 e7bf4a1400 Simplfy xcode project generate with cmake-3.18.2 2020-08-21 15:11:54 +08:00
halx99 68a92b53a9 Update description [skip appveyor] [skip travis] 2020-08-20 09:15:25 +08:00
halx99 debc503226 Merge: 08fe49d438 9b860e8b6a 
Merge pull request #166 from aismann/patch-5

Update README.md (Some small spelling stuffs)
 2020-08-20 09:11:08 +08:00
halx99 7ff2ffa0b3 Make CustomCommand safe copyable and moveable 2020-08-19 11:42:32 +08:00
aismann f76bdd8258 Update README.md 
Same small spelling stuffs.
 2020-08-18 11:30:56 +02:00
halx99 5436cfdc96 Merge: 37ddd1cbfa 8c3c56d02d 
Merge pull request #164 from c4games/halx99-patch-1

Remove unnecessary options [skip appveyor] [skip travis]
 2020-08-18 13:06:30 +08:00
halx99 9eb32b634f Make core lib can be build as dll, fix link issue for external 2020-08-18 12:36:44 +08:00
halx99 c9882c195a Update README_CN.md 2020-08-18 12:11:04 +08:00
halx99 641b2e40f3 Sync fix from https://github.com/cocos2d/cocos2d-x/pull/20518 2020-08-18 12:09:56 +08:00
halx99 4af459896d Remove unnecessary options [skip appveyor] [skip travis] 2020-08-18 12:01:41 +08:00
halx99 8616f12b9f Update readme [skip appveyor] [skip travis] 2020-08-17 21:15:15 +08:00
halx99 10d51d0c22 Update CMake scripts 2020-08-17 19:18:18 +08:00
halx99 f0276f37ae Update README files [skip appveyor] [skip travis] 2020-08-17 19:09:54 +08:00
halx99 f4c03cbbe4 Update README files [skip appveyor] [skip travis] 2020-08-17 18:56:29 +08:00
halx99 f297db819b fix typo 2020-08-15 18:24:54 +08:00
halx99 ae01be16db fix typo 2020-08-15 18:23:36 +08:00
halx99 90f95b27db Update README 2020-08-15 18:17:03 +08:00
halx99 515bfecb2e Refine README 2020-08-10 16:05:29 +08:00
halx99 b456364167 Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
halx99 af8fa43c8c Disable double use in chipmunk_types.h instead CMakeLists.txt more stable for ENGX 2020-08-09 22:41:06 +08:00
halx99 a966a4c000 Refine Android build guide 2020-08-06 15:45:59 +08:00
halx99 9d81f124ff Update readme [skip appveyor][skip travis] 2020-08-05 18:45:21 +08:00
halx99 4f081e7aa9 python3 also works for CMake build system 2020-08-05 18:31:24 +08:00
halx99 4713580381 Update features [skip appveyor] [skip travis] 2020-08-05 18:11:52 +08:00
halx99 22c5adb343 Refine readme [skip travis][skip appveyor] 2020-08-04 17:31:54 +08:00
halx99 d8b277c319 Refine typo [skip travis][skip appveyor] 2020-08-04 17:13:37 +08:00
halx99 38dfdd358a Refine typo 2020-08-04 16:57:52 +08:00
halx99 94a2dfdf59 Updat readme [skip travis][skip appveyor] 2020-08-04 16:50:00 +08:00
halx99 94a2a6994c Macro and engine name alias 2020-08-04 14:53:59 +08:00
halx99 7a316f1787 Merge: 7b034c4d5f 88d6c48d98 
Merge pull request #138 from halx99/moduls

Modularize all optional extensions
 2020-08-03 20:23:36 -07:00
halx99 8b9a6bbbf1 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 1f05b4ec02 Add roadmap link [skip appveyor][skip travis] 2020-08-03 19:22:44 +08:00
halx99 16cf7d9ddc Add language switch button [skip appveyor][skip travis] 2020-08-03 19:17:26 +08:00
halx99 1e392c9dfe Refine readme [skip appveyor][skip travis] 2020-08-03 19:12:07 +08:00
halx99 cc30c296aa Merge: 7322e690eb 8588e46201 
Merge branch 'master' of https://github.com/c4games/engine-x
 2020-07-21 23:06:01 +08:00
halx99 818842671f fix compile issue on iOS 2020-07-21 23:05:25 +08:00
halx99 2875ec479f Update readme.txt 2020-07-21 20:13:44 +08:00
halx99 c0615a0447 Update README.md 2020-07-10 13:53:53 +08:00
halx99 42387191b5 Update README.md 2020-06-19 18:26:24 +08:00
halx99 abc5ca848b Merge: 40cb068201 2385f6847d 
Merge
 2020-05-06 15:43:55 +08:00
halx99 04a460705d finish issue: #85 2020-05-06 15:42:25 +08:00
halx99 220fba761c Update README.md 2020-04-20 12:10:21 +08:00
halx99 9707302386 Update readme 2020-02-23 23:00:14 +08:00
halx99 44800b0bd5 Update ci status 2020-02-23 22:31:31 +08:00
halx99 853e6b92e2 Update features status 2020-02-15 21:20:22 +08:00
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 d573dc14bc Update README.md 2020-02-11 21:03:22 +08:00
halx99 579eeb5e7b Merge: 33d3721c6a 33e765455c 
Merge pull request #47 from c4games/ios-build-guides

Update README.md
 2020-02-08 22:33:14 +08:00
halx99 9b3dfe29a7 fix ios openssl link error 2020-02-08 22:10:08 +08:00
halx99 b4a63a85c9 Update README.md 2020-02-08 21:55:36 +08:00
halx99 fcbc5afbb3 Merge: b39b6e9acb cffc332499 
Merge pull request #44 from halx99/master

Fix travis ci ios build issue
 2020-02-07 19:56:34 +08:00
halx99 b2f30327d7 Update ios cmake guide 2020-02-07 19:28:41 +08:00
halx99 e1d937bb1a Update README.md 2020-02-07 19:21:19 +08:00
halx99 dc05990b87 Update README.md 2020-02-07 19:04:26 +08:00
halx99 12e07bce14 Merge: 8a7a785137 38564c696d 
Merge pull request #43 from halx99/master

fix ci [fork:halx99-appveyor]
 2020-02-07 17:17:50 +08:00
halx99 25ec31f938 test iphoneos 2020-02-07 16:14:27 +08:00
halx99 c560d675bd Update appveyor status url 2020-02-07 15:41:05 +08:00
huizhen c1c6e13fea Merge: 45f1fb5265 70cb64854f 
Merge pull request #40 from halx99/master

Refactor UserDefault, cbc128 encrypt support.
 2020-02-07 12:07:10 +08:00
halx99 b32d0b0afe Refactor UserDefault, cbc128 encrypt support. 2020-02-06 23:30:33 +08:00
halx99 aa4d08eb3f Merge: ffcb65fdaa e10155bef4 
Merge pull request #39 from halx99/master

Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28:33 +08:00
weiwest 2acb59d377 add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 277120ead1 Refactor UserDefault, add plain mode for win32. 
plain mode: 760ms
binary mode: 11ms
 2020-02-06 21:15:15 +08:00
halx99 fcc061bc22 Add ios guide to readme. 2020-02-06 12:52:13 +08:00
huizhen 1fa510712e Merge: 30e21d3b08 21b378ead3 
Merge pull request #36 from halx99/master

Refactor UserDefault, use file mapping implementation.
 2020-02-06 12:23:44 +08:00
halx99 a91953ac1a Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
halx99 29f3ffc66e Merge: 8cb437601f 36f0d0b902 
Merge pull request #35 from weiwest/master

add windows android start guide
 2020-02-04 22:56:49 +08:00
halx99 7ad3f908b6 Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
weiwest 6e4f1fb65e add windows android start guide 2020-02-04 21:42:43 +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 fc5408144c Update README.md 2019-11-25 20:08:29 +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 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 62ea0eb963 Merge: 5f1a2b05a6 f2be8795ba 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 14:39:46 +08:00
halx99 347c6bf616 Sync 3rd 2019-11-25 14:38:12 +08:00
halx99 6cbf0df08b Update README.md 2019-11-25 13:12:51 +08:00
halx99 3a5de58258 Update README.md 2019-11-25 13:08:46 +08:00
halx99 68b7eb91c9 Update README.md 2019-11-25 10:28:17 +08:00
halx99 4608288059 Update README.md 2019-11-25 10:27:09 +08:00
halx99 e23d94e9ca Update README.md 2019-11-25 10:24:20 +08:00
halx99 4537004c72 Update README.md 2019-11-25 10:23:47 +08:00
halx99 b007596062 Add goals to readme 2019-11-25 10:22:58 +08:00
halx99 2c7a4f0c6a Rename README.md to README.ccv4.md 2019-11-25 10:20:29 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00