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

41 Commits

Author SHA1 Message Date
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 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 a7011c2bcd Fix axslc sync 2023-08-21 13:39:56 +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
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 60bbd3b1a3 Auto pack axslc into android apk 2023-07-20 01:18:27 +08:00
CHP f729bce152 Increment PROP_MIN_SDK_VERSION to 21 (#1236) 2023-06-20 20:49:48 +08:00
Deal(涓€绾跨伒) bc82034ffd Improve media-engine for android, linux (#1228) 
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme

* Fix ci

* Improve code style

* Improve

* Update VlcMediaEngine.cpp

* Update AvfMediaEngine.h

* Fix ci

* Improve code style

* Enable androidx gradle.properties [skip ci]

* Improve code style

* Remove unnecessary callbacks

* Rename VideoPlayer to MediaPlayer
 2023-06-10 22:05:49 +08:00
halx99 fd88e2de3b Update AGP to 7.4.2, gradle to 8.1 2023-04-20 08:54:24 +08:00
halx99 517ffeedc6 Update project url in sources 2023-03-12 01:44:55 +08:00
Deal(涓€绾跨伒) 277bcd44ce Windows Store UWP apps support (#1108) 
* [BIG FEATURE] Windows Store UWP apps support

* Fix ci, add uwp for pr-ci

* Fix ci

* Improve ci script

* Fix ci

* Fix ci

* Fix ci

* Fix ci

* Upload uwp appx package artifacts [skip ci]

* Use d2d draw system font text

* Fix ci

* Improve code style
 2023-03-11 22:10:18 +08:00
halx99 b6ca5716c5 Fix android assets 2023-02-23 23:48:06 +08:00
RH 9c526c81e4 [Android] Update icons to Axmol logo (#1073) 
* Update Android icons in test projects.
 2023-02-23 23:43:51 +08:00
halx99 d742dceb9f Improve gradle scripts 
Add cmake options from gradle command line properties support
 2022-11-10 22:53:54 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 93550405bc Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 484aa38856 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
halx99 448c76c108 Update android target and compile sdk to android 12 2022-08-06 19:26:44 +08:00
halx99 b0eef2ef8d Fix live2d-tests 2022-08-02 22:03:54 +08:00
halx99 2f90855c0a Fix live2d_tests android build 2022-08-02 17:55:42 +08:00
halx99 5f04e88dc7 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
涓€绾跨伒 d8a66d4897 Merge: 61c159d3d0 932c3bcffa 
Merge pull request #668 from adxeproject/adxe-ext-live2d

Add extension Live2D support
 2022-06-24 16:23:26 +08:00
涓€绾跨伒 0e94f96b8a Merge: 6431cd1256 e4b891e550 
Merge pull request #667 from FireStorm2012/FireStorm2012-patch-1

Fix print log format
 2022-06-24 15:46:45 +08:00
halx99 e6accc2f7e Add extension Live2D support 
Live2D sdk version: 4-r.4, reelase date: 2021/12/09
 2022-06-24 15:18:08 +08:00