22 Commits

Author	SHA1	Message	Date
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	e6a48e8f86	Update ImGui to 1.89.8	2023-08-26 11:24:11 +08:00
halx99	323ed9431b	Renaming extension ImGuiEXT to ImGui ... The singleton class ImGuiEXT also was renamed to ImGuiPresenter	2022-02-25 19:03:09 +08:00
halx99	ade15f070b	Refine extension ImGui, and rename director to ImGuiEXT	2020-09-05 17:10:09 +08:00
halx99	d8f6edd211	fix .travis.yml	2020-09-04 17:19:51 +08:00
halx99	170d8eb0f5	test	2020-09-04 17:03:25 +08:00
halx99	9b2665e9ce	Add ImGuiEXT extension support	2020-09-04 16:13:40 +08:00