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

126 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
halx99 4c59349ac7 Improve cmake scripts 2024-04-30 00:43:54 +08:00
smilediver 354f3abed9
Add ability to create console apps (#1859) 
* Print cmake build command when running `axmol build`

* Add option to `ax_setup_app_config()` for building console applications

* Fix console app entrypoint

---------

Co-authored-by: halx99 <halx99@live.com>
 2024-04-29 00:24:06 +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 e8b070c84c Remove unnecessary cmake option AX_VS_DEPLOYMENT_TARGET since we require cmake >= 3.28 2024-04-03 03:57:59 +08:00
halx99 284f088074 Move rpath control to 1k/platforms.cmake 2024-03-30 01:27:13 +08:00
halx99 6f81d69c01 Merge branch 'dev' of https://github.com/axmolengine/axmol into dev 2024-03-28 20:58:05 +08:00
halx99 62584966af Improve cmake 2024-03-28 20:58:03 +08:00
RH 4fb845244f
Allow certain code modules to be removed from build process (#1769) 
* Add support for disabling code sections from build process

* Add support for disabling built-in audio

* No need to add definition here

* Remove extra blank lines

* Add required copyright notice

* Document new options
 2024-03-28 10:45:20 +08:00
halx99 d514f88cb1 Fix mac & linux rpath settings 2024-03-27 22:57:32 +08:00
halx99 3555f97a7b Fix ci 2024-03-24 05:20:59 +08:00
halx99 d1ec623bb5 Rename folder thirdparty ==> 3rdparty 2024-03-19 21:33:02 +08:00
halx99 5e6b865215 Update cppwinrt: 2.0.230706.1 ==> 2.0.240111.5 2024-02-22 20:03:16 +08:00
RH 7f3bf21ee3
Remove duplicate CODE_SIGN_IDENTITY that is setting invalid value (#1666) 2024-02-10 20:15:27 +08:00
halx99 df165fec4b Prepare release v2.1.1 2024-02-02 00:00:06 +08:00
halx99 74189ffa24 Slient no shader discovered [skip ci][skip appveyor] 2024-01-25 22:20:04 +08:00
smilediver f90aaec0a9
Fix shaders not copying to final build on macOS for non Xcode builds (#1631) 2024-01-24 21:40:15 +08:00
RH db2c749c67
Support setting of custom runtime output directory for project (#1574) 2024-01-04 19:35:04 +08:00
halx99 22a1faa593 Improve build system 2023-12-22 02:39:38 +08:00
halx99 e62d09a718 Make XCODE_EMBED_RESOURCES match cmake 3.28 release, refer #1482 2023-12-08 23:42:05 +08:00
halx99 affcf05b69 Prepare 2.1.0 release 
* Update copyright notice
* Remove prebuilt libs from SCM
* Remove optional thirdparty sources/repo from SCM
* Remove tests resources  folder 'Content' from SCM
 2023-12-08 01:04:43 +08:00
axmol-bot 78672f4a19 Update thirdparty prebuilts to v60 (#1446) 2023-11-25 14:47:25 +08:00
RH 4b5dc59574 Fix for UWP build issues (#1421) 2023-11-08 08:15:40 +08:00
halx99 9a8bab9440 Fix #1388 2023-10-16 20:24:59 +08:00
Deal ce414ef0d0 Avoid find PowerShell.sh in /Applications on macOS [skip ci] 2023-09-26 19:43:03 +08:00
Deal b892461a2b UWP: Migrating from C++/CX to C++/WinRT (#1355) 2023-09-26 00:11:33 +08:00
halx99 58cfc7c65d Make wasm devtools works 2023-09-15 19:33:25 +08:00
halx99 983e383077 Improve build script 2023-09-13 16:00:33 +08:00
halx99 766d79a73f Revert cmake module folder to `cmake/Modules` 2023-09-09 00:36:49 +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