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

164 Commits

Author SHA1 Message Date
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 eabd784590 Fix macOS/iOS build warning 
invalid character in Bundle Identifier. This string must be a uniform type identifier (UTI) that contains only alphanumeric (A-Z,a-z,0-9), hyphen (-), and period (.) characters. (in target 'cpp_tests' from project 'axys')
 2022-08-09 15:32:00 +08:00
aismann 5d64474cfb rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02: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 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
halx99 c16a33e347 Migrate more macors 2022-07-16 10:43:05 +08:00
涓€绾跨伒 ac1872494c Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 41d2c44308 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +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 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +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 dffaf9b8d7 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +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
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00
halx99 40fb113b31 Update copyright url [skip ci] 2022-04-25 12:06:43 +08:00
halx99 d9a113741e Fix libc++_shared.so not found in old devices(API 22) 2022-04-05 11:45:59 +08:00
halx99 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 5e893f3b4d Update project urls 2022-02-24 18:45:25 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +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 d1fc2faadc Fix lua-tests linkage for windows 2022-01-04 10:33:23 +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 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 1ee106007a Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
halx99 c6945c44e5 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 a49bba32ef Merge: 846231e2f1 cc1d09d04d 
Merge pull request #521 from adxeproject/refine-lua-loader

Refactor lua loader, reload lua with file name as-is
 2021-10-12 14:18:02 +08:00
halx99 8d2dd47cc6 Fix #522 2021-10-12 13:16:27 +08:00
halx99 8dbd1ea335 Remvoe lua 64bit bytecode spec 
a. since we know how to compile compatible bytecode for both plainlua and LuaJIT
 2021-10-11 23:26:25 +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 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 cbb1df02c4 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +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 84a8ec8e2e Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 93173d860b Replace jcenter with mavenCentral [ci build] 2021-05-15 12:15:38 +08:00
halx99 e367689ca9 Gradle Plugin no longer support cmake 3.10.0+ 2021-05-15 11:58:56 +08:00
halx99 4a12425a1b Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 b68f7b8948 Update gradle stubs [ci build] 
a. wrapper  to  6.9
b. plugin to 4.2.0
 2021-05-14 12:11:19 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 fdf0ebc97f Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 c2596efd04 Ensure build native first before compile java code 2021-04-20 20:25:32 +08:00
halx99 1c2daaf4ae Set gradle-wrapper to 6.8.3 [ci build] 2021-04-08 22:42:15 +08:00
halx99 2a10e85122 fix lua-tests cmake script 2021-03-26 17:10:37 +08:00
halx99 5488a8da20 Fix CMakeLists for separating test projects [ci build] 2021-03-15 09:50:32 +08:00
halx99 a976e217c1 Rollback gradle plugin version 4.0.1, since there is no benefit upgrade to 4.1.0 2020-11-12 22:50:38 +08:00
halx99 db2e468e91 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 cff35a61b8 Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake 2020-10-22 17:50:25 +08:00
halx99 253b82c617 Make setup.py works with python3 2020-10-22 16:53:28 +08:00
halx99 2e7546eca4 Update gradle plugin to 4.1.0 2020-10-21 10:55:32 +08:00
halx99 9e6b360437 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 4c128913c1 Sync SharedLoader template. 2020-10-19 19:19:17 +08:00
halx99 3741bbd7e2 Finish cpp and lua template to use env var 'COCOS2DX_ROOT' to avoid copy whole engine source when new project. 2020-10-19 18:33:10 +08:00
halx99 fdf2d5f668 Remove gradle compile lua to fix compile error, needs tools to compile and encrypt lua later 2020-10-18 01:12:11 +08:00
halx99 9019cb0d0f Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:05:36 +08:00
halx99 d02c9da98b Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:01:36 +08:00
halx99 abc9d5f411 fix #146 2020-08-18 10:51:32 +08:00
halx99 d084d9f61a Improve shared library for android, remove mojoal,sdl2, still use OpenAL.framework on apple platform, alsoft on other platforms. 2020-08-17 18:45:14 +08:00