15 Commits

Author	SHA1	Message	Date
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
Deal	1f2f54f2ac	Axmol console next (#1313)	2023-08-30 08:34:33 +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
涓€绾跨伒|Deal	48a7da97d6	Final migrate (#876)	2022-10-01 16:24:52 +08:00
Paulo Coutinho	f5aeb5a8c2	Add apple tvos support (#846) ... * support tvos * support tvos and fix run command * support tvos, fix run script and fix windows files * support tvos on ci * support tvos on ci and fix windows zlib * support tvos on ci * support tvos * support tvos and tvos tests	2022-09-05 14:13:52 +08:00
涓€绾跨伒	9892aa3d1c	Migrate axys (#782)	2022-08-08 18:02:17 +08:00