Commit Graph

112 Commits

Author SHA1 Message Date
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
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 1f2f54f2ac Axmol console next (#1313) 2023-08-30 08:34:33 +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 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
halx99 7e9e5e38e8 Use pwsh for sync_folder 2023-08-27 01:18:48 +08:00
halx99 5183995a36 Merge: f9b6553e57 94be720d3f
Merge branch '1.x' into dev
2023-08-25 16:57:54 +08:00
halx99 2bf41d7d31 Fix ci 2023-08-25 16:57:38 +08:00
halx99 46f668b01b Remove render backend setLineWidth [skip ci]
Due to not all of GL and Metal support it, so remove it unify behavior
developers shouldn't relay on it
2023-08-25 16:49:08 +08:00
halx99 f525d6c726 Update docs 2023-08-25 16:46:32 +08:00
halx99 9720bc4356 Update glslcc to 1.9.3 2023-08-23 20:16:40 +08:00
halx99 66d68707f1 Improve GLES2 compatibility 2023-08-22 19:34:28 +08:00
halx99 bfe167121e Add cmake option AX_GLES_PROFILE
Valid value of AX_GLES_PROFILE: 0, 200, 300

By default, the AX_GLES_PROFILE is:

- android: 200, allow axmol apps runs on: API 17 Android 4.2+ devices
- winuwp: 300
- Win32/linux/osx/ios/tvos: 0

For ios/tvos, will forcing AX_GLES_PROFILE to 300 if AX_GLES_PROFILE not 0
2023-08-14 20:40:05 +08:00
Deal 9dc9e9adc7 Update android.yml 2023-08-13 23:58:18 +08:00
halx99 bd0e1fef4b Fix compile error 2023-08-13 22:09:02 +08:00
Deal 572bb2f700 Test use glad on android 2023-08-13 00:24:35 +08:00
Deal 1e603d09d7 Lock ndk revision to r23c 2023-08-12 11:04:53 +08:00
halx99 cdc8bb0b4c Refactor FileStream implementation 2023-08-11 14:42:41 +08:00
halx99 cc9cbcbff9 Merge: eba7fc17ba 6bbdc273f8
Merge branch 'main' into dev
2023-08-10 18:53:35 +08:00
halx99 46ed10dac3 Update yasio to v4.1.0 2023-08-10 18:36:45 +08:00
halx99 1ec408812f Fix cmake setup 2023-08-09 14:37:43 +08:00
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 4f1a428823 Improve build1k.ps1 2023-08-09 13:26:15 +08:00
halx99 48f6659b4b Improve build script 2023-07-31 12:07:10 +08:00
halx99 651d5570f6 Improve build1k.ps1 2023-07-31 10:35:45 +08:00
halx99 a7473d3baf Move optional tools to manifest.ps1 2023-07-29 15:48:48 +08:00
halx99 edee8af2a6 Fix metal render issues
- Fix metal uniform buffer alignment size
- Fix spine two color tint render for metal
- Update glslcc to 1.9.0
2023-07-27 18:21:16 +08:00
halx99 1b4c9bbec8 Auto compile app/Sources/shaders to axslc/custom 2023-07-19 23:41:16 +08:00
halx99 7bd3b57809 Improve code style 2023-07-19 21:12:25 +08:00
halx99 04c5505fa2 Fix glDisable state guard 2023-07-19 18:35:05 +08:00
Deal eae07123dc Refer to #1278 2023-07-19 09:10:46 +08:00
halx99 1c669912b5 More easy for dev 2023-07-17 20:51:28 +08:00
Deal 071d9aa8ea Remove gitter [skip ci]
It's only bakup IM room, discord is preferred
2023-07-17 12:39:19 +08:00
halx99 3ab3249700 Update glslcc to 1.8.1
Add dual outputs support, this is useful to handle normal map preprocessor
2023-07-16 14:14:41 +08:00
halx99 e34d02eb7d Fix build1k cmake setup 2023-07-15 01:17:15 +08:00
halx99 177c845cc6 Don't setup glslcc and include it in main branch 2023-07-15 00:54:20 +08:00
Deal(涓€绾跨伒) 4867fc8f2e Update pull_request_template.md (#1270) 2023-07-15 00:21:23 +08:00
halx99 42fcb1f86e glslcc workflow: metal init commit 2023-07-14 23:07:47 +08:00
halx99 9f4d142802 Improve build scripts 2023-07-12 12:15:27 +08:00
halx99 c50710b25c [build1k] Create differ build folder for cross target platforms
rules:
- host target: build_${buildArch}
- cross target: build_${buildTarget}_{buildArch}
2023-07-10 14:24:08 +08:00
halx99 235d8cb1ef Fix android sdk setup in plain new machine 2023-07-09 23:27:24 +08:00
Deal(涓€绾跨伒) cba35d2b77 [build1k] Fix ndk parent detect 2023-07-09 20:51:43 +08:00
halx99 c3823e8247 [build1k] Fix ndk parent folder detect 2023-07-09 20:42:51 +08:00
halx99 c6828a368e Improve setup script [skip ci] 2023-07-08 12:37:02 +08:00
halx99 2e3a0c8b70 [build1k] Allow overwrite manifest by script manifest.ps1 2023-07-07 19:32:57 +08:00
halx99 acc47b3281 Bump 1.1.0 2023-07-06 20:37:59 +08:00