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

40486 Commits

Author SHA1 Message Date
一线灵 2abcab8de8
Merge pull request #795 from axys1/fix-osx-ios-ci 
Fix osx/ios ci
 2022-08-11 13:44:29 +08:00
halx99 20a83d198a Fix osx/ios ci 2022-08-11 13:08:14 +08:00
halx99 2c07233232 Committing genbindings changes 2022-08-11 03:03:29 +00:00
halx99 3cf19787ce Fix #791 really 2022-08-11 10:52:38 +08:00
halx99 e2918ad924 Migrate extension 'ImGUI' 2022-08-11 10:02:30 +08:00
halx99 2b1770bdc7 Committing genbindings changes 2022-08-11 01:57:48 +00:00
一线灵 6c0f9ab7f4
Merge pull request #792 from DelinWorks/fix-camera-view-calculation 
[BUG] Fix camera view calculation and tidy up system.
 2022-08-11 09:50:46 +08:00
DelinWorks 4ed7c32cf3 Remove assign dups and simplify function naming. 2022-08-11 01:52:04 +03:00
Turky Mohammed 84003b66b2
Update CCCamera.h [skip ci] 2022-08-10 21:10:34 +03:00
DelinWorks dcd0fd6001 Add initialize member function. 2022-08-10 21:09:10 +03:00
DelinWorks 0dfa828926 Update CCCamera.cpp [skip ci] 2022-08-10 20:38:59 +03:00
DelinWorks 63e72775f5 Fix camera view calculation and tidy up system 2022-08-10 20:14:18 +03:00
halx99 0df0947d05 Improve code style 
Refer to: https://github.com/cocos2d/cocos2d-x/pull/20743
 2022-08-10 21:08:51 +08:00
halx99 3bee678553 Migrate docs 2022-08-09 18:16:56 +08:00
halx99 4853ebd41d Fix #786 2022-08-09 16:44:52 +08:00
halx99 4bcefff704 Fix macOS/iOS build warning 
invalid character in Bundle Identifier. This string must be a uniform type identifier (UTI) that contains only alphanumeric (A-Z,a-z,0-9), hyphen (-), and period (.) characters. (in target 'cpp_tests' from project 'axys')
 2022-08-09 15:32:00 +08:00
一线灵 a5b1f8efaa
Improve performance with std::move 2022-08-09 13:21:53 +08:00
一线灵 f7a6f81ae2
Merge pull request #787 from aismann/dev 
rename push_back vs emplace_back (fine tuning and remove on Live2D (t…
 2022-08-09 13:06:22 +08:00
aismann 8b408b2cde rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02:00
aismann 28dd328eda
replace push_back() vs emplace_back() on extension (#785) 2022-08-09 09:54:53 +08:00
halx99 45d4d49266 Fi ci 2022-08-09 09:48:03 +08:00
一线灵 0b3032b4b1
Fix ci 2022-08-08 22:22:34 +08:00
一线灵 13fc72c02c
Migrate axys (#782) 2022-08-08 18:02:17 +08:00
aismann 10530b1a19
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 9b7910daea Improve android gradle utils 2022-08-07 09:26:56 +08:00
halx99 f03bce1380 Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 e31640ca7b Fix andorid ci 2022-08-06 22:10:56 +08:00
halx99 e2b22817a8 Merge branch 'dev' of https://github.com/axis-project/axis into dev 2022-08-06 22:03:14 +08:00
halx99 f40c44755f 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 7a7c8fe2ae Committing genbindings changes 2022-08-06 12:11:55 +00:00
halx99 f152c8edf3 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
一线灵 86a3328a5c
Fix typo 2022-08-06 19:49:25 +08:00
halx99 483ee8ad26 Update readme files 2022-08-06 19:47:45 +08:00
一线灵 e42bdbb9be
Update README.md 2022-08-06 19:29:04 +08:00
halx99 21b9ac90e0 Update android target and compile sdk to android 12 2022-08-06 19:26:44 +08:00
halx99 70752831f6 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 c3582b45f8 Sync axis cmdline stat default value [skip ci] 2022-08-06 18:26:47 +08:00
Turky Mohammed 399dac7478
[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 c21408cd73 Fix #776 2022-08-04 21:05:48 +08:00
tkzcfc 8178ce87e1
Support spine binary files (#777) 2022-08-04 20:11:11 +08:00
一线灵 1eb63898f6
Merge pull request #774 from askamn/dev 
robin_const_iterator Bug fix in robin_hash.h
 2022-08-03 22:17:53 +08:00
unknown 7b76fa5680 robin_const_iterator Bug fix in robin_hash.h 2022-08-03 18:45:10 +05:30
一线灵 8543a19980
Merge pull request #773 from pietpukkel/dev 
Support for Apple Silicon / M1
 2022-08-03 09:54:35 +08:00
一线灵 e580276726
Merge pull request #772 from askamn/dev 
Replace getSpriteFrameByName() with findFrame() in cocos-studio
 2022-08-03 09:53:53 +08:00
pietpukkel 2ad5892b03 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 6c08914f74 Replace getSpriteFrameByName() with findFrame() in cocos-studio 2022-08-02 20:01:44 +05:30
halx99 654326ec5a Fix live2d-tests 2022-08-02 22:03:54 +08:00
一线灵 5f099c56ac
Fix #771 2022-08-02 21:48:16 +08:00
一线灵 681e18677f
Merge pull request #769 from askamn/dev 
Crashfix in UserDefault
 2022-08-02 21:11:33 +08:00
一线灵 df2cfe1490
Fix android ci 
Overwrite deprecated env to avoid use unexpected android sdk
 2022-08-02 19:17:16 +08:00