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

173 Commits

Author SHA1 Message Date
smilediver ddeb14c160
Fix shaders not copying to final build on macOS for non Xcode builds (2) (#1908) 
* Fix shaders not copying to final build on macOS for non Xcode builds

* Fix macOS build after adding minimum CMake 3.20 requirement

* Refactor "Fix macOS build after adding minimum CMake 3.20 requirement"
 2024-05-22 01:51:09 +08:00
smilediver 9ac6db4384
Add unit tests (#1862) 
* Add unit-tests app for running automatic unit tests

* Move unit tests from cpp-tests to unit-tests

* TEMP

* Add FileUtils::fullPathForDirectory() tests

* Use test assets from `axmol-sample-assets` repo

* Add more FileUtils::isFileExist(), FileUtils::isDirectoryExist() tests

* Add `unit-tests` builds to GitHub's workflows

* Fix `.github/worflows/build.yml`
 2024-04-30 20:52:28 +08:00
RH 3916a2367b
Cross-platform media controller for video playback (#1845) 
* Initial work on media controller

* Media player controller for WMF media engine

* Add getDuration and getCurrentTime methods to media engines

* Fix compilation

* Fix Android media timeline issues

* Fix compilation issue

* Fix WinRT compilation issue

* Fix compilation issue

* Add missing header include

* Make it simpler to create a custom media controller

* Ensure the basic media controller widget size is the same size as the media player on initialization

* Add dark media control underlay to give more contrast to the controls
ADd copyright notices

* Removing existing media controller from parent if required

* Adjust for view scaling since embedded resources are created for a scale of 1.

* Scale central media controls if required on content size change

* Remove pointless fast forward and fast reverse buttons
Ensure media controller correctly resizes on full-screen media playback

* Allow enable vlc on windows

* Improve media macro detect

* Add media controls drawn by DrawNode into single texture
Add fullscreen enter and exit controls
setUserInputEnabled and isUserInputEnabled replaced by setMediaControllerEnabled and isMediaControllerEnabled

* Update function calls to new names

* Revert back to setUserInputEnabled and isUserInputEnabled

* Remove embedded circle image and create it with DrawNode

* Change radius of drawn circle to half the total image size

---------

Co-authored-by: halx99 <halx99@live.com>
 2024-04-24 22:28:59 +08:00
halx99 0ef8d484ce Fix xcode15 warning: ignore link duplicated lib 2024-04-07 22:51:50 +08:00
halx99 e8b070c84c Remove unnecessary cmake option AX_VS_DEPLOYMENT_TARGET since we require cmake >= 3.28 2024-04-03 03:57:59 +08:00
RH 9f8962d47d
Change extension folder structure to reduce file name conflicts (#1647) 
* Restructure extension folder structure to reduce conflicts with project source files

* Do not include SDFGen headers for Android builds

* Ensure correct paths are included for the relevant targets

* ImGui is not be enabled for WinUWP, tvOS and iOS

* Fix LUA auto binding generator to work with updated extension folder structure

* Fix path and linker issues for yasio when using prebuilt option
Set correct paths to extensions for prebuilt option
 2024-02-03 10:08:22 +08:00
halx99 0e650a149b Improve cmake scripts 2024-01-16 01:20:41 +08:00
halx99 dd7c9deaf9 Improve android build gradle script 
- Merge tasks copyDebugContentToAssets, copyReleaseContentToAssets to copyContentAssets
- Simplify tasks dependent definations
- Fix tests content not pack into apk
 2024-01-16 00:47:19 +08:00
aismann 70fa8872de
Add extension 'DrawNodeEx' aka 'DrawNode v2' (#1568) 2024-01-05 02:07:13 +08:00
Deal 5fe829728b
Add websocket support (#1536) 2023-12-31 22:23:25 +08:00
Deal 159f49d832 Fix #1498 (#1500) 2023-12-12 00:44:59 +08:00
Deal b062eb3dc2 Improve linux deps (#1441) 2023-11-19 09:38:12 +08:00
Saroop Technologies f2ae7f9759 Add JSONDefault extension (#1393) 2023-10-19 15:30:39 +08:00
Deal b892461a2b UWP: Migrating from C++/CX to C++/WinRT (#1355) 2023-09-26 00:11:33 +08:00
halx99 766d79a73f Revert cmake module folder to `cmake/Modules` 2023-09-09 00:36:49 +08:00
halx99 0c42b9370b Enable more tests for wasm 
- box2d test beds
- chipmunk test beds
 2023-09-06 10:11:48 +08:00
halx99 d7a72ea587 WASM: Fix .html file not generated 2023-09-05 22:40:25 +08:00
halx99 5a528b46e5 WASM: use shorten target platform name 'wasm' instead 'emscripten' 
For examples:
- win32 app build by msvc/clang and runs on windows
- wasm app build by emscripten/emcc and runs on web browsers
 2023-09-05 22:17:18 +08:00
halx99 0a56810af5 Improve wasm support 
- Enable thread support
- Improve emcc flags
- Enable webp support
- axmol run now support wasm by emrun
- Rebuild openssl by pthread support
- Extension: effekseer support
 2023-09-05 21:10:25 +08:00
halx99 c67cd64ffc Use axmol embeded freetype for wasm 2023-09-03 13:12:59 +08:00
halx99 c66ac9dedc Merge: 41714a04fd 2631c8405b 
Merge branch '1.x' into dev
 2023-09-02 19:56:50 +08:00
halx99 b21fcb0272 Fix gendocs.ps1 2023-09-02 19:56:33 +08:00
halx99 8f8418c15d Merge: c8bfa8cdf1 062b510c38 
Merge 1.x WASM support into 'dev'
 2023-09-02 19:47:18 +08:00
nowasm 03f007fdbe Add webgl aka wasm build support (#1315) 2023-09-01 16:31:14 +08:00
halx99 4c0c328b80 Merge: 6d82d3a76c 5e3cba78a6 
Merge branch '1.x' into dev
 2023-09-01 16:29:02 +08:00
halx99 396313de47 consle-next: Looking both powershell 7.x and 5.x 2023-09-01 16:28:34 +08:00
iAndyHD3 ed39cf3996 Update AXBuildHelpers.cmake (#1316) 
fix find_program call
 2023-09-01 16:09:58 +08:00
halx99 b1ddb2fcce Sync #1316 2023-09-01 16:09:27 +08:00
halx99 a000ccbab5 Update site build 2023-09-01 14:49:03 +08:00
halx99 ada7deb002 Sync docs [skip ci] 2023-09-01 14:48:42 +08:00
halx99 310c5868ec Merge: 8f8814532d bdbbc55909 
Merge branch '1.x' into dev
 2023-09-01 13:36:38 +08:00
halx99 e5d984a4f8 Auto deploy wasm demo to gh pages 2023-09-01 13:36:23 +08:00
halx99 5fe4e6d61f Merge: 89955d901a 279ea746cc 
Merge branch '1.x' into dev
 2023-09-01 10:37:57 +08:00
halx99 e565645443 Auto get release list for doc build 2023-09-01 10:31:34 +08:00
halx99 f3f91147a3 Merge: 2a6e84aa15 2969a5b4ff 
Merge branch '1.x' into dev
 2023-09-01 03:35:30 +08:00
halx99 fe60bf0a1b Fix cmake setup for linux 2023-09-01 01:17:49 +08:00
halx99 ec9b7f6e42 Merge: 1d4deae63a 7399ac41a6 
Merge branch '1.x' into dev
 2023-09-01 01:07:15 +08:00
halx99 0094c6bbb2 keep files for site build [skip ci] 2023-08-31 22:08:50 +08:00
halx99 2566feff5a Merge: 6e1be139bd 1d26aa28a5 
Merge branch '1.x' into dev
 2023-08-31 21:20:23 +08:00
halx99 12bb1eb62a Improve axmol site build 2023-08-31 21:20:01 +08:00
halx99 b50c629307 Merge: bdf976681e 82679fca74 
Merge branch '1.x' into dev
 2023-08-31 19:56:21 +08:00
Deal c8d0fb85ea Fix linux build 2023-08-31 18:59:12 +08:00
halx99 0952acea6a Merge: 4fe5dd55e7 cc826cb6ae 
Merge branch '1.x' into dev
 2023-08-31 18:14:46 +08:00
halx99 b97b1a5630 Fix ci 2023-08-31 18:14:26 +08:00
halx99 06d51ac961 Merge: d3f55e0472 8e723b0cc9 
Merge branch '1.x' into dev
 2023-08-31 18:09:23 +08:00
halx99 4a52c781a2 Fix ci 2023-08-31 18:07:23 +08:00
halx99 09db3594f2 Merge: 3d97d1bcc1 0a63a8e364 
Merge branch '1.x' into dev
 2023-08-31 17:57:36 +08:00
halx99 a3a117ad2d Update script permision 2023-08-31 17:57:19 +08:00
halx99 449a596f3e Merge: fd2cbdc331 a816a8ac64 
Merge branch '1.x' into dev

# Conflicts:
#       README.md
#       README_CN.md
#       install-pwsh.sh
#       tools/console/axmol
 2023-08-31 17:56:09 +08:00
halx99 c2e55c4cdc Merge console-next from dev into 1.x 2023-08-31 17:48:39 +08:00