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

750 Commits

Author SHA1 Message Date
halx99 2a9ae66fbc Update ImGui to 1.90.1 2024-01-12 00:42:04 +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 5380291917
Update README.md (#1600) 2024-01-11 19:26:45 +08:00
halx99 a5dc85f389 Committing genbindings changes 2024-01-11 04:49:25 +00:00
halx99 ec226b93bc Committing genbindings changes 2024-01-10 09:17:47 +08:00
halx99 62b53781ec Committing genbindings changes 2024-01-09 23:41:57 +00:00
halx99 36018ecca3 Update imgui 1.89.8 ==> 1.90 2024-01-09 00:14:29 +08:00
halx99 96a1d70739 Committing genbindings changes 2024-01-06 23:49:46 +00:00
罗捷捷 15f38eefde
Add fairygui lua support (#1587) 2024-01-06 23:25:20 +08:00
halx99 5e23949f16 Committing genbindings changes 2024-01-05 16:54:58 +00:00
aismann 00d7b95af0
using AX_EX_DLL (#1578) 2024-01-05 05:35:05 +08:00
aismann 70fa8872de
Add extension 'DrawNodeEx' aka 'DrawNode v2' (#1568) 2024-01-05 02:07:13 +08:00
halx99 e186067daf Add websocket luabindings 2023-12-31 23:00:13 +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
halx99 d0d0951cc4 Committing genbindings changes 2023-12-15 23:20:31 +00:00
halx99 263ef08a78 Fix Lua FileUtils getDataFromFile may return path of file 2023-12-15 23:35:20 +08:00
RH a69f20f889
Fix cmake project generation on platforms other than Android (#1503) 2023-12-12 09:40:40 +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
halx99 70997061da Improve axmolver defines 2023-12-10 00:08:05 +08:00
aismann f19c8f89ae
Replace 'CCAssert' with 'AXASSERT' (#1485) 2023-12-08 16:30:34 +08:00
halx99 5d4db9d830 Committing genbindings changes 2023-12-08 05:23:29 +00:00
halx99 e77b54b785 Committing genbindings changes 2023-12-08 01:47:32 +00: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
halx99 057708d7c7 Committing genbindings changes 2023-12-05 09:28:54 +00:00
halx99 4bd4c07b49 Committing genbindings changes 2023-12-04 16:37:10 +00:00
halx99 e0d4c9841d Committing genbindings changes 2023-12-01 01:12:29 +00:00
Paulo Coutinho 0aab228acc Rename glview to correct representative name (#1467) 2023-12-01 09:04:51 +08:00
halx99 4bd0d31f67 Committing genbindings changes 2023-11-30 16:12:58 +00:00
halx99 859c8fc093 Committing genbindings changes 2023-11-05 16:27:00 +00:00
Deal 54ef33d34d Add API: Device::getPixelRatio (#1418) 2023-11-06 00:19:44 +08:00
RH ddcecc3ff4 Live2d Android build fix (#1407) 
* Allow optional setting target link scope for extensions when linking with Axmol.

* Fix Live2D linking with Axmol on Android
Add Android Tegra shader processing and usage
 2023-10-26 21:30:31 +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
halx99 ddc9256ebe Committing genbindings changes 2023-10-25 01:54:02 +00: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
RH c5512a05bc [Inspector] Fix crash and add enhancements (#1394) 
* Fix crash related to invalid selected node if it no longer exists in the scene.
Support using a custom font for the inspector.
Support automatic registration of inspector on scene switches.

* Fix compilation issue

* [skip ci] Remove redundant null check
 2023-10-19 15:31:01 +08:00
Saroop Technologies f2ae7f9759 Add JSONDefault extension (#1393) 2023-10-19 15:30:39 +08:00
RH 0bf5bed809 Add support for adding custom properties to the inspector (#1392) 
Minor code clean-up
 2023-10-18 20:11:59 +08:00
halx99 1e0dde5ba2 Fix ci 2023-10-11 00:49:49 +08:00
halx99 13b4a5bc93 Make macro same with cmake in c++ 
- AX_ENABLE_EXT_SPINE
- AX_ENABLE_EXT_DRAGONBONES
- AX_ENABLE_MSEDGE_WEBVIEW2
 2023-10-11 00:32:04 +08:00
Joilnen 61bcb24a25 fix warning messages in gcc 13.2.1 to compliance with C++20 (#1383) 2023-10-08 23:46:27 +08:00
halx99 dbb0dbcb79 Use JsonWriter for SDFGen 2023-10-08 02:28:08 +08:00
halx99 4156052157 Fix win32 dll build 2023-09-29 17:13:35 +08:00
halx99 4065b90039 Preferred use byte_buffer as APIs 2023-09-29 01:57:41 +08:00
halx99 b9b3abb9ed Committing genbindings changes 2023-09-26 04:58:17 +00: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 6f7c40ed15 Improve code style 2023-09-24 01:02:28 +08:00
halx99 012e614d5a Committing genbindings changes 2023-09-19 13:53:04 +00:00
Deal 4f4f07ddc4 Add enable global TTF SDF rendering support (#1333) 2023-09-18 07:18:57 +08:00
Deal f4c3556039 Inspector: remove dup 0x prefix for object address 2023-09-13 20:42:49 +08:00
halx99 51448184c5 ImGui: suppress mouse event for wasm 2023-09-13 16:22:55 +08:00
halx99 e7b9e5feb7 Change cmake target thirdparty type to INTERFACE 2023-09-12 19:31:41 +08:00
halx99 ba37e3009d Improve ImGui loop managment 2023-09-12 19:30:15 +08:00
iAndyHD3 aca00138c1 handle cxxabi correctly (fix windows clang) (#1325) 2023-09-12 07:06:04 +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 c1e36226ff Fix to UI touch location for ImGui on Android 2023-09-11 19:39:41 +08:00
halx99 8b96ff7f1b Tidy platform macros/consts value 2023-09-11 19:37:49 +08:00
halx99 6856c2d073 Committing genbindings changes 2023-09-11 03:15:48 +00:00
halx99 f8b4783768 Committing genbindings changes 2023-09-10 16:38:28 +00:00
Deal 659f2a744c Update ImGui README.md [skip ci][skip appveyor] 2023-09-10 23:03:32 +08:00
halx99 25da753b7c Improve ImGui Loop management 
Properly remove ImLoop to avoid assert fail when there a one or more
viewports window at outside of game view
 2023-09-10 22:38:54 +08:00
halx99 cec4c3a560 ImGui: Clear emscripten's MouseWheel callback before shutdown. 
refer: https://github.com/ocornut/imgui/pull/6790
 2023-09-06 19:15:05 +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 fc669c31fe Fix android ImGUI font Render 
Update imgui_impl_ax glfw to match with ImGui 1.89.8-docking
 2023-09-04 20:03:01 +08:00
halx99 9a9d73a476 Fix ImGui PC platform macro detection 2023-09-03 13:22:40 +08:00
halx99 139181bb53 Particle3D: add wasm support for load materials 2023-09-02 20:36:55 +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 888a1e7d78 Merge: c469e8ac6e 5b2645501f 
Merge branch '1.x' into dev
 2023-09-02 19:51:42 +08:00
halx99 8f8418c15d Merge: c8bfa8cdf1 062b510c38 
Merge 1.x WASM support into 'dev'
 2023-09-02 19:47:18 +08:00
halx99 3875b2c1df Committing genbindings changes 2023-09-01 11:25:21 +00: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