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
|
9251d8beff
|
Fix ios ci
|
2023-09-02 20:17:39 +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 |
halx99
|
33bb9c1334
|
Move cmake/Modules/* to cmake/*
|
2023-08-28 13:47:24 +08:00 |