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

57 Commits

Author SHA1 Message Date
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 0511520281 Merge: 7f1ca55a97 1efe0091a8 
Merge pull request #347 from rh101/imgui-fix

ImGUI font crash fix when using virtual file system
 2021-04-27 23:29:22 -07:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
rh101 13115cc789 Let the OGG function overrides handle freeing memory of the FileStream pointer. 2021-04-26 17:30:18 +10:00
rh101 b923b1a678 Use reset() to clear unique_ptr. 
Use value initialization for unique_ptr.
Change AudioDecoderOgg override functions to use FileStream* instead of unique_ptr.
Remove redundant code.
 2021-04-26 15:43:33 +10:00
rh101 668e96cadd Use unique_ptr for FileUtils::openFileStream 
Fix OGG audio playback due to incorrect tell() method
Fix unzip close() override method not deleting FileStream pointer.
 2021-04-26 14:21:56 +10:00
RH 5b168e3bb6 Merge: 03bb24f313 85c5705f48 
Merge branch 'vfs-support' into master
 2021-04-26 10:39:09 +10:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 e6990d0b36 Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
halx99 be9bd61131 Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
RH dd5f77c3d5 Merge: 15c8f2298d 0886473e1b 
Merge pull request #4 from rh101/master

Sync with master
 2021-04-22 21:49:43 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 6ac06d8571 fix ci compile 2020-08-27 00:49:07 +08:00
halx99 c9d6c5afdf Rename PXFileStream to CCFileStream 2020-08-27 00:21:44 +08:00
halx99 bda3a720b4 Use CC0-1.0 licensed decoder 'minimp3' to replace LGPL licensed decoder 'mpg123' 2020-08-17 14:56:53 +08:00
halx99 072deafeae Adapte zlib licensed AL library: mojoal 2020-08-14 18:58:44 +08:00
halx99 a09253c7a2 fix-157 2020-08-13 22:35:41 +08:00
halx99 d9ef1e238f Simplify audio source again, merge audio sources 2020-08-12 17:00:07 +08:00
halx99 2a2b397f27 Add alconfig.h to choose whether use openal-soft 2020-07-31 17:03:58 +08:00
halx99 65bb368cc2 Add missing detect macro CC_USE_ALSOFT_ON_APPLE on apple platform 2020-07-31 16:36:45 +08:00
halx99 c17ea9fdd5 Update comment [skip appveyor] [skip travis] 2020-07-31 15:49:50 +08:00
halx99 bcd1c17aa5 Tidy audio source, unify headers: AudioEngineImpl.h AudioPlayer.h 2020-07-31 14:32:08 +08:00
halx99 9345f18159 Add CMAKE option CC_USE_ALSOFT_ON_APPLE to use kcat openal-soft on apple platform, by default currently OFF 2020-07-31 00:06:59 +08:00
halx99 3608150968 Use std::vector<char> to manage pcmData buffer on AudioCache, remove unused source from AudioCache.mm 2020-07-30 18:09:50 +08:00
halx99 a2800e0144 Sync missing fixs from v3, see: https://github.com/cocos2d/cocos2d-x/pull/19240 2020-07-30 17:07:38 +08:00
halx99 9b57ed3781 [Audio] Improve mutex use 2020-06-04 23:11:24 +08:00
halx99 56407a9efe [WAV] Finished MSADPCM & IMA4 compress format support. 2020-06-04 12:26:25 +08:00
halx99 bbd7b82bc7 Provide framesToBytes instead getBytesPerFrame 2020-06-03 23:09:45 +08:00
halx99 c79bc38dca Use store bitsPerFrame as-is instead bytesPerFrame. 2020-06-02 12:09:51 +08:00
halx99 3e3097202a Merge: 5d29919586 7676fe2c6c 
Merge pull request #95 from halx99/master

Fix play some .wav file have tail noise
 2020-05-19 14:18:39 +08:00
halx99 bc777089fe Merge: 661d471b37 b65c4ddadc 
Merge pull request #93 from halx99/master

Fix wav decoder when Format chunk have EXT info
 2020-05-19 13:39:07 +08:00
halx99 d8a56aab52 Update copyright 2020-05-19 12:52:34 +08:00
halx99 8cb5ebfa86 Fix ci compile issue. 2020-05-19 12:49:34 +08:00
halx99 82f53e2fed Fix wav decoder when Format chunck have EXT info 2020-05-19 11:42:54 +08:00
halx99 a6c342231b Apple platform no alext.h 2020-05-18 18:36:21 +08:00
halx99 e2ceefd3aa Add all audio source format supported by OpenAL 2020-05-18 17:30:42 +08:00
halx99 c37bc0ac8e Improve bit depth support, both 8bit, 16bit, 32bit FLT, 64bit DBL 2020-05-18 14:56:13 +08:00
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 cae5a84c1b fix ci error for PLATFORM_TARGET_MAC 2020-02-07 16:51:57 +08:00
halx99 ee4ec1d8c3 Optimize audio sources 2019-11-30 17:27:51 +08:00
halx99 dbf2cbfd4d fix compile issue 2019-11-30 14:32:18 +08:00
halx99 1c34056ec4 Sync audio header files 2019-11-30 14:21:36 +08:00
halx99 9b298cde3c optimize 2019-11-30 06:55:32 +08:00
halx99 dd0669b99b Merge: 4bd8c03dba 08b8f087c2 
Merge pull request #7 from simdsoft/fix-ud

Remove tinyxml2, sync ios & android platform.
 2019-11-25 23:59:14 -08:00