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

40395 Commits

Author SHA1 Message Date
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
halx99 81af90d463 Fix android ci 2022-08-02 18:49:19 +08:00
unknown 797a41b469 Missed edge case when resizing the memorymapped file in UserDefault that could cause a crash 2022-08-02 16:13:12 +05:30
一线灵 a3b89db466
Update setup_android.py 2022-08-02 18:07:00 +08:00
halx99 cc8692b6f6 Fix live2d_tests android build 2022-08-02 17:55:42 +08:00
halx99 84a540ea66 Improve gradle script 2022-08-02 17:55:00 +08:00
halx99 1a67a71d26 Update readme files 2022-08-02 17:54:18 +08:00
halx99 6fda3c6e57 Committing genbindings changes 2022-08-02 00:29:11 +00:00
一线灵 50811b1d38
Merge pull request #767 from askamn/dev 
Expose closeKeyboard() method for EditBox
 2022-08-02 08:21:23 +08:00
unknown 5685db91a3 closeKeyboard() method for EditBox 2022-08-02 03:02:35 +05:30
halx99 0800903a0a Add more compatible macros to cocos2d.h [skip ci] 2022-07-26 22:50:51 +08:00
halx99 a9b101809f Sync spine=3.8 latest 2022-07-26 21:04:27 +08:00
一线灵 c286d38df3
Merge pull request #765 from clawfinger/patch-1 
Added automake and libtool to dependency list
 2022-07-24 23:37:36 +08:00
Dmitry Vassiliev ca1f530e4b
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 1768b2c680
Remove the 'examples' folder from axis (#764) 2022-07-22 17:37:14 +08:00
tkzcfc 9791189fd3
[Lua Binding] Support return type 'ResourceData' (#763) 2022-07-22 13:13:22 +08:00
halx99 cb105fe761 Update readme files 2022-07-21 22:15:13 +08:00
aismann 73153ad614
Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
halx99 5391557c09 Fix #758 2022-07-20 18:41:33 +08:00
halx99 c3558448c2 Committing genbindings changes 2022-07-20 00:57:28 +00:00
一线灵 9aa4699685
Merge pull request #757 from DelinWorks/improve-3d-renderer 
[IMPROVMENT] Add primitive type support for mesh materials.
 2022-07-20 08:49:59 +08:00
DelinWorks 1791579fda Add primitive type support for mesh materials. 2022-07-20 02:33:45 +03:00
一线灵 abf4c1e010
Merge pull request #756 from aismann/dev 
Fix: #712 (mistake by me)
 2022-07-20 07:11:09 +08:00
aismann 3e38cfdc6e Fix: #712 (mistake by me) 2022-07-19 20:05:19 +02:00
halx99 5b98fa33a2 Committing genbindings changes 2022-07-19 10:58:12 +00:00
一线灵 90bc950f3e
Update genbindings-ci.yml 2022-07-19 18:50:49 +08:00
一线灵 00cd52672d
Update README_CN.md 2022-07-19 16:25:13 +08:00
一线灵 2affda9f45
Merge pull request #754 from axis-project/migrate-cocos2d-debug 
Migrate macro COCOS2D_DEBUG
 2022-07-19 16:24:17 +08:00
halx99 600fdd5962 Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
一线灵 80b63b0204
Merge pull request #753 from aismann/patch-1 
Renamed 'CC_CALLBACK_1' to  'AX_CALLBACK_1'
 2022-07-19 15:22:46 +08:00
aismann 12a1d92536
Renamed 'CC_CALLBACK_1' to 'AX_CALLBACK_1' 2022-07-19 08:32:18 +02:00
一线灵 2d1be5612e
Merge pull request #752 from DelinWorks/fix-shader-compilation 
[BUG] Fix material `QUAD_COLOR` vertex shader compilation.
 2022-07-19 14:25:26 +08:00
DelinWorks a0e6d4a045 Fix quad vertex shader compilation. 2022-07-19 08:20:13 +03:00
halx99 47577ebb34 Sync byte_buffer.hpp 2022-07-18 15:33:05 +08:00
halx99 47db7aff28 Remove check since axis allways enable string-pooling 2022-07-16 17:53:01 +08:00
一线灵 ee8877615d
Merge pull request #750 from axis-project/migrate-macros 
Migrate macros 'CC_' to 'AX_'
 2022-07-16 12:45:47 +08:00
halx99 4974d1181c Sync platform macros [skip ci] 2022-07-16 10:53:30 +08:00
halx99 fe25ceeea3 Remove unexpected files 2022-07-16 10:44:32 +08:00
halx99 c0a4371879 Migrate more macors 2022-07-16 10:43:05 +08:00
一线灵 2e0ac94240
Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 f3ac6ea871 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
halx99 571f0b3b25 Update ci ignore [skip ci] 2022-07-15 18:51:17 +08:00