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

66 Commits

Author SHA1 Message Date
halx99 426aa0db93 Merge: b48133e9c6 c9ebafe501 
Merge pull request #466 from rh101/fix-sprite-test-crashes

Fixes for crashes in sprite and sprite cache tests
 2021-08-19 14:35:44 +08:00
rh101 ad3e3380e2 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
rh101 bd4d07b86e Update LUA bindings 2021-08-18 01:01:56 +10:00
halx99 de54082c76 Update lua bindings 2021-08-14 13:22:03 +08:00
halx99 fd9422d36d Update lua bindings 2021-08-13 20:36:10 +08:00
halx99 8a9b74fc4d Fix ci 2021-07-19 08:10:37 +08:00
halx99 af027f0161 Update lua_xml_http_request.cpp 2021-07-19 01:29:08 +08:00
halx99 6acbbaf80f Tidy thirdparty lua-cjson 2021-07-16 11:17:34 +08:00
halx99 4b7e098e65 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 4d6ece53f2 Sync lua bindings [ci build] 2021-06-27 21:47:15 +08:00
halx99 72d1ba9ea6 Merge: df58dd753c 2397d54daf 
Merge branch 'dev' into Chipmunk2D
 2021-06-24 17:04:04 +08:00
aismann dbcb5816fe Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 14dc7f05f9 Reimplement HttpClient based on yasio (#390) 
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request

* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code

* [WIP] Reimplement HttpClient based on yasio [ci build]

* [WIP] Fix ci [ci build]

* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support

* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works

* Update HttpClient.cpp

* HttpClientTest: enable sslVerifaction test

* Update HttpResponse.h

* Sync luabindings [ci build]

* Add chrome UA test

* Fix ci [ci build]

* The timer for read timeout should be associated with per channel

* Remove unused function

* Update url
 2021-06-24 12:33:07 +08:00
halx99 cbb1df02c4 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 b330ff28ae Fixup [ci build] 2021-06-08 22:15:21 +08:00
halx99 d526527c9d Rename external to thirdparty [ci build] 2021-06-08 20:45:55 +08:00
halx99 8b9a5acdf9 Fix lua include header 2021-05-18 19:56:36 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +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
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 600e96c54c Update lua script 2021-04-25 22:37:52 +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 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 19ef72f788 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
halx99 b8892e446b Merge: 91bfb7c8ff a5cf017e0f 
Merge pull request #330 from c4games/lua54-compat

Lua 5.4 compatible
 2021-03-13 18:46:13 +08:00
halx99 d7610b8c77 Improve cmake scripts 
a. rename project 'plainluac' to 'luac'
b. add executable project 'lua'
c. unify cmake runtime directory to bin
 2021-03-13 18:18:40 +08:00
halx99 261bea4234 Lua 5.4 compatible 2021-03-13 16:47:09 +08:00
halx99 757e7edbf7 lua api compatible 2021-01-09 18:32:22 +08:00
halx99 984c164c57 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00
aismann f38b271650 Update controller.cpp 
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)

Maybe a Wiki entry is also usefull?
 2020-12-20 07:11:13 +01:00
halx99 b92c3d30c4 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 dd5f706dff Refine jni methods decls [ci build] 2020-11-18 13:25:00 +08:00
halx99 c12701da10 Merge: 53122216ee a708c2f904 
Merge branch 'master' of https://github.com/c4games/engine-x
 2020-11-18 12:16:36 +08:00
halx99 09e2615e51 Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
halx99 a524d61036 Improve lua framework code 2020-11-17 23:17:40 +08:00
halx99 4f725ab0c6 fix compile issue 2020-11-16 14:19:56 +08:00
halx99 f545b0d259 Merge: d1f0a287ac f5fcd5592c 
Merge pull request #257 from wtfdnvxk/patch-1

extend lua by register extensions
 2020-11-11 01:25:21 -08:00
wtfdnvxk 11f30dc4a0 fix ios readme build device description 
if none arch has been defined,then you can use "xcodebuild  -scheme "lua-empty-test" -sdk  iphonesimulator SYMROOT=." to compile the simulator ,or,You can use 'xcodebuild  -scheme "lua-empty-test" -sdk  iphoneos SYMROOT=.' to build in ios device銆?    The Xcode Architectures will show "Standard architecture"
 2020-11-11 17:06:03 +08:00
wtfdnvxk d7b26f54f3 Update lua_module_register.cpp 
extend lua by register extensions
 2020-11-11 16:53:00 +08:00