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

57 Commits

Author SHA1 Message Date
halx99 9a384e39f2 Merge: 412e398651 1daf87c768 
Merge branch 'main' into dev
 2023-07-15 22:45:26 +08:00
Deal(涓€绾跨伒) c5a61124c0 Add chat badges [skip ci] 2023-07-15 11:25:48 +08:00
halx99 2b30d8002f Merge: 7afdd4f2c1 e5b197776c 
Merge branch 'main' into dev
 2023-07-15 01:17:32 +08:00
halx99 e34d02eb7d Fix build1k cmake setup 2023-07-15 01:17:15 +08:00
halx99 c476f8b117 Add cmake option AX_ENABLE_EARLY_FEATURES 2023-07-15 01:02:13 +08:00
halx99 8e39354e99 Merge: 83a830d011 cfcafd517a 
Merge branch 'main' into dev
 2023-07-15 01:00:31 +08:00
Deal(涓€绾跨伒) 4867fc8f2e Update pull_request_template.md (#1270) 2023-07-15 00:21:23 +08:00
halx99 42fcb1f86e glslcc workflow: metal init commit 2023-07-14 23:07:47 +08:00
RH 0c17a35fa8 Fix for crash in TextureCache test (#1267) 2023-07-11 21:55:17 +08:00
halx99 c064124802 [GLSLCC] Remove spec defines, because the behavior incorrect 2023-07-10 17:02:20 +08:00
halx99 5d7a86a1b9 Merge: 89a739a8ea 09a3a950ae 
Merge branch 'dev' into 1.1-dev
 2023-07-10 15:57:00 +08:00
RH ce590c24a0 Fix for crashes in several tests (#1259) 2023-07-09 14:45:41 +08:00
halx99 ed6ec7a32d [GLSLCC] Suppression macro not defined errors 2023-07-09 12:04:58 +08:00
halx99 7c410f8b25 Bump new shader workflow 
1. Add compiled shader dir `axslc` to search path for win32,linux
2. ProgramManager: register shader program by shader name
3. modify all shader  define from sources to name in Shader.cpp/Shader.hpp
4. Remove shader version define and precision decls for GLES
 2023-07-08 18:47:06 +08:00
halx99 acc47b3281 Bump 1.1.0 2023-07-06 20:37:59 +08:00
Deal(涓€绾跨伒) 7771d4f7b1 Fix ci 2023-07-06 19:36: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(涓€绾跨伒) 27e66df931 Use glad for android GLESv3 support 2023-07-04 17:34:12 +08:00
Deal(涓€绾跨伒) a4fbe9c598 Fix CMakeLists.txt 2023-07-03 21:16:33 +08:00
halx99 7cb9aac41e Rename option `AX_USE_COMPAT_GL` to `AX_USE_ANGLE` 2023-07-03 20:35:55 +08:00
halx99 506f994b71 Improve CMakeLists.txt 2023-06-13 20:44:20 +08:00
halx99 2d518922ba Improve cmake 
If no system libvlc, try use prebuilt.
 2023-06-13 00:10:53 +08:00
halx99 85111a4cc3 Improve engine version definitions 2023-06-12 09:14:23 +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
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
Deal(涓€绾跨伒) 621c94c9e7 Enable video player(VideoTexture) based on new MediaEngine for macOS and tvos (#1154) 
* Ready for PR macOS

* Update videoTexture.frag

* Fix compile

* Fix h265 for mac [skip ci]

* Fix compile error

* Update readme [skip ci]
 2023-04-02 01:51:36 +08:00
RH 52d7ea6316 Ensure that the axmol engine git folder is the one used for versioning (#1149) 
* Committing genbindings changes

* Fix compilation error related to redefinition of 'pause'
Fix update override warning
Improve code

* Revert "Fix compilation error related to redefinition of 'pause'"

This reverts commit 1744a48fec.

* Ensure that the engine .git folder is the one being referenced for versioning
 2023-03-31 08:04:38 +08:00
halx99 35db29919e Done #1139 2023-03-30 22:08:53 +08:00
Deal(涓€绾跨伒) 1e6e9d4a8d Media engine video texture (#1133) 
* VideoPlayer based on new MediaEngine[Win32/UWP]

* Improve MediaEngine interface

* Update readme

* Improve pixel format

* Improve MediaEngine interface

* Ready for PR UWP/Win32

* Ready for PR UWP,Win32

* Update reademe files

* Update readme files

* Update UIVideoPlayer-android.cpp [skip ci]

* Update UIVideoPlayer-ios.mm

* Update MFUtils.cpp

* Fix ci
 2023-03-25 08:37:51 +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
halx99 01a74f3b61 Fix #1082 2023-02-27 15:43:35 +08:00
halx99 5c42e19788 Improve windows optional modules 2023-01-11 22:28:14 +08:00
CHP 8d36190c98 Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08:00
halx99 0279d5c158 Fix #958 2022-11-10 21:22:55 +08:00
涓€绾跨伒|Deal 25d93bd509 Improve code quality (stage1.Oct) (#916) 
* Improve code quality

* Add env PULL_REQUEST [skip ci]

* Update build.ps1

* Fix ci [skip ci]

* Update ZipUtils.cpp

* Update build.ps1

* Resolve reviews

* Improve

* Improve code style

* Resolve reviews

* Use pod_vector

* Improve resize growth

* Update CCAnimation3D.cpp

* Update axstd.h [skip ci]
 2022-10-13 21:44:42 +08:00
CHP 4d54f44f62 Update CMakeLists.txt (#922) 
* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-12 07:04:01 +08:00
CHP b3fa9381b5 Fix noisy message "Unable to resolve full path of PCH-header" (#918) 
* Update CMakeLists.txt

fix noisy message "Unable to resolve full path of PCH-header"

* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-11 08:54:02 +08:00
CHP 9c7a876970 precompile_headers all platforms (#901) 2022-10-10 03:52:04 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 101afaa855 [CMake] Mark engine pch as private 2022-08-19 12:15:49 +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 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 f1b56abfaf Tidy audio module code 2022-05-15 09:55:57 +08: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 ba66918607 Improve Ninja build with visual studio ide 
a. Disable PCH for Ninja, just a workaround fix compiler always said: can't open xxx.pch files
b. Remove unnecessary definition _WINSOCKAPI_ for Ninja build
 2022-04-27 18:48:57 +08:00
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00