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

293 Commits

Author SHA1 Message Date
halx99 8d2dd47cc6 Fix #522 2021-10-12 13:16:27 +08:00
halx99 8d0725c6b1 Remove unused 2021-10-12 13:12:44 +08:00
halx99 20a399c28c lua load, better code style 2021-10-12 13:07:05 +08:00
halx99 e7364964c4 lua loader, more better pefromance 2021-10-12 12:35:03 +08:00
halx99 ec275dce76 Remove unused 2021-10-12 12:18:38 +08:00
halx99 d8fdcc3be9 More standard 2021-10-12 12:11:48 +08:00
halx99 0b12c01019 Don't try different file ext, load as-is for lua load 2021-10-11 23:23:30 +08:00
halx99 dde1956e02 Reduce file exist check 2021-10-11 22:57:21 +08:00
halx99 ca7cc4f697 Refine lua loader 2021-10-11 22:34:41 +08:00
halx99 3474de5263 Fix ci 2021-10-11 13:44:28 +08:00
halx99 77404fd02a Code style 2021-10-11 12:15:41 +08:00
halx99 efce326cd9 Use lua-5.4.3 as default plainlua version 
see also: #332
 2021-10-08 16:15:33 +08:00
halx99 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894 
Merge remote-tracking branch 'upstream/dev' into dev
 2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 764c17e86e LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
rh101 e9fe5aa3a8 Update lua bindings 2021-09-02 21:24:45 +10:00
rh101 4e7db23d38 Remove getLong() method 
Change %du to %u, and %lx to %x
Use "stdint.h" instead of <cstdint> for TGAlib.h
 2021-09-02 20:30:20 +10:00
姒嗘煶鏉? 64e2cdd8d9 [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 eba8696d65 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
halx99 0cee74a4bf Fix part of #487 2021-09-02 11:43:27 +08:00
halx99 0a4d3ee73d Merge: cb81a61530 a762c94904 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2021-09-01 10:10:46 +08:00
halx99 756ff065c8 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 be5eff1d5a Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 fa1f2f2d33 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
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
halx99 7c8df0d187 Remove ENABLE_CJSON_GLOBAL from cmake 2020-11-11 16:37:33 +08:00
halx99 fccc757431 mandatory yasio for lua bindings 2020-11-11 15:51:46 +08:00
halx99 5a4d0139c5 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 5a7c94c971 fix lua bindings [ci build] 2020-11-04 19:35:58 +08:00
halx99 60a6d97d86 Remove Sprite::updateShaders [ci build] 2020-10-31 20:08:32 +08:00
halx99 f49cb01e1e Finish #244 2020-10-25 16:25:08 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 0a9e0516a5 fix lua bindings build 2020-10-21 17:58:05 +08:00
halx99 9e6b360437 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 2700d4f300 fix lua compile on android, link needs to fix later 2020-10-19 20:01:13 +08:00
halx99 f1be86ee7a fix lua build on android 2020-10-19 19:56:48 +08:00
halx99 7a4a5d0100 Remove deprecated sources, remove old extension GUI 2020-10-18 00:27:23 +08:00
halx99 334800dd7f Enable yasio lua bindings for lua projects by default. can use cmake parameter: BUILD_YASIO_LUA to control it. 2020-10-17 23:46:59 +08:00
halx99 dcc4c8d385 Sync official fix 2020-10-17 21:58:15 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00