13 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
halx99	cce6c2f8e1	Improve code style	2023-08-30 19:35:38 +08:00
halx99	c06d5af3f8	Move queueOperation from GLView to Director	2023-06-25 01:17:29 +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