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

219 Commits

Author SHA1 Message Date
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 5fe25cb0aa fix README.md markdown syntax 2020-12-02 20:49:08 -08:00
halx99 32891603ee fix libjpeg-turbo can't build with combined archs 
such as (armv7,arm64)
 2020-12-02 20:45:06 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann 73b2b175d9 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
halx99 c7c58ae3cc Merge: 2c93318d37 58ddd6e085 
Merge pull request #294 from aismann/patch-1

Update README.md
 2020-12-01 02:12:41 -08:00
halx99 43f5a305c8 Merge: 079ecdbbec 5e249bf6f8 
Merge pull request #293 from aismann/master

Chipmunk2D and Box2D works together now (add two new classes) and FIX  ImGuiEXTTest window size problem
 2020-12-01 01:52:47 -08:00
aismann 18cc4a9eb4 Update README.md 
change wiki link:  https://github.com/c4games/engine-x-wiki
 2020-12-01 10:32:09 +01:00
aismann 1239c3c8da Update README.md 
one 'OpenAL Soft' forgotten, fixed
 2020-11-26 07:27:47 +01:00
halx99 d121a3ccf8 Merge: 1d4b5470de 3d3e099e26 
Merge pull request #279 from aismann/patch-1

Update README.md
 2020-11-25 22:23:28 -08:00
aismann 47d7c19448 Update README.md 
small corrections
 2020-11-26 06:16:33 +01:00
aismann ac7d188b65 Update README.md 
small improvements
 2020-11-26 06:15:20 +01:00
halx99 b14d9a7eb3 Update README.md 2020-11-19 23:37:19 +08:00
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