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

204 Commits

Author SHA1 Message Date
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 f63932bb91 Update ios GLES to GLES3 2023-08-09 22:25:15 +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
halx99 94b5705bd3 Improve cmake script 
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
 2023-07-06 19:21:36 +08:00
halx99 0d5addaf39 Update setup.py to setup.ps1 in cmake [skip ci] 2023-07-06 14:00:21 +08:00
Deal(涓€绾跨伒) 8a981d7242 Almost pwsh for ci (#1244) 2023-06-29 19:46:52 +08:00
CHP f729bce152 Increment PROP_MIN_SDK_VERSION to 21 (#1236) 2023-06-20 20:49:48 +08:00
halx99 359ba3ab8b Migrate templates includes 2023-06-11 17:42:53 +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
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159) 
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
 2023-04-02 16:04:19 +08:00
halx99 42567d0c98 Update ios splash images [skip ci] 2023-03-21 19:40:55 +08:00
halx99 760c59ab6e [UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets 2023-03-12 17:57:54 +08:00
RH 3f6847ebf0 Set default project in Visual Studio for UWP (#1111) 2023-03-12 12:34:51 +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
RH 14ccdfcffa [Apple] Fix for missing resources (#1092) 
* [Apple] Ensure resources are mapped to the expected directory by iOS and MacOS targets
 2023-03-03 21:53:18 +08:00
Deal(涓€绾跨伒) b06c60dfe5 Update lua debug project files 2023-02-24 04:31:05 +08:00
halx99 b377f1238e Tidy lua-template-default 2023-02-24 00:17:36 +08:00
halx99 b6ca5716c5 Fix android assets 2023-02-23 23:48:06 +08:00
Deal(涓€绾跨伒) 83d53ba46b Tidy project tree and full symlink support (#1072) 
* Tidy project file tree and all symlink support
 2023-02-23 21:57:30 +08:00
RH a8b02df98a Update app icon to Axmol logo (#1070) 
* [iOS] Axmol logo

* [Windows] Add Axmol logo as icon
Replace old logos in test resources with Axmol logo

* [tvos] Update to Axmol logo

* Update iOS and tvOS app logo

* Update cpp template app logos

* Fix resources for iOS and tvos. Update to new Axmol logo.
 2023-02-23 13:07:12 +08:00
halx99 452754981a [CMake] Add symlink support, refer to #1005 
- Rename ax_<xxx>_copy_xxx to ax_<xxx>_sync_xxx
- Add optional arg `SYM_LINK`
 2023-02-22 23:37:32 +08:00
CHP 8d36190c98 Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08:00
halx99 50447f3003 Update logo [skip ci] 2022-12-17 16:32:20 +08:00
halx99 176d4384b3 Remove unnecessary cmake include 2022-12-17 14:32:20 +08:00
AsakuraMizu 0f32899747 experimental linux prebuilt support 2022-11-17 22:25:13 +08:00
halx99 d742dceb9f Improve gradle scripts 
Add cmake options from gradle command line properties support
 2022-11-10 22:53:54 +08:00
halx99 a2a3bbe6c4 Migrate namespace for templates [skip ci] 2022-10-19 13:17:18 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
Paulo Coutinho f5aeb5a8c2 Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
halx99 87f71ba3a9 Migrte lua script files 2022-08-15 16:28:32 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 5b8cb6995c Migrate lua template [skip ci] 2022-08-11 15:28:32 +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 5f04e88dc7 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +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
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 519eef7cc4 Fix project creation tools. [skip ci] 2022-07-08 07:27:10 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 0e300d7d3e Improve project template [skip ci] 2022-06-24 03:09:20 +08:00
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00
涓€绾跨伒 03c8056078 Merge: 5138d701d6 5c35eda3b9 
Merge pull request #650 from adxeproject/ndk-r23c

Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 9bf295d8e4 Upgrade android toolsets 
- ndk to r23c
- gradle plugin to 7.2.0
- gradle wrapper to 7.4.2
- config ndk ver at adxetools.gradle
 2022-06-11 16:16:47 +08:00
Turky Mohammed d0b551d26b Merge: 6e1d48835e 193ed82788 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 16:55:30 +03:00
DelinWorks 5239256b13 Improve particle RNG and add useful functions 
Replaced M11 RNG with KISS RNG which is better and fixes a problem with particle strafing, added the ability to pause the entire particle system (useful for pause menus) and ability to control particle system time speed multiplier 馃挭馃ザ
 2022-05-23 16:04:09 +03:00
halx99 71c27f43d8 Fix ios device install problems 
- lua template missing `CFBundleExecute`
- Use `_` instead tests project to avoid unknown error
 2022-05-23 17:03:07 +08:00
halx99 349a53fce6 Improve cmake scripts 2022-05-19 10:54:42 +08:00
halx99 98294c911a Fix cmake link 2022-05-18 22:27:43 +08:00
halx99 0811b361a6 Fix app link with prebuilt msedge webview2 2022-05-18 12:49:12 +08:00
涓€绾跨伒 fc374633b0 Delete unused code 2022-05-17 11:32:43 +08:00
halx99 429918baa9 Fix lua template duplicate res error on mac 
Fix typo

Fix cmdline fail on new macos
 2022-05-15 16:36:06 +08:00
halx99 680f14a5e2 Improve VS Ninja workflow 2022-04-28 11:43:59 +08:00
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00
halx99 fbd892677a Sync zlib file name for templates 2022-04-23 09:01:34 +08:00
halx99 d9a113741e Fix libc++_shared.so not found in old devices(API 22) 2022-04-05 11:45:59 +08:00
halx99 da18a94e7e Improve optional libs linking on non-win32 platforms 2022-04-02 14:03:46 +08:00
halx99 1b0d6d0873 Improve use prebuilt engine libs for windows 
a. Fix msedge webview2 include for win32
b. Fix msedeg webview2 linking for apps which use prebuilt libs
c. Improve optional libs linking for apps which use prebuilt libs
d. Auto build optional libs which not dependent by engine, such as yaml-cpp
 2022-04-02 13:50:53 +08:00
halx99 5e893f3b4d Update project urls 2022-02-24 18:45:25 +08:00
halx99 cb6035d6a7 Fix use prebuilt engine libs for win64 2022-02-22 19:09:34 +08:00
halx99 8e4a97c469 Finish #564 
Add new cmake variable:

- AX_PREBUILT_DIR: specific engine build directory relative to ADXE_ROOT, such as "-DAX_PREBUILT_DIR=build_x86"
 2022-02-20 17:07:13 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 6a00ee1017 Improve run.bat.in 2022-02-09 11:50:06 +08:00
deal 77be82dfd2 Update run.bat.in 2022-02-08 23:18:15 +08:00
halx99 b500212314 Improve run.bat.in, use relative build dir 2022-02-07 20:36:44 +08:00
halx99 392ca76e05 [Android] Upgrade MIN_SDK_VERSION from 16 to 17 2022-01-30 20:38:01 +08:00
halx99 1ca9505fdc [Android] By default, build single arch: arm64-v8a 2022-01-30 20:36:41 +08:00
halx99 6131b237b2 [Android][freetype] Change streamingParsingEnabled to true 
Add noCompress config to build.gradle for all templates & tests project

Exists project, please add follow config

android {

// Other configs
// ...

// noCompress config
aaptOptions {
noCompress 'mp3','ogg','wav','mp4','ttf','ttc'
}

}
 2022-01-29 14:54:32 +08:00
halx99 231ba0cf5c Improve gradle script to find cmake 2022-01-28 18:25:50 +08:00
halx99 54be4a1732 Fix gradle wrapper url 2022-01-28 13:41:18 +08:00
halx99 0f212a69c8 Update recommend android studio and gradle 
- Android Studio 2021.1.1+ (More intelligent)
- Gralde wrapper to 7.2: https://services.gradle.org/distributions/gradle-7.2-bin.zip.zip
- Gradle Plugin to 7.1: com.android.tools.build:gradle:7.1.0

These upgrades will fix the issue: #573
 2022-01-28 12:47:05 +08:00
halx99 61646f5550 Update gradle wrapper to 6.9.2 2022-01-27 18:44:59 +08:00
halx99 cd98e6c880 Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 74271f207b Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00
deal f32280ff42 Merge: 687d15f16e 369de31853 
Merge pull request #560 from adxeproject/ahead

Merge ahead to dev
 2021-12-31 12:12:40 +08:00
halx99 64d7b55366 Update ci branch name 2021-12-31 11:00:35 +08:00
halx99 8710707a3e Fix android ci 2021-12-29 13:44:39 +08:00
deal a813aac10e Merge: 6639f55c0f bec2e07a00 
Merge pull request #561 from adxeproject/dev

Merge Crash Fix #559 from dev
 2021-12-28 21:27:32 +08:00