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

99 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 33bb9c1334 Move cmake/Modules/* to cmake/* 2023-08-28 13:47:24 +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
halx99 0d5addaf39 Update setup.py to setup.ps1 in cmake [skip ci] 2023-07-06 14:00:21 +08:00
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159) 
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
 2023-04-02 16:04:19 +08:00
halx99 760c59ab6e [UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets 2023-03-12 17:57:54 +08:00
RH 3f6847ebf0 Set default project in Visual Studio for UWP (#1111) 2023-03-12 12:34:51 +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
RH 00989196af Fix incorrect content variable in cpp template (#1095) 
* Fix cpp-template-default CMakeLists.txt content folder reference
Update test project content folder variable name to match cpp template
 2023-03-04 21:25:05 +08:00
RH 14ccdfcffa [Apple] Fix for missing resources (#1092) 
* [Apple] Ensure resources are mapped to the expected directory by iOS and MacOS targets
 2023-03-03 21:53: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
halx99 452754981a [CMake] Add symlink support, refer to #1005 
- Rename ax_<xxx>_copy_xxx to ax_<xxx>_sync_xxx
- Add optional arg `SYM_LINK`
 2023-02-22 23:37:32 +08:00
Oren Bengigi 5713b3c31b Update CMakeLists.txt (#1031) 2023-01-14 16:34:50 +08:00
CHP 8d36190c98 Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08:00
halx99 176d4384b3 Remove unnecessary cmake include 2022-12-17 14:32:20 +08:00
AsakuraMizu 0f32899747 experimental linux prebuilt support 2022-11-17 22:25:13 +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
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 0e300d7d3e Improve project template [skip ci] 2022-06-24 03:09:20 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +08:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08:00
DelinWorks 73b29e235e Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
halx99 5c9ab14d3e Fix astc cmake simd check for windows x64 2022-06-15 21:16:51 +08:00
DelinWorks 82722eefc2 Fix rotation override and node base class calls. 
Make sure Node class calls it's base functions and NOT the ones overridden when changing position, and make sure the rotation set for the camera isn't altered when calling applyCustomProperties().
 2022-06-15 16:10:47 +03:00