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

27 Commits

Author SHA1 Message Date
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 b63f815488 Modify some extensions for string_view 2021-12-27 13:52:08 +08: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
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +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 757e7edbf7 lua api compatible 2021-01-09 18:32:22 +08:00
halx99 c17a21eb8c fix #262 2020-11-16 22:38:18 +08:00
halx99 ac21c27140 Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 5748bbee85 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 bc94591603 Tidy sources 2020-08-04 10:55:30 +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