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

101 Commits

Author SHA1 Message Date
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
halx99 33bb9c1334 Move cmake/Modules/* to cmake/* 2023-08-28 13:47:24 +08:00
Deal(涓€绾跨伒) 82a40314c9 Remove migrate source inseted by axmol-migrate: 
https://github.com/axmolengine/axmol-migrate
 2023-07-07 20:51:04 +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
Deal(涓€绾跨伒) 2ff94f287e Improve ci files (#1247) 
* Improve ci files

* Fixup

* Fix ci

* Update DevSetup.md

* Remove duplicated code

* Fix setup_jdk

* Fix typo

* Check jdk setup

* Update build1k.ps1

* Update build.ps1

* Update build1k.ps1
 2023-07-01 08:52:14 +08:00
Deal(涓€绾跨伒) abd8029f64 Remove CC prefix from code file name (#1230) 
* Add migrate sources tool

* Fix include replace regex

* Fix compile

* Migrate maually

* Disable sources-migrate tool by default

* Fix ci

* Fix ci

* Improve source migrate

* Fix ios/tvos ci

* Fix ios/tvos ci

* Fix
 2023-06-11 13:08:08 +08:00
halx99 760c59ab6e [UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets 2023-03-12 17:57:54 +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
Deal(涓€绾跨伒) 83d53ba46b Tidy project tree and full symlink support (#1072) 
* Tidy project file tree and all symlink support
 2023-02-23 21:57:30 +08:00
CHP fa89bb6706 Improve lua cmake (#986) 2022-12-17 16:35:20 +08:00
halx99 e12b56fd3f Update spine runtime to v4.1-c9af18e 2022-11-07 15:48:19 +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
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
aismann 246a6a25db Remove the 'examples' folder from axis (#764) 2022-07-22 17:37:14 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 9ec21db1d4 Merge: e73b2492c5 b5f7378b72 
Merge branch 'migrate-engine-name' of https://github.com/DelinWorks/axis into migrate-engine-name
 2022-07-08 02:18:06 +03:00
DelinWorks 765d3f5332 Replace CC_ with AX_ 2022-07-08 02:17:41 +03:00
Turky Mohammed 453f364b93 [skip ci] 2022-07-08 02:11:46 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
涓€绾跨伒 d8a66d4897 Merge: 61c159d3d0 932c3bcffa 
Merge pull request #668 from adxeproject/adxe-ext-live2d

Add extension Live2D support
 2022-06-24 16:23:26 +08:00