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

89 Commits

Author SHA1 Message Date
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
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
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 6a00ee1017 Improve run.bat.in 2022-02-09 11:50:06 +08:00
deal 9b84a46b12 Fix run.bat path 2022-02-08 23:17:06 +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
halx99 13927aa1bc Fix #559, match number type for get CURLINFO_RESPONSE_CODE 
a. On linux x64, will crash with stack protector

Reported by @rh101

Signed-off-by: halx99 <halx99@live.com>
 2021-12-28 21:00:45 +08:00
halx99 b0aee13b7f Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 b63f815488 Modify some extensions for string_view 2021-12-27 13:52:08 +08:00
halx99 0fd737c85f Update run.bat.in [skip ci] 2021-12-21 10:46:28 +08:00
halx99 555849be36 Improve templates, auto generate quick stater run.bat on windows 2021-12-21 10:41:33 +08:00
halx99 066b0834f2 Remove unnecessary AudioEngine::end() at AppDelegate::~AppDelegate of HellCpp & HelloLua 2021-12-16 19:00:19 +08:00
halx99 6e1f8f5953 Optimize cmake scripts 2021-10-12 15:39:37 +08:00
halx99 c8362b93fd HelloCpp use safe origin to position corner stubs 2021-10-09 14:48:18 +08:00
halx99 2f11c39f0f Rename templates/cpp-template-default/HelloLua.xsxproj to templates/lua-template-default/HelloLua.xsxproj 2021-10-08 00:00:06 +08:00
halx99 7fb6b9f8c9 Add lua debug project file [skip ci] 2021-10-07 23:18:09 +08:00
halx99 8d83891f30 Improve lua workflow on windows 
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
 2021-10-07 18:44:34 +08:00
halx99 3815b98a34 Merge empty project 
a. Remove cpp-empty-test, use HelloCpp as starter
b. Remove lua-empty-test, use HelloLua as starter
 2021-09-07 17:24:07 +08:00
halx99 3905654659 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
halx99 dc3b5292d7 Xcode Embed Frameworks support 
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
 2021-08-10 11:43:16 +08:00
halx99 5a6045ab19 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 dc11adb950 [Gradle] Find ndk with env ANDROID_NDK [ci build] 2021-06-02 05:37:18 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00