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

3435 Commits

Author SHA1 Message Date
halx99 ec9b7f6e42 Merge: 1d4deae63a 7399ac41a6 
Merge branch '1.x' into dev
 2023-09-01 01:07:15 +08:00
halx99 ab14286193 Fix cmake setup for linux 2023-09-01 01:06:58 +08:00
halx99 0094c6bbb2 keep files for site build [skip ci] 2023-08-31 22:08:50 +08:00
halx99 2566feff5a Merge: 6e1be139bd 1d26aa28a5 
Merge branch '1.x' into dev
 2023-08-31 21:20:23 +08:00
halx99 12bb1eb62a Improve axmol site build 2023-08-31 21:20:01 +08:00
halx99 b50c629307 Merge: bdf976681e 82679fca74 
Merge branch '1.x' into dev
 2023-08-31 19:56:21 +08:00
halx99 a91e23ca11 Fix linux build 2023-08-31 19:44:24 +08:00
Deal c8d0fb85ea Fix linux build 2023-08-31 18:59:12 +08:00
halx99 0952acea6a Merge: 4fe5dd55e7 cc826cb6ae 
Merge branch '1.x' into dev
 2023-08-31 18:14:46 +08:00
halx99 b97b1a5630 Fix ci 2023-08-31 18:14:26 +08:00
halx99 06d51ac961 Merge: d3f55e0472 8e723b0cc9 
Merge branch '1.x' into dev
 2023-08-31 18:09:23 +08:00
halx99 4a52c781a2 Fix ci 2023-08-31 18:07:23 +08:00
halx99 09db3594f2 Merge: 3d97d1bcc1 0a63a8e364 
Merge branch '1.x' into dev
 2023-08-31 17:57:36 +08:00
halx99 a3a117ad2d Update script permision 2023-08-31 17:57:19 +08:00
halx99 449a596f3e Merge: fd2cbdc331 a816a8ac64 
Merge branch '1.x' into dev

# Conflicts:
#       README.md
#       README_CN.md
#       install-pwsh.sh
#       tools/console/axmol
 2023-08-31 17:56:09 +08:00
halx99 c2e55c4cdc Merge console-next from dev into 1.x 2023-08-31 17:48:39 +08:00
halx99 bdcb81ce3d Move sync_folder.ps1 to cmake/ 2023-08-31 17:00:16 +08:00
Deal fbf3bdbf7d Improve install-pwsh.sh [skip ci] 2023-08-31 12:40:45 +08:00
Deal de6d333b6c Fix install-pwsh.sh syntax [skip ci] 2023-08-31 12:38:53 +08:00
Deal 6d52b97ae8 By default, use ANGLE on win32 2023-08-31 12:33:29 +08:00
halx99 7f973f1c9e Update freetype: 2.13.0 ==> 2.13.2 2023-08-30 21:04:04 +08:00
Deal f7a7517f4f Update README_CN.md 2023-08-30 19:47:04 +08:00
Deal 0ddf2949e5 Update README.md 2023-08-30 19:41:44 +08:00
halx99 cce6c2f8e1 Improve code style 2023-08-30 19:35:38 +08:00
halx99 c8331a7656 Improve axmol console 2023-08-30 18:46:36 +08:00
halx99 6f10f5bbc9 Improve CMakeLists.txt 2023-08-30 18:34:28 +08:00
halx99 acdc28f566 Improve CMakeLists.txt 2023-08-30 17:29:53 +08:00
halx99 85abfeb885 CI: python no longer require for building 2023-08-30 17:12:16 +08:00
halx99 f42988ae5b Improve setup scripts 2023-08-30 16:02:16 +08:00
halx99 68611e902d Remove linux dependent: libbsd 2023-08-30 15:13:35 +08:00
halx99 3b2491ea9d Improve setup [skip ci] 2023-08-30 12:55:19 +08:00
Deal 75fb18201f Update setup.ps1 2023-08-30 09:47:43 +08:00
Deal b0407578c3 Fix deb distro detect in setup.ps1 2023-08-30 09:45:18 +08:00
Deal 1f2f54f2ac Axmol console next (#1313) 2023-08-30 08:34:33 +08:00
Deal 2c39ae123d Update pull_request_template.md [skip ci] 2023-08-30 02:54:53 +08:00
halx99 33bb9c1334 Move cmake/Modules/* to cmake/* 2023-08-28 13:47:24 +08:00
Deal 8fd54896a6 Delete cmake/images directory 2023-08-28 10:41:08 +08:00
halx99 026f00fcd1 Fix ci 2023-08-28 09:44:59 +08:00
halx99 7c5825364d Fix ci 2023-08-28 09:34:54 +08:00
halx99 a80f0da7ba Fix #1310, don't specify CMAKE_OSX_SYSROOT 
By default this is automatically determined from PLATFORM and xcodebuild,
and can also be manually specified, but if specify for simulator, the
`General` tab will missing on xcode
 2023-08-27 23:25:40 +08:00
halx99 261c545a3b Improve cmake script 2023-08-27 23:21:35 +08:00
halx99 0ab4e6a544 build1k: Add `-nb` to generate native project only 2023-08-27 23:21:22 +08:00
halx99 eb00904650 Improve sync_folder.ps1 2023-08-27 13:01:07 +08:00
halx99 771ddf5503 Auto sync axslc for apps link with prebuilts 2023-08-27 12:39:46 +08:00
Deal 7eec87f437 Update AXBuildSet.cmake 2023-08-27 09:32:07 +08:00
halx99 7e9e5e38e8 Use pwsh for sync_folder 2023-08-27 01:18:48 +08:00
halx99 0021a69d03 Remove early feature mark 2023-08-26 22:50:18 +08:00
halx99 48209e9203 Improve FileStream API qualifier 2023-08-26 16:53:01 +08:00
halx99 854fb8fb5c Update prebuilt url 2023-08-26 11:46:25 +08:00
halx99 e6a48e8f86 Update ImGui to 1.89.8 2023-08-26 11:24:11 +08:00