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

726 Commits

Author SHA1 Message Date
Deal 931ca91c71
Logging colorful support (#1735) 
* Add logging colorful support

* Enable full log fmt style in cpp-tests
 2024-03-08 01:15:26 +08:00
Deal 5d2c42e73f
Implement new axmol log system based on fmtlib (#1732) 
* Implement new log macros based on fmtlib

* Fix ci

* Fix ci

* Fix android ci

* Fix warnings

* Replace more ax::log by AXLOGX

* Fix ci

* Fix linux build

* Use stack memory for log prefix

* Fix linux build

* Fix warning

* Add ILogOutput support

* Replace old log calls with new log macros

* Fixup

* Fixup

* Fixup

* Update ci msvc to 14.39

* Update Console.h [skip ci]

* Pass log level to ILogOutput
 2024-03-07 08:47:00 +08:00
smilediver d3a0357e84
HttpClient: add support for PATCH method (#1722) 
* HttpClient: add support for PATCH method
 2024-02-29 11:43:41 +08:00
halx99 f2b8634907 Fix ci 2024-02-27 01:42:53 +08:00
halx99 bd9b593f7a Remove unnecessary string format calls 2024-02-24 12:28:11 +08:00
halx99 5e6b865215 Update cppwinrt: 2.0.230706.1 ==> 2.0.240111.5 2024-02-22 20:03:16 +08:00
Deal adbffdf4a2
Fix #1704, control android cmake options by engine axutils.gradle (#1705) 2024-02-20 00:58:47 +08:00
RH 978d15db78
RichText and ScrollView enhancements (#1696) 
* Add id tag to several RichText elements to allow locating the nodes in RichText
Add font related styling to paragraph tags

* Move functionality out of ListView and into ScrollView to allow scrolling to a specific child node within a ScrollView

* Add function to allow finding protected child node by name

* Example of anchor tags to local RichText content in a ScrollView

* Fix string storage type
 2024-02-18 20:09:54 +08:00
Lich 8e2e577e2f
Add support for window close button calback (#1697) 2024-02-18 16:08:53 +08:00
RH 8c23d32235
RichText enhancements (#1683) 
* Add paragraph tag support
Add HTML header tags support
Add multi-new line rich text element
Add support for end of tag action
General code clean up

* Remove redundant additions

* Fix compilation issue on platforms other than Windows

* Remove redundant constructors and destructors.
Initialize member variables.
Remove explicit inline specifier since all member class functions are implicitly inlined.
 2024-02-15 08:33:38 +08:00
RH 0f3c7d3ce7
Disable unused extensions in the FairyGUI and Live2D tests to speed up builds (#1665) 
* Disable unused extensions in the FairyGUI and Live2D tests to speed up builds.

* Only disable extensions

* Move option settings to correct location
 2024-02-11 22:28:42 +08:00
RH 7dd7dc4ada
LUA build fix for Android, iOS and Windows (#1650) 
* Update paths to lua bindings

* Update target include directories due to new extension dir structure

* Add missing libraries and paths for prebuilt option

* Current FairyGUI requires paths to parent and source directory

* Add required thirdparty search path to LUA library
 2024-02-04 22:09:36 +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 c06bed508b Rename cocos_android_app_init to axmol_android_app_init and othre code cleanup 2024-01-29 08:51:35 +08:00
Deal 9ec7c54c57
release 2.1.0 finally (#1621) [release 2.1.0] 
* Delete deprecated prop `buildconfig` from gradle.properties

* Delete unnecessary props since it's value same with defaults

* Don't need config debug keystore, will auto signed by default debug.keystore

* Update funding [skip ci]

* Fix axmol cmdline tool command 'new'

* Refix c99 for winsdk < 10.0.22000.0

* Fix powershell 3 condition statement: 'xxx = if(c) { v1 } else { v2 }' will lost switch parameter semantic

* Improve code style

* Improve code style

* Fixup
 2024-01-20 16:16:53 +08:00
halx99 bef10d0dea Allow generated debug signed apk, and rename keystore props: 
- RELEASE_STORE_FILE ==> KEY_STORE_FILE
- KEY_STORE_PASSWORD ==> KEY_STORE_PASSWORD
- RELEASE_KEY_ALIAS ==> KEY_ALIAS
- RELEASE_KEY_PASSWORD ==> KEY_PASSWORD
 2024-01-17 03:50:13 +08:00
halx99 32ef79a9f5 Avoid define multi depends of gradle task copyContentToAssets 
refer: dd7c9deaf9
 2024-01-17 03:45:13 +08:00
halx99 d3e680bc52 Update Android devtools 
- AGP 8.2.1
- Android Studio 2023.1.1+
- Android SDK Tools 34.0.0
- Android SDK Platform 34
- Gradle 8.5
 2024-01-17 02:59:40 +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 991e63ab8b
Set DrawNodeEx default to 'OFF" (#1613) 
* Set DrawNodeEx default to 'OFF"

* Update controller.cpp

* Update CMakeOptions.md
 2024-01-14 15:56:08 +08:00
Lich 0c77e45fb7
Add fixedUpdate method to Scene (#1607) 2024-01-13 01:08:01 +08:00
aismann 781b4ce521
Mark some extensions and 32bit build deprecated (#1604) 
* Update controller.cpp

* Update README.md

* Update CHANGELOG.md
 2024-01-12 00:10:36 +08:00
aismann 70fa8872de
Add extension 'DrawNodeEx' aka 'DrawNode v2' (#1568) 2024-01-05 02:07:13 +08:00
aismann bf4a6a09c8
Update DrawPrimitivesTest.cpp (Smaller tester code) (#1572) 
* Fix issue #1546 of UILayout(#1549) and small performance boost

* add test

* Update DrawPrimitivesTest.cpp (Smaller tester code)
 2024-01-03 09:40:24 +08:00
Deal 5fe829728b
Add websocket support (#1536) 2023-12-31 22:23:25 +08:00
aismann c389118571
Fix issue #1546 of UILayout(#1549) and small performance boost (#1559) 
* Fix issue #1546 of UILayout(#1549) and small performance boost

* add test

* Committing genbindings changes

---------

Co-authored-by: aismann <aismann@users.noreply.github.com>
 2023-12-31 11:33:49 +08:00
Deal 8902d48a5b
Prepare release v2.1.0 (#1527) 
* Prepare release v2.1.0

- Support download prebuilt and optional package from mirror: gitee.com
- Move download cache dir: thirdparty/_deps ==> cache
- Add change log

* Update CHANGELOG.md
 2023-12-20 02:34:45 +08:00
Deal b88c28013c
GLES3: Fix scalar array layout (#1523) 2023-12-15 22:29:23 +08:00
Lich ae51e26eb6
Add support for window resized and positioned (#1513) 2023-12-14 01:48:52 +08:00
Deal 159f49d832 Fix #1498 (#1500) 2023-12-12 00:44:59 +08:00
Deal 213f788f75
Merge backend Device, DeviceInfo to DriverBase (#1499) 
* backend::Device ==> backend::DriverBase
* backend::DeviceInfo ==> backend::DriverBase
* code style: remove unnecessary virtual function marks
 2023-12-11 21:59:25 +08:00
aismann f19c8f89ae
Replace 'CCAssert' with 'AXASSERT' (#1485) 2023-12-08 16:30:34 +08:00
Lich 0f114baf8c
Improve ActionCoroutine callback style (#1481) 2023-12-08 12:46:46 +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
aismann 41c65eb28e Add DrawNode::drawPie (#1474) 2023-12-05 17:20:31 +08:00
Lich d84d527362 Add support for ActionCoroutine like Unity (#1473) 2023-12-05 00:28:50 +08:00
Paulo Coutinho 0aab228acc Rename glview to correct representative name (#1467) 2023-12-01 09:04:51 +08:00
CHP 13ec866867 Update android API to 34 (#1469) 
* Update gradle.properties

* Update android api to from 33 to 34
 2023-12-01 08:08:37 +08:00
RH 5374e6ecc0 Add support for Richtext vertical alignment (#1466) 
* Add vertical alignment support for RichText

* Simplify RichTextTest implementation by reducing code duplication.
Add vertical alignment button to all RichText tests.

* Remove duplicate include

* [RichText] Vertical alignment support when ignoring size
 2023-12-01 00:05:11 +08:00
RH 575daa3c37 Fix large number of generated warnings (#1465) 2023-11-30 15:52:29 +08:00
halx99 ec507ec874 Update mac icons 2023-11-27 20:18:10 +08:00
halx99 8d1f801b54 Fix typo [skip ci][skip appveyor] 
refer #1453
 2023-11-26 23:56:38 +08:00
Deal b062eb3dc2 Improve linux deps (#1441) 2023-11-19 09:38:12 +08:00
aismann c7be9816d9 Fix/enhancement for issue #1319 (#1434) 
Fix/enhancement for issue #1319 (draw filled complex polygons (concave/convex)

Co-authored-by: eismpesd <peter.eismann@siemens-healthineers.com>
 2023-11-16 12:06:39 +08:00
RH 1f5f8c182a Update Live2D to work with Axmol 2.x (#1405) 
* Ensure Live2D extension is enabled for Live2D test

* Update Live2D to work with Axmol 2.x

* [skip ci] Remove commented out shader code
 2023-10-25 19:25:42 +08:00
RH fc67e58646 Imgui and Inspector enhancements (#1396) 
* [imgui] Add support for displaying images correctly that are rotated in texture atlas
[imgui] Add parameter to select if displayed image maintains aspect ratio
[imgui] Move static methods to anonymous namespace
[imgui] Minor code clean-up

* [imgui] Add support for displaying SpriteFrame

* [imgui] Update test to show usage of ImGuiPresenter::image helper methods

* [Inspector] Show image of selected sprite
 2023-10-20 19:22:49 +08:00
halx99 4d91ed6ca3 Fix dll build, make JSONDefault as static library 2023-10-19 23:27:59 +08:00
Saroop Technologies f2ae7f9759 Add JSONDefault extension (#1393) 2023-10-19 15:30:39 +08:00
RH a503004418 [Android] Restrict temporary and generated files to build folder (#1368) 
* [Android] Restrict temporary and generated files to build folder

* Fix temporary axslc folder path
 2023-10-02 09:47:11 +08:00
RH ef635f0649 Fix for missing scripts and resources in lua tests project (#1357) 
* [MacOS] Several linker flags removed to fix executable

* Fix both Apple and Windows missing resources and scripts folders.

* Fix for lua project with prebuilt engine

* Remove usage of _AX_TOP_LEVEL for lua-tests project
 2023-09-26 20:07:13 +08:00
halx99 2f1efe5a51 Add preload ttf SDF font atlas support 
A extension SDFGen tool also available, see ImGuiTest
 2023-09-26 01:33:06 +08:00
Deal b892461a2b UWP: Migrating from C++/CX to C++/WinRT (#1355) 2023-09-26 00:11:33 +08:00
halx99 079586d060 Fix #1336 2023-09-19 22:00:17 +08:00
Deal 4f4f07ddc4 Add enable global TTF SDF rendering support (#1333) 2023-09-18 07:18:57 +08:00
halx99 f2470b99aa Android: Update AGP to 8.1.1 
- jdk-17.x+ required
- gradle-bin 8.3
- Build-Tools 33.0.1
-  Delete package name from AndroidManifest.xml
- Add namespace "org.axmol.xxx" in 'app/build.gradle'
- Rename compileSdkVersion ==> compileSdk in 'app/build.gradle'
- Use rootProject.layout.buildDirectory instead rootProject.buildDir
- Android Studio 2022.3.1+
 2023-09-12 01:13:06 +08:00
iAndyHD3 810c909e67 Add extension Inspector (Experimental) (#1324) 
* node explorer

* fix some crash, add to tests

* change tabs to spaces

* remove node explorer from hello template

* change name to Inspector + add readme

* minor fix

* fix minor things

* fix minor thing...

* fix build on ios, android

* Apply suggestions from code review

* fix typename for gcc/clang, add font

* include cxxabi outside ax namespace
 2023-09-12 01:06:28 +08:00
halx99 5bf03c47ac Build more tests for wasm 2023-09-11 20:31:57 +08:00
halx99 2db687b422 Enable dpi scale for ImGuiTest 2023-09-11 00:05:53 +08:00
halx99 766d79a73f Revert cmake module folder to `cmake/Modules` 2023-09-09 00:36:49 +08:00
halx99 45cb0d82dc Add cmake option 'AX_WASM_SHELL_FILE' 
Specify the wasm shell file, by default use
`${_AX_ROOT}/core/platform/wasm/shell_minimal.html`
 2023-09-07 21:09:36 +08:00
halx99 8cbe447974 Fix ci 2023-09-06 11:14:11 +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 80f1e0952f Update wasm persist path 2023-09-03 18:25:39 +08:00
halx99 c67cd64ffc Use axmol embeded freetype for wasm 2023-09-03 13:12:59 +08:00
halx99 cbb23108cb Merge: e1f3c5d76f c21736c0d6 
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
 2023-09-03 11:47:36 +08:00
halx99 7abad49137 Appveyor CI: build wasm release mode 2023-09-03 11:47:33 +08:00
halx99 692688accf Fix tvos ci 2023-09-03 09:46:21 +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