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

40069 Commits

Author SHA1 Message Date
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
halx99 dc0670cbd8 Sync docs for namespace migrate 2022-07-15 18:40:42 +08:00
halx99 02f4e77f32 Update thirdparty prebuilts 
- openssl 3.0.5
- luajit 50936d7
- curl 7.84.0

build toolchains

- Android: ndk-r23c
- Apple iOS/macOS: AppleClang 12.0.0.12000032 in xcode 12.4
- Win32/Win64: MSVC 19.29.30145.0 in Visual Studio 2019(16.11.2)
- Ubuntu: GCC 9.4.0
 2022-07-15 12:37:56 +08:00
halx99 c71951f3cb Update thirdparty version info 2022-07-14 23:18:40 +08:00
halx99 616d165f53 Upgrade thirdparty stubs 
- llhttp to v6.0.7
- fmtlib to v9.0.0
- openal to 1.22.2
 2022-07-14 23:17:11 +08:00
halx99 2926c3b526 Fix ios device build issue 2022-07-14 17:20:18 +08:00
一线灵 a86847a6f3
Update plainlua badge 2022-07-14 12:49:48 +08:00
halx99 1cc65bcd7a Update thirdparty upstream version badge 2022-07-13 15:18:44 +08:00
halx99 85e9ae3fa5 Fix lua templte 2022-07-12 23:21:04 +08:00
一线灵 c7a26bebbf
Fix warning format 2022-07-12 22:57:45 +08:00
一线灵 5a1b8074f1
[Gradle] Fix findNDK 2022-07-12 21:51:44 +08:00
一线灵 406f962cad
Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
halx99 cf6baeed52 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
halx99 4ad4bf93b0 Avoid unexpected frame refs increase 2022-07-11 19:34:31 +08:00
halx99 8ca5f1cf0d Fix #742 2022-07-11 19:08:14 +08:00
一线灵 279337f17f
Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
halx99 986540dbef Update byte_buffer to fix #741 2022-07-11 09:12:40 +08:00
一线灵 8bbcf80330
Fix logic 2022-07-10 21:22:08 +08:00
一线灵 3594b161bf
Fix ci 2022-07-10 20:47:50 +08:00
halx99 16a30c8fb8 Fix #741 2022-07-10 20:23:48 +08:00
一线灵 c0fa4d0bcc
Merge pull request #740 from DelinWorks/dev-2 
Remove `FastRNG.h` warnings.
 2022-07-10 16:25:46 +08:00
DelinWorks 9db438a375 Update FastRNG.h 2022-07-10 10:00:02 +03:00
一线灵 3329e1b0ea
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
一线灵 04ca16125b
Merge pull request #738 from solan-solan/index_array_to_stl 
IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 9ee4181976 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
DESKTOP-16GC0B8\813658 2f8d5dd2f6 operator[] changed for better usage 2022-07-09 02:07:01 +03:00
一线灵 18076d09f0
Merge pull request #734 from solan-solan/index_array_to_stl 
IndexArray to stl
 2022-07-09 01:23:36 +08:00