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

169 Commits

Author SHA1 Message Date
halx99 7d1a911b91 Remove unnecessary platform macro define in cmake 2022-11-01 19:00:48 +08:00
halx99 abd9338a7a Migrate [skip ci] 2022-10-18 19:13:40 +08:00
涓€绾跨伒|Deal f72f18ce64 Merge: 6220071b3b 97fc3b7bcf 
Merge pull request #896 from crazyhappygame/patch-1

Enable C++20 by default
 2022-10-06 08:50:39 +08:00
CHP 026e694b5f Delete setup_android.py 
This file is not needed with latest android SDK
 2022-10-05 21:18:06 +02:00
CHP 6886e985a2 Enable C++20 by default 
Enable C++20 by default
 2022-10-05 20:24:33 +02:00
涓€绾跨伒|Deal 4a52cacbec Set default c++ standard to 17 [skip ci] 2022-10-05 13:20:04 +08:00
halx99 2c818612b3 Fix ci 2022-10-05 11:01:46 +08:00
aismann 6af62a4b08 Clipper2 1.05 (only files with changes on source lines) 2022-10-04 18:54:12 +02:00
涓€绾跨伒|Deal 155fea245b Update AXConfigDefine.cmake 2022-10-04 11:39:32 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
halx99 99f299d5c4 Update thirdparty prebuilt libs 
- curl-7.85.0
- angle-2.1.19119 on branch `chromium/5195`
 2022-09-12 22:46:35 +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 efe9e36816 Check AX_ENABLE_MSEDGE_WEBVIEW2 2022-09-02 20:06:05 +08:00
halx99 af9731d987 Copy angle dll when AX_USE_COMPAT_GL=true 2022-09-02 19:24:22 +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
halx99 843ee9779b Fix #810 2022-08-19 19:52:10 +08:00
涓€绾跨伒 3d72e8e58e Update AXLinkHelpers.cmake 2022-08-19 10:12:06 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +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
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +08:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +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
halx99 cdbfe0d0e6 Remove dep libiconv since we don't required 2022-06-11 15:34:12 +08:00
halx99 349a53fce6 Improve cmake scripts 2022-05-19 10:54:42 +08:00
halx99 dffaf9b8d7 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +08:00
halx99 2e6fd8891f Cleanup code 2022-05-14 02:47:47 -07:00
halx99 c3f40d2b36 Improvements and bug fixes 
Improve ResizableBufferAdapter style

Improve extesnion adxelua

Improve code quality

Fix lua-tests BillBoardTest

Sync texture pixel format enum values for adxelua

Fix luaval_to_vec2 parameter location

Improve windows workflow

Improve cmake scripts

Take care Texture2D::setDefaultAlphaPixelFormat use
 2022-05-13 21:06:29 +08:00
halx99 3df97fc1bf Improve VS Ninja build again 
a. Auto copy webview2 dll for targets
b. Fix cpp-tests compile error
 2022-04-27 19:39:12 +08:00
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00
涓€绾跨伒 f5f767976f Try fix empty/missing DT_HASH in "libOpenSLES.so" 2022-04-04 17:47:45 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 87c51c656c Update plainlua to 5.4.4, pugixml to 1.12.1 2022-02-17 18:06:19 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
deal 3359ac211f Don't needs copy plainlua.dll when use luajit 2022-01-17 23:50:05 +08:00
halx99 3600011b43 Always enable string pooling for msvc 2021-12-04 13:45:25 +08:00
halx99 ea925ac746 Merge: 9930eef75a 2ca99fce0f 
Merge pull request #542 from adxeproject/codebase-cpp17

Improve codebase to c++17
 2021-11-26 19:17:04 +08:00
halx99 12f1f5929d Fix compile 2021-11-26 18:13:33 +08:00
halx99 ac937714e2 Improve codebase to c++17 2021-11-26 18:06:14 +08:00
halx99 8d2dd47cc6 Fix #522 2021-10-12 13:16:27 +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 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 87d13bd73a Add win64 angle dlls 2021-09-01 10:28:37 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 3fd20e30cf Update CocosConfigDefine.cmake 2021-08-27 01:08:14 +08:00
halx99 d59bcadf23 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 64f64f02c9 Update curl to 7.78.0 and use prebuilt lib for speedup cmake generation time 2021-08-23 20:38:52 +08:00
halx99 5b21fe8ce9 Explicit disable codesign for macOS 2021-08-13 10:19:24 +08:00
halx99 1452e698e3 Fix xcode ci 2021-08-12 11:25:01 +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 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 e58472901c Sync CMakeLists.txt and README files [skip ci] 2021-07-08 22:55:33 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 2c5e7c58fb Update name 2021-06-01 20:31:48 +08:00
RH 4e24a8d5a9 Fix for incorrect COCOS_COMMAND path (#357) 2021-05-24 23:15:06 +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 413b0acaa6 Fix #352 [ci build] 2021-05-12 11:18:31 +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 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 7cbfd84f95 Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
halx99 0ef3d6f0e0 Building glfw,freetype,openal,curl from sources [ci build] 2021-04-28 12:43:51 +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 eb2fcc36b9 fix link error on macOS Big Sur 11.01 
Follow lib removed by Apple
1. /usr/lib/libz.dylib
2. /usr/lib/libiconv.dylib
 2020-12-02 21:59:57 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
halx99 5b3e02edfa fix nasm detect variable CMAKE_ASM_NASM_COMPILER_LOADED not correct [ci build] 2020-11-11 13:51:34 +08:00
halx99 2f5f191ac3 Make nasm compiler optional [ci build] 2020-11-11 13:27:52 +08:00
halx99 0cc9295024 Try enable nasm compiler for libjpeg-turbo boost 2020-11-11 10:31:41 +08:00
halx99 a7c632b3d8 Add compiler flags -mfloat-abi=softfp for android armv7? 2020-11-10 14:36:55 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 0901f1d9eb Build mac with alsoft support (#226) 
* Build mac with alsoft support

* Add missing dep for mac

* Update CocosConfigDepend.cmake
 2020-10-06 20:55:38 +08:00
halx99 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 cca0739793 Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 05d31aa618 Take care PBO use on android 2020-09-15 16:01:44 +08:00
halx99 71db0f3960 CMake: Add missing CC_FORCE_USE_GLES for win 2020-09-15 14:22:19 +08:00
halx99 9e10895b5d Don't config c standard on windows 2020-08-30 13:48:12 +08:00
halx99 da213c9d37 Remove cmake message print 2020-08-29 01:40:55 +08:00
halx99 7acb4e95bf fix #183 2020-08-29 01:39:27 +08:00