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

2575 Commits

Author SHA1 Message Date
halx99 ddc7d8ccd0 Merge: f40c44755f 7a7c8fe2ae 
Merge branch 'dev' of https://github.com/axis-project/axis into dev
 2022-08-06 22:03:14 +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 64ec0587a5 Committing genbindings changes 2022-08-06 12:11:55 +00:00
halx99 484aa38856 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
涓€绾跨伒 3804acfaae Fix typo 2022-08-06 19:49:25 +08:00
halx99 4555804b22 Update readme files 2022-08-06 19:47:45 +08:00
涓€绾跨伒 c5d4ca17ff Update README.md 2022-08-06 19:29:04 +08:00
halx99 448c76c108 Update android target and compile sdk to android 12 2022-08-06 19:26:44 +08:00
halx99 827dd3351a Sync android sdk build-tools version for setup_android.py 
Match with Android Gradle Plugin 7.2.0
 2022-08-06 19:23:41 +08:00
halx99 c09871e6b2 Sync axis cmdline stat default value [skip ci] 2022-08-06 18:26:47 +08:00
Turky Mohammed 818eb3d754 [PROPOSAL] Add wireframe rendering and function classification improvements. (#778) 
* Add wireframe rendering and function classification improvements.

* Fix platform compilation.

* Update CommandBufferGL.cpp

GL_LINE and GL_FILL are no present in mobile devices, so the raw value has been used instead.

* Update CommandBufferGL.cpp

* Try fix IOS compilation

* Update CommandBufferMTL.h [skip ci]

* GLES & D3D11 wireframe

Added crude but okay wireframe mode for GLES and D3D11 devices.
 2022-08-06 16:17:55 +08:00
halx99 ca3c6fe1fd Fix #776 2022-08-04 21:05:48 +08:00
tkzcfc 8e6d06e9fe Support spine binary files (#777) 2022-08-04 20:11:11 +08:00
涓€绾跨伒 c28df20133 Merge: 654326ec5a 6c08914f74 
Merge pull request #772 from askamn/dev

Replace getSpriteFrameByName() with findFrame() in cocos-studio
 2022-08-03 09:53:53 +08:00
pietpukkel 1a6575ae52 Support for Apple Silicon / M1 
Added universal libraries where needed and changed PNG CMake file to include ARM files when generating Mac XCode project.
 2022-08-02 17:48:03 +02:00
unknown d6e6e81505 Replace getSpriteFrameByName() with findFrame() in cocos-studio 2022-08-02 20:01:44 +05:30
halx99 b0eef2ef8d Fix live2d-tests 2022-08-02 22:03:54 +08:00
涓€绾跨伒 c6ff51e3be Fix #771 2022-08-02 21:48:16 +08:00
涓€绾跨伒 4dc1c53da8 Merge: df2cfe1490 797a41b469 
Merge pull request #769 from askamn/dev

Crashfix in UserDefault
 2022-08-02 21:11:33 +08:00
涓€绾跨伒 17716d853b Fix android ci 
Overwrite deprecated env to avoid use unexpected android sdk
 2022-08-02 19:17:16 +08:00
halx99 ce2494ea35 Fix android ci 2022-08-02 18:49:19 +08:00
unknown 8610fe4b7e Missed edge case when resizing the memorymapped file in UserDefault that could cause a crash 2022-08-02 16:13:12 +05:30
涓€绾跨伒 83d7e2e75e Update setup_android.py 2022-08-02 18:07:00 +08:00
halx99 2f90855c0a Fix live2d_tests android build 2022-08-02 17:55:42 +08:00
halx99 5a2ac3d34b Improve gradle script 2022-08-02 17:55:00 +08:00
halx99 27232ecafd Update readme files 2022-08-02 17:54:18 +08:00
halx99 752c4d1d16 Committing genbindings changes 2022-08-02 00:29:11 +00:00
unknown 85a4433395 closeKeyboard() method for EditBox 2022-08-02 03:02:35 +05:30
halx99 325fc583e9 Add more compatible macros to cocos2d.h [skip ci] 2022-07-26 22:50:51 +08:00
halx99 dec34b4471 Sync spine=3.8 latest 2022-07-26 21:04:27 +08:00
Dmitry Vassiliev 3927a45711 Added automake and automake to dependency list 
This is needed for freetype compilation on a fresh linux machine. Tested on Ubuntu 20.04 and Ubuntu18.04
 2022-07-24 16:55:41 +03:00
aismann 246a6a25db Remove the 'examples' folder from axis (#764) 2022-07-22 17:37:14 +08:00
tkzcfc 839097ed95 [Lua Binding] Support return type 'ResourceData' (#763) 2022-07-22 13:13:22 +08:00
halx99 8efce27d0c Update readme files 2022-07-21 22:15:13 +08:00
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
halx99 07906b96e1 Fix #758 2022-07-20 18:41:33 +08:00
halx99 c4feff6e3a Committing genbindings changes 2022-07-20 00:57:28 +00:00
DelinWorks 09bc97110b Add primitive type support for mesh materials. 2022-07-20 02:33:45 +03:00
aismann 455aff97ea Fix: #712 (mistake by me) 2022-07-19 20:05:19 +02:00
halx99 57a65dc8ce Committing genbindings changes 2022-07-19 10:58:12 +00:00
涓€绾跨伒 72f689e38d Update genbindings-ci.yml 2022-07-19 18:50:49 +08:00
涓€绾跨伒 0b1c5be9c8 Update README_CN.md 2022-07-19 16:25:13 +08:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
aismann e1f458c679 Renamed 'CC_CALLBACK_1' to 'AX_CALLBACK_1' 2022-07-19 08:32:18 +02:00
DelinWorks 881d3e722c Fix quad vertex shader compilation. 2022-07-19 08:20:13 +03:00
halx99 9c97f210df Remove check since axis allways enable string-pooling 2022-07-16 17:53:01 +08:00
涓€绾跨伒 a5e442b33c Merge: 2e0ac94240 4974d1181c 
Merge pull request #750 from axis-project/migrate-macros

Migrate macros 'CC_' to 'AX_'
 2022-07-16 12:45:47 +08:00
halx99 e90579ed96 Sync platform macros [skip ci] 2022-07-16 10:53:30 +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