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

356 Commits

Author SHA1 Message Date
halx99 8bf4817ff7 Fix compile errors in c++17 2023-03-08 08:34:17 +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 70cef3ca58 Check astc image header wildcard for some extesion formats [skip ci] 2023-02-18 11:43:44 +08:00
halx99 e6a3aedff0 Working on c++23 
There are many more efficient features on future c++23 standard
 2023-02-18 11:39:31 +08:00
halx99 97c77d4c9d Fix ci 2023-01-24 15:49:40 +08:00
halx99 4b6692ece0 Fix platform macro pred 2023-01-24 13:58:29 +08:00
halx99 2727d18250 Fix macro detect 2023-01-24 11:09:16 +08:00
Joilnen 93d6f2c69d fixing a warning message (#1035) 2023-01-22 14:10:39 +08:00
Deal(涓€绾跨伒) 52cb279f75 Update CCGLViewImpl-desktop.cpp 2023-01-22 07:39:46 +08:00
halx99 04cbc8dfb7 Fix ci 2023-01-21 21:57:28 +08:00
halx99 71b4287688 Fix ci 2023-01-21 20:04:58 +08:00
halx99 fc5025da10 Fix osx ci 2023-01-21 19:24:58 +08:00
halx99 7faca1e74a Fix ci 2023-01-21 18:49:02 +08:00
halx99 27a38b2335 Unify CCGLViewImpl-desktop 2023-01-21 17:57:56 +08:00
halx99 3e4be65a8f Fix osx ci 2023-01-21 16:56:04 +08:00
halx99 ae14727dc7 Fix #1032 2023-01-17 10:06:09 +08:00
halx99 fa9f663e3a Don't use deprecated function 2023-01-11 23:28:22 +08:00
pietpukkel c09449d40b Resize on Windows (#1026) 
* Resize on Windows

Fixed resize on Windows

* Better code quality

Co-authored-by: <halx99@live.com>
 2023-01-11 22:24:43 +08:00
halx99 f739f49eaf Make linux defautSearchRoot same with win32 2023-01-10 23:06:04 +08:00
halx99 e86f2e3f73 Fix ci 2023-01-05 00:35:55 +08:00
halx99 bc9e4483e9 Fix ci 2023-01-05 00:31:08 +08:00
halx99 66be2a592e Fix ci 2023-01-04 23:21:24 +08:00
halx99 98efcfe193 Update yasio to latest 2023-01-04 23:20:07 +08:00
halx99 aeedf0daee Improve posix macro definations 2023-01-04 23:05:52 +08:00
halx99 a8916dfd50 Preferred use ax::print for engine log output 2023-01-04 22:52:40 +08:00
halx99 429e62ff95 Merge: 427ae694bd b5cde53994 
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
 2023-01-04 21:26:23 +08:00
halx99 8c9cda5b16 Fix http request issue when path empty from url 
Ensure path can be use for http request directly
 2023-01-04 21:26:01 +08:00
CHP a6b09af092 ANDROID_SDK_ROOT -> ANDROID_HOME (#1009) 
* Update setup.py

* ANDROID_SDK_ROOT -> ANDROID_HOME
 2023-01-04 08:03:48 +08:00
halx99 0684ac0ef4 Fix charset process in glfwCharCallback 2022-12-18 11:52:57 +08:00
Vincent Lee 5f6e1cd42d Fix warnings (implicit conversion loses and use of deprecated function) 2022-11-20 09:58:34 +09:00
joilnen 5214ea1eb1 fixing some warnings compilation in linux gcc 12.2.0 2022-11-14 15:46:27 -03:00
涓€绾跨伒|Deal c1a576558e Update axutils.gradle 2022-11-10 23:25:45 +08:00
halx99 d742dceb9f Improve gradle scripts 
Add cmake options from gradle command line properties support
 2022-11-10 22:53:54 +08:00
halx99 3d1bf684a4 Fix ci 2022-11-10 22:03:40 +08:00
halx99 0279d5c158 Fix #958 2022-11-10 21:22:55 +08:00
halx99 df91bc9d69 Improve ftruncate 2022-11-10 13:45:51 +08:00
halx99 7d1a911b91 Remove unnecessary platform macro define in cmake 2022-11-01 19:00:48 +08:00
halx99 a4d8687066 Improve platform macro detection 2022-11-01 18:31:31 +08:00
涓€绾跨伒|Deal 6ddd6f0e05 Update CMakeLists.txt 2022-11-01 06:47:36 +08:00
halx99 a87bf2ee4b Fix effekseer compiling [skip ci] 2022-10-31 14:30:33 +08:00
涓€绾跨伒|Deal 2a440a8c42 Update CCFileUtils-apple.mm 2022-10-31 08:12:06 +08:00
涓€绾跨伒|Deal 22f51204f7 Fix ci [skip ci] 2022-10-31 08:09:55 +08:00
halx99 56d66aba67 Remove FileUtils::searchResolutionsOrderArray 2022-10-30 23:03:39 +08:00
涓€绾跨伒|Deal d6254accc9 Improve code style 2022-10-30 16:58:48 +08:00
halx99 84fe8f734a Update glad to v2.0.0 2022-10-25 09:01:57 +08:00
halx99 87000c35fc Add ETC2 support in pvr3ccz format 2022-10-24 19:06:49 +08:00
halx99 abd9338a7a Migrate [skip ci] 2022-10-18 19:13:40 +08:00
涓€绾跨伒|Deal 25d93bd509 Improve code quality (stage1.Oct) (#916) 
* Improve code quality

* Add env PULL_REQUEST [skip ci]

* Update build.ps1

* Fix ci [skip ci]

* Update ZipUtils.cpp

* Update build.ps1

* Resolve reviews

* Improve

* Improve code style

* Resolve reviews

* Use pod_vector

* Improve resize growth

* Update CCAnimation3D.cpp

* Update axstd.h [skip ci]
 2022-10-13 21:44:42 +08:00
涓€绾跨伒|Deal 6f1c8d61d7 Add reasonable comment for performance code 2022-10-08 12:26:38 +08:00
halx99 db1df2f98a Improve code style 2022-10-07 21:48:07 +08:00
halx99 3f40f271d4 Improve performance 2022-10-07 21:36:38 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
tkzcfc 6ec826dfe0 Add macro definition AX_NO_DUP_SEARCH_PATH (#874) 2022-09-30 14:40:52 +08:00
tkzcfc 5870445c87 Improve FileUtils::addSearchPath(#872) 
Avoid duplicate search path
 2022-09-29 23:10:30 +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
涓€绾跨伒|Deal e0e083aa3b Merge: 6df48e9f8b baceccbb2f 
Merge pull request #837 from aismann/ISSUE_#825

#825
 2022-09-02 11:59:46 +08:00
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
aismann 68f8a2b0c7 #825 2022-09-01 13:51:19 +02:00
halx99 5298ed90cb Fix #817 2022-08-31 13:45:06 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
DESKTOP-16GC0B8\813658 ff899d5511 Fixed get writable path for android 2022-08-13 23:53:40 +03: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
aismann 376c80dd2d Replace push_back() vs emplace_back() on axis/tests/cpp-tests and axis/core (#781) 
* Replace push_back() vs emplace_back() on axis\tests\cpp-tests\

D:\______\GitHub\aismann\axis\tests\cpp-tests\Classes
Replace Vector push_back() vs emplace_back() #762

* Replace push_back() vs emplace_back() on axis\core\ #781

* Update CCConsole.cpp

* Update UIWebViewImpl-android.cpp

* Update UIWebViewImpl-android.cpp
 2022-08-08 13:18:33 +08:00
halx99 9ce38e060b Improve android gradle utils 2022-08-07 09:26:56 +08:00
halx99 93550405bc Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 714d814288 Improve android setup tools 
- Rename ANDROID_SDK to ANDROID_SDK_ROOT, refer to: https://developer.android.google.cn/studio/command-line/variables
- CMake: Use ndk in sdk_root/ndk/xxx/
 2022-08-06 22:02:58 +08:00
halx99 5a2ac3d34b Improve gradle script 2022-08-02 17:55:00 +08:00
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
halx99 c16a33e347 Migrate more macors 2022-07-16 10:43:05 +08:00
涓€绾跨伒 ac1872494c Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 41d2c44308 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
涓€绾跨伒 bbe5566dec [Gradle] Fix findNDK 2022-07-12 21:51:44 +08:00
halx99 5f04e88dc7 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
DESKTOP-16GC0B8\813658 07bffb5df1 operator[] changed for better usage 2022-07-09 02:07:01 +03:00
Turky Mohammed 59c6611e71 Replace everything under `core` (#735) 
Co-authored-by: deal <halx99@live.com>
 2022-07-09 01:23:11 +08:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 2ed8c71eb5 Setup vsync for all PC platforms 2022-07-01 17:55:54 +08:00
halx99 f0758b7993 Improve mac fps limit 2022-07-01 11:02:31 +08:00
DelinWorks 35bd10e707 Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
halx99 0707b47256 Try fix fps 2022-07-01 01:00:18 +08:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
涓€绾跨伒 614397d0f4 Merge: 7f795d7a6c c6c07428bf 
Merge pull request #677 from rh101/rendertarget-fix

Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00
halx99 f8c036e621 Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 62af2299a6 Allow the selection of a shared or new render target for each instance of RenderTexture 
Add a method to check if the RenderTexture is using a shared render target
 2022-06-28 17:42:33 +10:00
halx99 7417447fc7 Fix ci 2022-06-28 15:03:35 +08:00
halx99 5db31e4125 Unify fps control logical to director mainLoop 2022-06-28 12:39:05 +08:00
halx99 cb8123e7a7 Improve GPUTextureFormat info enums 2022-06-27 15:37:55 +08:00
halx99 c25552c1b7 Improve code style 2022-06-25 00:36:50 +08:00
halx99 4cf6c52cf4 string_view 2022-06-20 01:49:50 +08:00
DelinWorks 2de02067d3 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
halx99 61956d8dd6 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +08:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks ae5d45a9c3 Fix enum class confliction & clean up types. 2022-06-16 18:48:53 +03:00
DelinWorks 5491ca8e6e Remove useless functions. 2022-06-16 16:16:19 +03: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 c5eb8db573 Fix fixed fps move stuttering. 2022-06-16 03:55:46 +03:00
DelinWorks ebbafbd938 Add function versioning. [skip ci] 2022-06-16 00:47:19 +03:00
DelinWorks 73b29e235e Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
halx99 864601764f Improve code style 2022-06-13 12:46:40 +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
涓€绾跨伒 03c8056078 Merge: 5138d701d6 5c35eda3b9 
Merge pull request #650 from adxeproject/ndk-r23c

Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 9bf295d8e4 Upgrade android toolsets 
- ndk to r23c
- gradle plugin to 7.2.0
- gradle wrapper to 7.4.2
- config ndk ver at adxetools.gradle
 2022-06-11 16:16:47 +08:00
halx99 8eea58226b Remove feature filename lookup dictionary 2022-06-09 16:48:59 +08:00
halx99 3816aa314d Remove ugly feature, fix ci 2022-06-09 16:40:14 +08:00
halx99 0d3e3d3fd8 Improve performance with string_view 2022-06-09 16:30:51 +08:00
halx99 f4b480576c Improve performance with string_view 2022-06-09 16:19:33 +08:00
涓€绾跨伒 4c18771e34 Merge: 6943fb9dce 3a3b899636 
Merge pull request #637 from rh101/fix-screen-blank

Fix Android screen blank issue after unlocking device
 2022-06-07 20:05:29 +08:00
Turky Mohammed d0b551d26b Merge: 6e1d48835e 193ed82788 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 16:55:30 +03:00
DelinWorks 5239256b13 Improve particle RNG and add useful functions 
Replaced M11 RNG with KISS RNG which is better and fixes a problem with particle strafing, added the ability to pause the entire particle system (useful for pause menus) and ability to control particle system time speed multiplier 馃挭馃ザ
 2022-05-23 16:04:09 +03:00
halx99 71c27f43d8 Fix ios device install problems 
- lua template missing `CFBundleExecute`
- Use `_` instead tests project to avoid unknown error
 2022-05-23 17:03:07 +08:00
DelinWorks 4f7bbcdb48 Add TODO 2022-05-21 16:56:56 +03:00
halx99 38510615db Improve code style 2022-05-21 21:55:48 +08:00
halx99 85f395383b Delete unused code 2022-05-18 10:29:29 +08:00
rh101 c8822a9cda Fix Android screen blank issue after unlocking device with application running. 2022-05-17 14:02:02 +10:00
涓€绾跨伒 cc200d3827 Fix high-end device always 120fps 2022-05-15 04:42:39 +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 d86d79eb93 Improve code style [skip ci] 2022-04-28 12:04:23 +08:00
halx99 bddf0aecdb Improve code style 2022-04-28 12:00:32 +08:00
halx99 680f14a5e2 Improve VS Ninja workflow 2022-04-28 11:43:59 +08:00
halx99 ba66918607 Improve Ninja build with visual studio ide 
a. Disable PCH for Ninja, just a workaround fix compiler always said: can't open xxx.pch files
b. Remove unnecessary definition _WINSOCKAPI_ for Ninja build
 2022-04-27 18:48:57 +08:00
halx99 a6e7eb8942 Rename source file name match with class name 2022-04-27 18:24:33 +08:00
halx99 da1b16432e Remove duplicated include 2022-04-26 16:33:04 +08:00
涓€绾跨伒 bd79e4965e Merge: bc16bb1cd3 d71c620fc1 
Merge pull request #622 from shatyuka/dev

Compatible with Ninja
 2022-04-26 16:20:11 +08:00
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00
halx99 83b8828e8d Fix missing include 2022-04-26 12:51:01 +08:00
halx99 5412c14e58 Remove duplicated macros 2022-04-25 21:39:49 +08:00
halx99 cc5509f23a Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 57eefa9d12 Add ktxv1.1 file format for etc2/etc1 support 2022-04-25 19:11:58 +08:00
halx99 4bd1163242 Delete DEPRECATED code 2022-04-23 17:49:42 +08:00
halx99 19b979473c Delete unused code 2022-04-05 13:58:55 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
deal 9f86eef0db Update adxetools.gradle 2022-01-28 19:59:27 +08:00
deal a285c80f89 Update adxetools.gradle 2022-01-28 19:51:42 +08:00
deal 8682491014 Update adxetools.gradle 2022-01-28 19:31:42 +08:00
halx99 231ba0cf5c Improve gradle script to find cmake 2022-01-28 18:25:50 +08:00
deal 73e056f720 Update adxetools.gradle 2022-01-17 10:57:48 +08:00
halx99 beb8606e16 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 64a6c1b105 Improve linkage 2022-01-04 11:00:07 +08:00
deal 15cc403967 Remove dup sources 2022-01-04 09:42:10 +08:00
halx99 cd98e6c880 Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 71c997d1ae Fix isAbsolutePathInternal for string_view 2021-12-31 15:50:34 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00