github.com/axmolengine/axmol commits | Ecosyste.ms: OpenCollective

Merge: 8cb24b066f b65c4ddadc

Merge branch 'master' of https://github.com/halx99/engine-x

194ff5f0d3cfa02c2e5457d6b2fecb43c4017204 authored over 4 years ago by halx99 <[email protected]>

Fix ci compile issue.

8cb5ebfa8601684d4be50d35dd0564c1923b4839 authored over 4 years ago by halx99 <[email protected]>

Fix play some .wav file have tail noise, at non-apple platforms we use mpg123,ogg,wav decoder, so don't need workaround to adjust tail frame.

590185b9f84b08663fba5a5034e9a6d8feee73d9 authored over 4 years ago by halx99 <[email protected]>

Remove win32 spec include.

e22155ea0af62b84a9d917b6971fae229eb2b643 authored over 4 years ago by halx99 <[email protected]>

Fix wav decoder when Format chunck have EXT info

82f53e2fed8ee5be065040a100fec559acd24383 authored over 4 years ago by halx99 <[email protected]>

Apple platform no alext.h

a6c342231b6ce92973fa3f61ff16243f1ab7515b authored over 4 years ago by halx99 <[email protected]>

Add all audio source format supported by OpenAL

e2ceefd3aa6247d72796fe40bad1e6c7acc51f2c authored over 4 years ago by halx99 <[email protected]>

Improve bit depth support, both 8bit, 16bit, 32bit FLT, 64bit DBL

c37bc0ac8ea3164d11297bf97634b02274f995f2 authored over 4 years ago by halx99 <[email protected]>

Fix compile error

e77b0eb4bef60bf583c6db98e49aa0cebcc994a8 authored over 4 years ago by halx99 <[email protected]>

fix missing include header file

f26fbf284397c0550384f99d6f45bbda9759ca6b authored over 4 years ago by halx99 <[email protected]>

fix ci error

b39d318a0feef5820a2dbdec81c3f8eb1c4df444 authored over 4 years ago by halx99 <[email protected]>

fix #89

fd6868da79483a2fbd7d9961a1a26929d209698f authored over 4 years ago by halx99 <[email protected]>

Optimize wav decoder code

4db4562d279521594312895d8c2fbf5aeb65e015 authored over 4 years ago by halx99 <[email protected]>

Improve StringUtils::format reuseable, see #88

d2cb808160ed5c7bddf656912927439963c5ba07 authored over 4 years ago by halx99 <[email protected]>

fix typo

5b18408c96397b5159a7e19c60771f5f4a8c0201 authored over 4 years ago by halx99 <[email protected]>

fix #86

0fef6018c0c5d366d4365bb756ef74357b118f6e authored over 4 years ago by halx99 <[email protected]>

Merge: 40cb068201 2385f6847d

Merge

abc5ca848b6d03387e7af937d2119bba530d540a authored over 4 years ago by halx99 <[email protected]>

finish issue: #85

04a460705d7df13be8191a3cff1910a80a60812e authored over 4 years ago by halx99 <[email protected]>

Update README.md

220fba761c8701b9807518e9d7aeb170b1ec520c authored over 4 years ago by halx99 <[email protected]>

fix memory leak & correct indent

cccb66f1aeb666e76205c7ec0939563cdae73cd7 authored over 4 years ago by halx99 <[email protected]>

Remove unused src

e2ac139a62100da97b81bb80ec9787cc91c8ee59 authored over 4 years ago by halx99 <[email protected]>

Remove unused Android.mk files

b30af830186f275394ce65729e782da1ccf24ca4 authored over 4 years ago by halx99 <[email protected]>

Merge: 313d4dc2a1 04ac727c8e

Merge branch 'master' of https://github.com/halx99/engine-x

db6399f792ef8e9eaa48781f8be45d79140fa60c authored over 4 years ago by halx99 <[email protected]>

Update deps to v33

ecd988d324b40c41743ccbbcb61e20d149170822 authored over 4 years ago by halx99 <[email protected]>

fix ios compile error

f6ff10a8e98817e2e15873602555b879b57f8ce5 authored over 4 years ago by halx99 <[email protected]>

Refactor CCValue.

52058861a08e36d48140a48a94e7b67d86c9a128 authored over 4 years ago by halx99 <[email protected]>

Use original c lib minizip-1.2.0

331fa9542eb122b47451ca84109d61586d4611b3 authored over 4 years ago by halx99 <[email protected]>

Remove unnecessary std::move semantics

8822faae9890c62318748b8f1dcdecf0dc0106c7 authored over 4 years ago by halx99 <[email protected]>

Clean JSB sources, optmize script event dispatch.

9d797b6998996d17936e3eaaa727864c398cf890 authored over 4 years ago by halx99 <[email protected]>

Optimize & sync sources

04cce8b7e55ef477d5a7f7046ea114d5c2d3f22a authored over 4 years ago by halx99 <[email protected]>

Merge: b350a7abf8 d9e6cb8e33

Merge pull request #72 from c4games/sync-v3-pr20107

Sync v3 pr20107 & fix builtin shaders

48007c67c913212d6f57bebb25b34b94d817a144 authored over 4 years ago by halx99 <[email protected]>

Merge: 0c291dd470 f5eac1eede

Merge pull request #71 from c4games/sync-v3-pull-19256

Sync v3 pr-19256

88b7b95b73b0a5e62cce9b6be5aae8bfe242946a authored over 4 years ago by halx99 <[email protected]>

Merge: f0d60d4a85 a7e118ec0b

Merge pull request #70 from c4games/remove-unused-shader

Remove unused shader

810397ebfe3ef7723ddcc2a7a6386e1f548857bb authored over 4 years ago by halx99 <[email protected]>

Sync v3 pr20107 & fix builtin shaders, see: https://github.com/cocos2d/cocos2d-x/pull/20107

825ec25a6bbe145e1d496faf78d4115daa49947f authored over 4 years ago by halx99 <[email protected]>

Fixup, optimize shader compile log.

57dd626e39a13f64f0ce6d6796253924e446cf9c authored over 4 years ago by halx99 <[email protected]>

Sync v3 pr-19256, see: https://github.com/cocos2d/cocos2d-x/pull/19256

77b1f41c854ea6322e63117bfef0e2f689c0f33f authored over 4 years ago by halx99 <[email protected]>

Remove unused shader

07bbbe60955872a639ba6e7b9ba6658dde33bff9 authored over 4 years ago by halx99 <[email protected]>

Update readme

97073023868a6531105484dcaf7b1a0d4f34be4c authored over 4 years ago by halx99 <[email protected]>

Update ci status

44800b0bd51a1e45f129a1a53b26c3b788a415ec authored over 4 years ago by halx99 <[email protected]>

Add missing header

d0c0872dd9511cf9810dd79552e84823ff9b25b4 authored over 4 years ago by halx99 <[email protected]>

fix indent

d0ddafb4241a598d814dda1fb6d016312f6dcf31 authored over 4 years ago by halx99 <[email protected]>

fix #41

734b5bd44f41ba08714e1912bab40e50d7ec0243 authored over 4 years ago by halx99 <[email protected]>

Remove duplicated code

82808a321ddf6ea8eedab903e07fcaa9fc269d6a authored over 4 years ago by halx99 <[email protected]>

Fix adjust issue at Texture2DGL::initWithZeros

584ee96a89db122577e6efaf23dbdccf2cba9d01 authored over 4 years ago by halx99 <[email protected]>

Sync for glad

ab322c86411f9a87dc5a7148ce3c920a4f5e42c5 authored over 4 years ago by halx99 <[email protected]>

Use modern gl/gles loader 'glad' to instead 'glew'

d0a583943919820c1133abd89fc91ab585143491 authored over 4 years ago by halx99 <[email protected]>

Merge: d3162956e7 5416b4d34c

Merge pull request #60 from c4games/remove-xxtea

Remove xxtea, cleanup xxtea reference sources

0cb266cb5774a324dc636353c0e9077205f7d207 authored over 4 years ago by halx99 <[email protected]>

Sync https://github.com/cocos2d/cocos2d-x/pull/20457

78cd37f01aadd9e1d36ad4f8ad797ba607c455da authored over 4 years ago by halx99 <[email protected]>

Update features status

853e6b92e2d8179f16069149bc6b2a8a433fcc31 authored over 4 years ago by halx99 <[email protected]>

Remove xxtea, cleanup xxtea reference sources

52d8799d64d87a16269845c66d25597925aeb018 authored over 4 years ago by halx99 <[email protected]>

Merge: f7330a9b3c e2c4b786b8

Merge pull request #58 from c4games/mmt-ios

Make multi-meta-textures feature works on Apple Metal.

f46c9575a49579a2b74780edd8f52a227b16984b authored over 4 years ago by halx99 <[email protected]>

Call initWithZeros at constructor once is works

bc343072ce3c57aa71e22c41f0166887dc3bcc2a authored over 4 years ago by halx99 <[email protected]>

Refine sources

f45bcbc723d82a4959bd74dc80c5d5c201a509ef authored over 4 years ago by halx99 <[email protected]>

fix ci error

8d0d83b2ee7b3d25f0f7e071fc61b2e3f83784f8 authored over 4 years ago by halx99 <[email protected]>

Remove unnecessary constructors.

e065f94aa4341ffc72ff2d72a2fee1a3f466b16c authored over 4 years ago by halx99 <[email protected]>

Refine STMGT

3ebacd33e963817a7ab31e84dc35f763a32ad9a2 authored over 4 years ago by halx99 <[email protected]>

Move maxTextureIdx to base texture class

be59a192c14ec7a43cc3a31ba7193d17a5c0ad2e authored over 4 years ago by halx99 <[email protected]>

Merge: 5a83d24b2f a460438c3b

Merge pull request #56 from c4games/astc-ios

Make astc works on ios platform.

46c8fff152c640ab2b925c402b49f1f9eb8296ef authored over 4 years ago by halx99 <[email protected]>

Make multi-meta-textures support works on Metal.

67c153f589b80f2024056b648e9e0ac37044c6c4 authored over 4 years ago by halx99 <[email protected]>

Update deps to v29

55f96054b7d7cb943a4618d03885152e89ef80b7 authored over 4 years ago by halx99 <[email protected]>

Make astc works on ios platform.

72eaf595b59198beb6c95f5181bc46e69179b9f2 authored over 4 years ago by halx99 <[email protected]>

Refine extensions output.

b108276f56a5782512b6c9da6259bd11c3d08fe3 authored over 4 years ago by halx99 <[email protected]>

fix compile error

35ca58fab205c79961c33b885cfe0080e277a6eb authored over 4 years ago by halx99 <[email protected]>

fix #53

f1df405e822558f4ecf1f997fb2883e2421f95a2 authored over 4 years ago by halx99 <[email protected]>

Merge: f6853a5852 f36d21c9bf

Merge pull request #52 from c4games/fix-issue51

fix #51

bb441097e7f5eee22855c30fee55e509f5ca341b authored over 4 years ago by halx99 <[email protected]>

Merge: 2d3e162e21 5d7f58c3ad

Merge pull request #50 from weiwest/master

add astc support (Great Job)

41f08699263054e7fe1fbb08e50d579555ce5b3c authored over 4 years ago by halx99 <[email protected]>

fix #51

53d784af8da581e4cacc2a08517940b12504d42c authored over 4 years ago by halx99 <[email protected]>

Merge: 2a02db76d8 2d3e162e21

Merge remote-tracking branch 'upstream/master'

a998fe8c14745e14fb8a633b927d7f6f0b566aa9 authored over 4 years ago by weiwest <[email protected]>

remove test log

ee875efab0ba66343700a0acdb42eab22a3434a4 authored over 4 years ago by weiwest <[email protected]>

add astc soft decode support

33b9e8330b94518087e6bc560b3e9b403a1be0e7 authored over 4 years ago by weiwest <[email protected]>

Update README.md

d573dc14bc500bb82541f6fd8c74b7799c7f13c3 authored over 4 years ago by halx99 <[email protected]>

Merge: e698c3ed81 3fb83491c5

Merge pull request #48 from c4games/fix-ios-link-error

fix ios openssl link error

61b9e21b51ba731e473d75428e929ba509c99ebd authored over 4 years ago by halx99 <[email protected]>

Merge: 33d3721c6a 33e765455c

Merge pull request #47 from c4games/ios-build-guides

Update README.md

579eeb5e7b281c4df89e04fa6286660ef5b369f3 authored over 4 years ago by halx99 <[email protected]>

fix ios openssl link error

9b3dfe29a71c120656c0119f75a368c31d8e800c authored over 4 years ago by halx99 <[email protected]>

Update README.md

b4a63a85c9fcb4a11eba180d9d70fa77ae0a8c74 authored over 4 years ago by halx99 <[email protected]>

Disable lua binding gen test, fix later

17cfcb32be54cb452629f39aa84fbc74fb1fda95 authored over 4 years ago by halx99 <[email protected]>

fix cmake gen command for vs2019

10e3965bf8a4d78d6a04e503fb64a9534e6dfaf7 authored over 4 years ago by halx99 <[email protected]>

Upgrade win32 compile tools to vs2019

9efff64c9e61e3aef4cd2f31d4af58319030bd74 authored over 4 years ago by halx99 <[email protected]>

Reset ios toolchain

eec29eb3be3195071282bc034ca1cf37ca699750 authored over 4 years ago by halx99 <[email protected]>

Merge: b39b6e9acb cffc332499

Merge pull request #44 from halx99/master

Fix travis ci ios build issue

fcbc5afbb3e8f5d4cd42db0623c3c2c4918cb4b7 authored over 4 years ago by halx99 <[email protected]>

Update ios cmake guide

b2f30327d797c872d53d6edb2d62297ac281860b authored over 4 years ago by halx99 <[email protected]>

Use ios.toolchain.cmake

3c71559b17c182dec0875c970785e503c4093a81 authored over 4 years ago by halx99 <[email protected]>

Update README.md

e1d937bb1acaa4996c6ec8a3343eba31198b3b40 authored over 4 years ago by halx99 <[email protected]>

Update README.md

dc05990b87fd04286ea495e5ce1c235840a61a83 authored over 4 years ago by halx99 <[email protected]>

Add ios.toolchain.cmake

209fbae7bf1e348c0ea5d222878db5b58893f5af authored over 4 years ago by halx99 <[email protected]>

Merge: 8a7a785137 38564c696d

Merge pull request #43 from halx99/master

fix ci [fork:halx99-appveyor]

12e07bce14c225c9d3609ee7308008b00b7f0658 authored over 4 years ago by halx99 <[email protected]>

fix ci error for PLATFORM_TARGET_MAC

cae5a84c1b2d793311596fe162cfad6064f54170 authored over 4 years ago by halx99 <[email protected]>

Sync lua bindings for UserDefault Refactor

9a5d6b4f5e5b4d561593134f4e6a4076d43b6cae authored over 4 years ago by halx99 <[email protected]>

disable other jobs exclude android & ios

dc09756a94106f7e56ee29e0747d45f323f1916e authored over 4 years ago by halx99 <[email protected]>

test iphoneos

25ec31f9386abd2fca9d0f08c50be09d1de823ac authored over 4 years ago by halx99 <[email protected]>

Update appveyor status url

c560d675bdc0756449bce6c57eb29a36891d59a4 authored over 4 years ago by halx99 <[email protected]>

Merge: 45f1fb5265 70cb64854f

Merge pull request #40 from halx99/master

Refactor UserDefault, cbc128 encrypt support.

c1c6e13feaf21a295ba7197189ac9eb7042d7914 authored over 4 years ago by huizhen <[email protected]>

fix comment.

d38b5a131060c9261aea9b07e83b8ea106496141 authored over 4 years ago by halx99 <[email protected]>

Refactor UserDefault, cbc128 encrypt support.

b32d0b0afe92d3375c575399afc696791ecd7777 authored over 4 years ago by halx99 <[email protected]>

Merge: ffcb65fdaa e10155bef4

Merge pull request #39 from halx99/master

Refactor UserDefault, add plain mode for win32.

aa4d08eb3fafb76a31d44603a7c58fc990bc54b0 authored over 4 years ago by halx99 <[email protected]>

add astc support 8x8 block size

2acb59d3779591e33ad97ada15200ae0e97da8f5 authored over 4 years ago by weiwest <[email protected]>

Refactor UserDefault, add plain mode for win32.

plain mode: 760ms
binary mode: 11ms

277120ead1f4f90be5155ddcd9e24ad4e8b69b11 authored over 4 years ago by halx99 <[email protected]>

Add ios guide to readme.

fcc061bc2251363614a66cbee3be99f71f41fc11 authored over 4 years ago by halx99 <[email protected]>

Merge: 30e21d3b08 21b378ead3

Merge pull request #36 from halx99/master

Refactor UserDefault, use file mapping implementation.

1fa510712ef4a9831cd5073817f833121be01659 authored over 4 years ago by huizhen <[email protected]>

Refactor UserDefault, handle error & fix can't enlarge problem.

062c99844e63dbe52ccadd671079dc6712f600bf authored over 4 years ago by halx99 <[email protected]>