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

95 Commits

Author SHA1 Message Date
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +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
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00
halx99 cdbfe0d0e6 Remove dep libiconv since we don't required 2022-06-11 15:34:12 +08:00
halx99 349a53fce6 Improve cmake scripts 2022-05-19 10:54:42 +08:00
halx99 dffaf9b8d7 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +08:00
halx99 2e6fd8891f Cleanup code 2022-05-14 02:47:47 -07:00
halx99 c3f40d2b36 Improvements and bug fixes 
Improve ResizableBufferAdapter style

Improve extesnion adxelua

Improve code quality

Fix lua-tests BillBoardTest

Sync texture pixel format enum values for adxelua

Fix luaval_to_vec2 parameter location

Improve windows workflow

Improve cmake scripts

Take care Texture2D::setDefaultAlphaPixelFormat use
 2022-05-13 21:06:29 +08:00
halx99 3df97fc1bf Improve VS Ninja build again 
a. Auto copy webview2 dll for targets
b. Fix cpp-tests compile error
 2022-04-27 19:39:12 +08:00
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00
涓€绾跨伒 f5f767976f Try fix empty/missing DT_HASH in "libOpenSLES.so" 2022-04-04 17:47:45 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 87c51c656c Update plainlua to 5.4.4, pugixml to 1.12.1 2022-02-17 18:06:19 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
deal 3359ac211f Don't needs copy plainlua.dll when use luajit 2022-01-17 23:50:05 +08:00
halx99 3600011b43 Always enable string pooling for msvc 2021-12-04 13:45:25 +08:00
halx99 ea925ac746 Merge: 9930eef75a 2ca99fce0f 
Merge pull request #542 from adxeproject/codebase-cpp17

Improve codebase to c++17
 2021-11-26 19:17:04 +08:00
halx99 12f1f5929d Fix compile 2021-11-26 18:13:33 +08:00
halx99 ac937714e2 Improve codebase to c++17 2021-11-26 18:06:14 +08:00
halx99 8d2dd47cc6 Fix #522 2021-10-12 13:16:27 +08:00
halx99 8d83891f30 Improve lua workflow on windows 
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
 2021-10-07 18:44:34 +08:00
halx99 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 87d13bd73a Add win64 angle dlls 2021-09-01 10:28:37 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 3fd20e30cf Update CocosConfigDefine.cmake 2021-08-27 01:08:14 +08:00
halx99 d59bcadf23 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 64f64f02c9 Update curl to 7.78.0 and use prebuilt lib for speedup cmake generation time 2021-08-23 20:38:52 +08:00
halx99 5b21fe8ce9 Explicit disable codesign for macOS 2021-08-13 10:19:24 +08:00
halx99 1452e698e3 Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 dc3b5292d7 Xcode Embed Frameworks support 
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
 2021-08-10 11:43:16 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 e58472901c Sync CMakeLists.txt and README files [skip ci] 2021-07-08 22:55:33 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 2c5e7c58fb Update name 2021-06-01 20:31:48 +08:00
RH 4e24a8d5a9 Fix for incorrect COCOS_COMMAND path (#357) 2021-05-24 23:15:06 +08:00
halx99 84a8ec8e2e Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 413b0acaa6 Fix #352 [ci build] 2021-05-12 11:18:31 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00