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

1145 Commits

Author SHA1 Message Date
halx99 99cdafb661 Fix adxe new lua project issue 2021-05-25 21:56:21 +08:00
halx99 1f4653ed7a Delete issue_template.md 2021-05-25 14:01:52 +08:00
halx99 75f58d1d46 Update issue templates 2021-05-25 14:01:16 +08:00
RH 4e24a8d5a9 Fix for incorrect COCOS_COMMAND path (#357) 2021-05-24 23:15:06 +08:00
halx99 e220ecd7a5 Fix pull-request linux ci 2021-05-24 21:43:06 +08:00
halx99 84a8ec8e2e Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 6c558db560 Update README.md 2021-05-24 17:54:18 +08:00
halx99 25b88ff40b Fix ci [ci build] 2021-05-24 17:20:28 +08:00
halx99 93dee537b7 Also build lua-tests on win32 [ci build] 2021-05-24 16:41:39 +08:00
halx99 6ff9a28f78 Better code style 2021-05-24 13:26:56 +08:00
halx99 65b2b8f65d Merge: 75a07cbaad b46e127cc9 
Merge pull request #355 from aismann/patch-2

'adxe' always lowercase
 2021-05-19 11:42:53 +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 4ebc4e48c7 Update CCDevice-win32.cpp 2021-05-18 23:52:25 +08:00
halx99 ba7e7ff84a Fix charset process for fontName on win32 [ci build] 
Since we use freetype, never needs create ttf font by win32 API
 2021-05-18 23:50:23 +08: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 8b9a5acdf9 Fix lua include header 2021-05-18 19:56:36 +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 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 93173d860b Replace jcenter with mavenCentral [ci build] 2021-05-15 12:15:38 +08:00
halx99 e367689ca9 Gradle Plugin no longer support cmake 3.10.0+ 2021-05-15 11:58:56 +08:00
halx99 07a2d3f81f Add some comment 2021-05-15 11:54:17 +08:00
halx99 821492ad8d Fix linux ci 2021-05-15 01:00:20 +08:00
halx99 7aaeb8007d Fix ci [ci build] 2021-05-15 00:44:30 +08:00
halx99 4d7d323eb3 Fix ci [ci build] 2021-05-15 00:33:38 +08:00
halx99 4a12425a1b Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 dba89b7362 Fix warning [ci build] 2021-05-14 20:50:59 +08:00
halx99 802c740c08 Update AndroidStudio required version to 4.2+ 2021-05-14 12:15:38 +08:00
halx99 b68f7b8948 Update gradle stubs [ci build] 
a. wrapper  to  6.9
b. plugin to 4.2.0
 2021-05-14 12:11:19 +08:00
halx99 3076a97908 Update ios.mini.cmake 2021-05-14 08:22:46 +08:00
halx99 413b0acaa6 Fix #352 [ci build] 2021-05-12 11:18:31 +08:00
halx99 64a1d68d6f Fix cmake issue [ci build] 
Avoid cause check_include_file return unexpected result.
 2021-05-11 23:48:15 +08:00
halx99 a93fbb4d37 Add missing dep [ci build] 2021-05-11 12:23:35 +08:00
halx99 905d101dd8 Fix linux build action [ci build] 
We simply upgrade to ubuntu-20.04 since github action ubuntu-18.04 broken on 2021.5.1X
 2021-05-11 11:30:00 +08:00
halx99 60521eaf68 Fix linux build action [ci build] 
https://github.com/actions/virtual-environments/issues/323
 2021-05-11 10:45:18 +08:00
halx99 c7906e4438 Fix linux ci [ci build] 2021-05-11 09:45:42 +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 fdf0ebc97f Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
halx99 ae66271ef9 Update install-deps-linux.sh 2021-04-29 10:24:32 +08: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
halx99 30ca89005f Update setup_android.py 2021-04-28 17:56:40 +08:00