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

159 Commits

Author SHA1 Message Date
halx99 688447a524 Update badges 2021-12-28 21:50:41 +08:00
halx99 4be73844b6 Update badges 2021-12-28 21:32:25 +08:00
halx99 cf9f4b342b Update version 2021-12-28 21:28:04 +08:00
halx99 7e2672d308 Update README_CN.md 2021-12-16 19:04:17 +08:00
halx99 c463b0fac7 Update README files 2021-11-09 15:59:17 +08:00
halx99 8cb0adfa57 Update README_CN.md 2021-09-14 12:53:22 +08:00
aismann 0baf946df7 Merge: cbeeb8d8ab 3990cc765d 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 07:49:17 +02:00
aismann 6632c5c3f6 Debug 64bit build error 
Severity        Code    Description     Project File    Line    Suppression State
Error (active)  E0075   operand of '*' must be a pointer but has type "bool"    cpp-tests       D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp   153
 2021-08-27 07:47:22 +02:00
halx99 d6a54f02a0 Update Windows build status badge 2021-08-27 13:27:04 +08:00
halx99 7b5fc4e2a4 Update README_CN.md 2021-08-27 12:45:03 +08:00
halx99 98ab2f6041 Update README_CN.md 2021-07-17 16:14:16 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 41c8df71c5 Update readme 2021-07-09 10:31:04 +08:00
halx99 e58472901c Sync CMakeLists.txt and README files [skip ci] 2021-07-08 22:55:33 +08:00
halx99 4f85248c27 Update README_CN.md 2021-06-26 17:13:05 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 56da62d83b Update README_CN.md 2021-06-05 19:11:59 +08:00
halx99 5a9fe68c35 Update readme 2021-05-26 14:46:15 +08:00
halx99 ac180232bf Merge: 7f248efcee 0ffec3873a 
Merge pull request #354 from aismann/patch-1

'adxe'  always lowercase
 2021-05-19 11:42:41 +08:00
aismann 510867c4b3 'adxe' always lowercase 2021-05-19 02:15:21 +02:00
aismann 7745e2a12a 'adxe' always lowercase 2021-05-19 02:14:17 +02:00
halx99 7d307937ce Merge: 67404f2ae6 9b7458806c 
Merge branch 'master' of https://github.com/adxeproject/adxe
 2021-05-18 21:30:54 +08:00
halx99 0a660faaf5 plain glfw lib name 2021-05-18 21:30:42 +08:00
halx99 1128fc6cca Update README_CN.md 2021-05-18 20:24:21 +08:00
halx99 81ba4ec94d Fix readme reference 2021-05-18 20:23:43 +08:00
halx99 96cbcce4b0 Merge: 71ebb455a6 2dd4051cbb 
Merge branch 'master' of https://github.com/adxeproject/adxe
 2021-05-18 18:09:06 +08:00
halx99 63d249930b Add cmdline tools 2021-05-18 18:08:59 +08:00
halx99 501db1a209 Update readme 2021-05-18 16:51:46 +08:00
halx99 802c740c08 Update AndroidStudio required version to 4.2+ 2021-05-14 12:15:38 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 d31e10bcf4 Update readme [ci build] 2021-04-28 17:59:39 +08:00
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 32891603ee fix libjpeg-turbo can't build with combined archs 
such as (armv7,arm64)
 2020-12-02 20:45:06 -08:00
Acc 73f5334a3e Update README_CN.md 2020-12-01 12:17:09 +08:00
halx99 a189fb0613 Update README_CN.md 2020-11-19 23:38:05 +08: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 d3eb17324a Update README_CN.md 2020-11-16 17:41:12 +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 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 9f055fcc62 Update README_CN.md 2020-11-06 21:13:56 +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 74ad11d3d7 fix typo [skip appveyor][skip travis] 2020-10-22 15:35:02 +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
halx99 f4c59db36f Bump version, alpha17 is in developing [skip appveyor][skip travis] 2020-09-22 17:01:11 +08:00
halx99 edf938c450 fix typo [skip appveyor][skip travis] 2020-09-08 15:55:16 +08:00
halx99 5143f99bf6 Update readme files [skip appveyor][skip travis] 2020-09-08 15:53:56 +08: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
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 f53ddd2c4a Update README_CN.md 2020-08-30 00:28:20 +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 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 656f647ece Update readme [skip appveyor] [skip travis] 2020-08-18 14:53:47 +08: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 4813d73ceb fix typo [skip appveyor] [skip travis] 2020-08-17 21:16:27 +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 f51f17f99f Fix README_CN.md markdown format [skip travis][skip appveyor] 2020-08-10 16:12:35 +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 36577a4006 Update build guide [skip appveyor] [skip travis] 2020-08-06 16:01:00 +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