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

110 Commits

Author SHA1 Message Date
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
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
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 6e304959a9 Remove unnecessary targets for cpp template 2020-11-18 18:35:00 +08:00
halx99 f75e87c88a Use env ENGINEX_ROOT for templates 2020-11-18 13:01:17 +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 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 2e7546eca4 Update gradle plugin to 4.1.0 2020-10-21 10:55:32 +08:00
halx99 2c884eb6df Also replace so name for proj.android when new project 2020-10-20 16:26:53 +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 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 0e0a28e033 Merge: 1740c444f8 5c850e00ac 
Merge pull request #171 from halx99/feature-170

Add utils::createInstance to instead macro CREATE_FUNC
 2020-08-24 23:55:37 -07:00
halx99 feb4e1783a fix warning 2020-08-25 14:47:51 +08:00
halx99 d39f803459 Add utils::createInstance to instead macro CREATE_FUNC 2020-08-25 13:49:45 +08:00
halx99 9eb32b634f Make core lib can be build as dll, fix link issue for external 2020-08-18 12:36:44 +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
halx99 b456364167 Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
minggo 4f6a6b0960 set xcode installation path to (#20402) 2020-01-18 20:40:21 +08:00
Arnold a0e24c4c42 [bugfix] set CFBundleExectuable in template info.plist (#20425) 
fix #20414
 2020-01-18 20:40:00 +08:00
Arnold e564e12f3a [bugfix] set Info.plist path (#20405) 
fix bug introduced in #20205
 2019-12-12 23:55:18 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00