deal
|
f32280ff42
|
Merge: 687d15f16e 369de31853
Merge pull request #560 from adxeproject/ahead
Merge ahead to dev
|
2021-12-31 12:12:40 +08:00 |
halx99
|
64d7b55366
|
Update ci branch name
|
2021-12-31 11:00:35 +08:00 |
deal
|
a813aac10e
|
Merge: 6639f55c0f bec2e07a00
Merge pull request #561 from adxeproject/dev
Merge Crash Fix #559 from dev
|
2021-12-28 21:27:32 +08:00 |
halx99
|
13927aa1bc
|
Fix #559, match number type for get CURLINFO_RESPONSE_CODE
a. On linux x64, will crash with stack protector
Reported by @rh101
Signed-off-by: halx99 <halx99@live.com>
|
2021-12-28 21:00:45 +08:00 |
halx99
|
6bba4ce24b
|
Merge: d397854ead 9eeeb151a1
Merge commit
|
2021-12-28 11:07:12 +08:00 |
halx99
|
c93849c6de
|
Commit chnages
|
2021-12-28 11:05:34 +08:00 |
halx99
|
f905bf5c23
|
Committing clang-format changes
|
2021-12-28 03:00:34 +00:00 |
halx99
|
5ba5049146
|
Huge changes for all string_view
|
2021-12-26 23:26:34 +08:00 |
halx99
|
8f83250ba4
|
Committing clang-format changes
|
2021-12-25 02:04:45 +00:00 |
halx99
|
1ee106007a
|
Remove all unnecessary nothrow
|
2021-12-08 00:11:53 +08:00 |
halx99
|
9ed3be94c0
|
Fix for luabinding generator [ci build]
|
2021-06-18 11:31:07 +08:00 |
halx99
|
8e6faac1f1
|
Merge: 3348f10813 3a7bb58045
Merge pull request #350 from rh101/fix-cmake-set-property
Fix for CMake error when set_property is called with aliased target
|
2021-05-05 19:49:30 +08:00 |
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
|
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 |
halx99
|
87be236932
|
Merge: 8b8b015b02 b1da56d401
Merge pull request #343 from rh101/curl-fix-filestream
Fix for downloader crash due to uninitialised variables
|
2021-04-25 18:34:29 +08:00 |
rh101
|
5509d0f80d
|
Update usage of createDownloadFileTask
|
2021-04-25 18:36:20 +10:00 |
RH
|
c8c4c2d703
|
Merge: 6fbebe9617 8b8b015b02
Merge pull request #6 from c4games/master
Sync with primary
|
2021-04-25 18:14:50 +10:00 |
rh101
|
c26a5e7bd8
|
Ensure FileStream is used for file access where possible
|
2021-04-25 17:22:43 +10:00 |
Oren Bengigi
|
f7c9666c41
|
Fix manifest version greater check
|
2020-11-18 20:43:49 +02:00 |
halx99
|
d535b47145
|
win32 dll improvements
|
2020-10-07 00:15:11 +08:00 |
halx99
|
8b9a6bbbf1
|
fix android build issues
|
2020-08-03 20:31:47 +08:00 |
halx99
|
1e392c9dfe
|
Refine readme [skip appveyor][skip travis]
|
2020-08-03 19:12:07 +08:00 |
halx99
|
3049b8f751
|
Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable
|
2020-08-03 17:51:40 +08:00 |
halx99
|
04a460705d
|
finish issue: #85
|
2020-05-06 15:42:25 +08:00 |
halx99
|
075aadee32
|
Use '/' instead "/" for find & string append.
|
2019-11-25 17:10:25 +08:00 |
halx99
|
7856224ff2
|
Refactor CCDownloader, use curl for all platforms.
|
2019-11-24 15:43:28 +08:00 |
halx99
|
8df3d5e274
|
Init Commit
|
2019-11-23 20:27:39 +08:00 |