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

1852 Commits

Author SHA1 Message Date
halx99 6ffd19149c Fix WidgetPropertiesReader::getWidgetReaderClassName incorrect 2022-02-16 11:54:48 +08:00
halx99 403d592018 Committing genbindings changes [skip ci] 2022-02-15 23:01:37 +00:00
deal e7d683958b
Fix #584 2022-02-12 19:56:00 +08:00
halx99 67ecbab347 Improve some code for #543 2022-02-08 21:54:21 +08:00
halx99 388e90459b Done #579, update ImGui to 1.87 2022-02-08 12:43:16 +08:00
halx99 64e678c84a Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
deal e8f0bf9787
Fix #576 2022-02-03 15:45:58 +08:00
deal 0777da8863
Delete unused 2022-01-23 11:01:42 +08:00
halx99 bca3a82eea Fix lua_xml_http_request dataSize incorrect 2022-01-18 18:39:58 +08:00
deal b0e7c79428
hard to link fmt-header-only[skip ci] 
target_link_libraries(fairygui fmt-header-only)
 2022-01-08 15:25:50 +08:00
deal 01f97ca042
Update CMakeLists.txt 2022-01-08 14:01:43 +08:00
halx99 4b12f12a55 [spine] Improve RTTI compare performance when compiler string pooling enabled 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2012

Signed-off-by: halx99 <halx99@live.com>
 2022-01-05 14:10:05 +08:00
halx99 aaef0c3048 Fix ClippingAttachment doesn't work 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2011

Reported by: @kangleblue

Signed-off-by: halx99 <halx99@live.com>
 2022-01-04 22:38:02 +08:00
halx99 3d7218a0eb Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 3282e1abaf Improve vec2, vec3, vec4 lua storage 
a. store as fixed size array
b. use metatable access via: x, y, z, w
c. For vec2
  - vec2[0] could be access via x or w(idth) or u
  - vec2[1] could be access via y or h(eight) or v
 2022-01-03 22:06:49 +08:00
halx99 a651879ee6 Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 6b70fc5ff3 Fix ci 2021-12-31 16:29:11 +08:00
halx99 deddc5542e Fix ci [skip ci] 2021-12-31 15:49:45 +08:00
deal 3825fb1b02
Update CMakeLists.txt 2021-12-31 14:47:57 +08:00
halx99 e534dd66c0 Rename core folder name 2021-12-31 14:39:08 +08:00
halx99 f95ed06187 Improve string_view for some file 2021-12-30 09:48:39 +08:00
halx99 b5b4b1e5d8 Committing clang-format changes 2021-12-29 11:31:28 +00:00
halx99 6639f55c0f Fix linux build 2021-12-28 19:16:15 +08:00
halx99 a7e153c9b0 Fix ci 2021-12-28 19:10:50 +08:00
halx99 ce5adf35f7 Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 8e8affab5e string_view for lua bindings 2021-12-28 15:46:32 +08:00
halx99 1c3ec2d68c string_view for apple 2021-12-28 11:48:48 +08:00
halx99 f785632497 Merge commit 2021-12-28 11:07:12 +08:00
halx99 d397854ead Commit chnages 2021-12-28 11:05:34 +08:00
halx99 9eeeb151a1 Committing clang-format changes 2021-12-28 03:00:34 +00:00
halx99 a0761b0a5d string_view for android 2021-12-27 19:24:35 +08:00
halx99 8e644ef0b4 Modify fairygui for string_view 2021-12-27 15:10:29 +08:00
halx99 01310bf1b1 Modify some extensions for string_view 2021-12-27 13:52:08 +08:00
halx99 0076283252 Huge changes for all string_view 2021-12-26 23:26:34 +08:00
halx99 2ba77a42fb Committing clang-format changes 2021-12-25 02:04:45 +00:00
halx99 ea1c0733ce Fix compile 2021-12-24 22:58:29 +08:00
halx99 e9f6e9e22c Fix encoding 2021-12-24 21:16:08 +08:00
halx99 c0f5912ebe Fix encodings 2021-12-24 21:11:44 +08:00
halx99 4ff0221a9e Fix encodings 2021-12-24 20:50:31 +08:00
halx99 b4bedd24d0 Improve starter lua template HellLua 
a. Use lua search path for scripts instead FileUtils
b. Put new lua search path to front of LuaStack
 2021-12-19 14:59:00 +08:00
halx99 2e0cc940ee [HttpClient] Use `byte_buffer` instead `std::vector<char>` 2021-12-10 19:15:48 +08:00
halx99 b459acbcf7 Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
aismann 6a41776f20 change all setString(const std::string & ...) to setString(std::string_view ...) 
Change all methods inherited from virtual void setString(std::string_view label) = 0;
 2021-11-30 20:35:34 +01:00
halx99 9930eef75a Fix compile 2021-11-26 18:13:33 +08:00
halx99 bc14e09079 Move ntcvt directory 2021-11-26 17:19:50 +08:00
halx99 778dc7e2b9
Improve skipBOM 2021-11-22 13:58:41 +08:00
halx99 9e35b0a1e2 Fix cocos2dx_lua_loader 2021-11-17 20:59:12 +08:00
halx99 8e1087a987 Refine cocos2dx_lua_loader logic 2021-11-16 14:12:32 +08:00
halx99 3c5224220f Fix lua state usage 2021-11-15 19:05:08 +08:00
halx99 bc4dccff9b Compatible lua getXXXSize API for get width,height from vec2 2021-11-12 19:12:29 +08:00
halx99 442d0f7c4c Sync fix 2021-11-11 18:33:46 +08:00
halx99 24ad9f7bec Fix fairygui compilation 2021-11-11 18:04:38 +08:00
halx99 95a1734cd7 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 5f4d535f76 Remove unnecessary function 2021-10-23 23:36:48 +08:00
halx99 cc2ba51ed6 Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
halx99 cc1d09d04d Remove unused 2021-10-12 13:12:44 +08:00
halx99 dfd93f6a10 lua load, better code style 2021-10-12 13:07:05 +08:00
halx99 9b88d72331 lua loader, more better pefromance 2021-10-12 12:35:03 +08:00
halx99 b98c496221 Remove unused 2021-10-12 12:18:38 +08:00
halx99 9fa030b5e9 More standard 2021-10-12 12:11:48 +08:00
halx99 bfd5577753 Don't try different file ext, load as-is for lua load 2021-10-11 23:23:30 +08:00
halx99 5b3979a8ef Reduce file exist check 2021-10-11 22:57:21 +08:00
halx99 0b7ff8d9ea Refine lua loader 2021-10-11 22:34:41 +08:00
halx99 b99a445519 Fix ci 2021-10-11 13:44:28 +08:00
halx99 c38681bdd0 Code style 2021-10-11 12:15:41 +08:00
halx99 bc4cbddd50 Fix some warnings 2021-10-09 13:48:56 +08:00
halx99 1ada732ffc Use lua-5.4.3 as default plainlua version 
see also: #332
 2021-10-08 16:15:33 +08:00
halx99 e90eda918d Fix #508 warnings 2021-09-26 21:52:36 +08:00
halx99 8762fa353a Fix warnings 2021-09-26 21:03:41 +08:00
halx99 d2ba7fb117 Refine ImGuiEXT 2021-09-26 19:56:34 +08:00
halx99 a17c843914 Fix #507 2021-09-26 12:05:42 +08:00
halx99 f9e766086c Fix #505 2021-09-23 14:53:57 +08:00
halx99 23b6c1d549 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 15be00be20 Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
榆柳松 ac1aa636ac Merge remote-tracking branch 'upstream/dev' into dev 2021-09-05 20:45:32 +08:00
榆柳松 f5663f279c [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 7cc2d34398 LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
rh101 69d6039306 Update lua bindings 2021-09-02 21:24:45 +10:00
rh101 de182c8360 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
halx99 d197e8b245 Fix part of #487 2021-09-02 11:43:27 +08:00
halx99 cb81a61530 Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 80e0e3b941 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann 1c05947474
Merge branch 'adxeproject:dev' into dev 2021-08-27 07:49:17 +02:00
aismann cbeeb8d8ab Debug 64bit build error 
Severity	Code	Description	Project	File	Line	Suppression State
Error (active)	E0075	operand of '*' must be a pointer but has type "bool"	cpp-tests	D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp	153
 2021-08-27 07:47:22 +02:00
halx99 81fd4df36e
Delete x-studio.cmake 2021-08-27 13:23:51 +08:00
halx99 bd436ae078 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 f9ac34c20f Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 d7e590b513 Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 395a5afdd7 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 d0d77730a9 Update imgui 2021-08-23 17:49:38 +08:00
aismann e2ef8d5ba7 class PhysicsDebugNodeBox2D cleanup 2021-08-19 06:03:58 +02:00
aismann a9569ca061 fix 2021-08-18 06:00:43 +02:00
aismann 42439e5b50 Update CCPhysicsDebugNodeBox2D.cpp 2021-08-18 05:31:33 +02:00
aismann 5b3748cdd6 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 780d4e6294 cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 7ef0ec96bf Update LUA bindings 2021-08-18 01:01:56 +10:00
halx99 16e3d66a66 Update lua bindings 2021-08-14 13:22:03 +08:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
halx99 c5aeed4c06 Update lua bindings 2021-08-13 20:36:10 +08:00
aismann 7b7a3a8ae7 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 39ca61f623 Update spine-3.8 runtime to latest 
Maybe no further update until upgrade to spine-4.x
 2021-08-07 00:59:58 +08:00
aismann 56b99eff6a Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann f5077bfb0f
Add DebugDraw to Box2DTest, Improve Box2D-Testbed add some new classes to physics-nodes (#444) 
* Update AppDelegate.cpp

Add '*Debug*' on the title

* Update CCPhysicsDebugNodeBox2D.h

* Improve Box2D-TestBed

* improvements

* Update CCPhysicsDebugNodeBox2D.cpp

* Improve the 2d physics stuff

* dirty fix for build android:

* Fix fatal error: 'GLFW/glfw3.h' file not found

* Add DebugDraw to  Box2DTest, Improve Box2DTestBed, Add some new physicnodes

* fix settings, unknow  labelDebugDraw;
 2021-08-05 17:23:55 +08:00
halx99 484549b801 Fix ci 2021-07-19 08:10:37 +08:00
halx99 d90dfd89e0
Update lua_xml_http_request.cpp 2021-07-19 01:29:08 +08:00
halx99 ad035e2729 Improve code quality 2021-07-17 23:32:31 +08:00
halx99 26c3de632a Update fairygui 2021-07-17 19:51:27 +08:00
halx99 0e215e77bb Tidy thirdparty lua-cjson 2021-07-16 11:17:34 +08:00
halx99 092b24e591 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 bc6ebd920a Improve code quality 2021-07-15 23:03:43 +08:00
halx99 ec9a50136f Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 f70ad053c0 Rename everything to adxe 2021-07-09 10:42:36 +08:00
aismann a934652f82
Update README.md 2021-07-08 07:42:15 +02:00
halx99 5a78eeda36 Sync lua bindings [ci build] 2021-06-27 21:47:15 +08:00
halx99 a84067eb74 Refactor dual sampler shader [ci build] 
Since not only etc1 could use sepreate RGB, A to two texture samplers, we unify the shader name.
 2021-06-27 20:58:50 +08:00
aismann 39be77144c
Fix CCPhyhsicsDebugNode Polygon stuff, add all bench tests, ... (#403) 
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.

* Improve Chipmunk2D- TestBed and starting the code cleanup ...

* Fix CCPhyhsicsDebugNode Ploygon stuff,  add all bench tests, improve  same demos, code cleanup
 2021-06-26 17:46:06 +08:00
halx99 c9eb1a7de4
Merge branch 'dev' into Chipmunk2D 2021-06-24 17:04:04 +08:00
aismann df58dd753c Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 a379f936d8
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
aismann 85347cd438 Chipmunk2D - TestBed Add more examples and improve using the original source 2021-06-18 16:52:56 +08:00
halx99 7ee1785858 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 b6378332eb Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 c12aa74b55 Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 ffda7422c9 Revert "Fix imgui draw frame cause drawNode Afterimage" 2021-06-17 21:16:30 +08:00
halx99 b485cd1d9a Fix imgui draw frame cause drawNode Afterimage 2021-06-17 12:20:23 +08:00
aismann a491997731
Improve the "Physics part" (#379) 
* 1. Add "initial" Chipmunk - TestBed

More demos comes later.

* 2. Removed unused source

* Update CMakeLists.txt

* Some fixes #1

* workaround #1

* workaround #1
 2021-06-16 19:34:09 +08:00
halx99 99cf51df55 Update imgui to 1.84 WIP [ci build] 2021-06-15 22:30:54 +08:00
halx99 8528090af5 Fixup [ci build] 2021-06-08 22:15:21 +08:00
halx99 73df034804 Rename external to thirdparty [ci build] 2021-06-08 20:45:55 +08:00
halx99 c49a4ea632
Update README.md 2021-05-24 17:54:18 +08:00
halx99 13d187c174 Fix lua include header 2021-05-18 19:56:36 +08:00
HALX99 a42f9ac25c
Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
HALX99 4cd026c920
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 1efe0091a8 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
halx99 c1063ea03d Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
halx99 5b13927d47 Fix ci warnings [ci build] 2021-04-26 17:28:58 +08:00
rh101 b865d9e18e 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 ef6bedd069 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 72fc8a6f4d
Merge branch 'vfs-support' into master 2021-04-26 10:39:09 +10:00
halx99 dff3aff1e4 Update lua script 2021-04-25 22:37:52 +08:00
rh101 73e45e33c2 Update usage of createDownloadFileTask 2021-04-25 18:36:20 +10:00
rh101 ce1a24cb15 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
halx99 540c9375ff Update fairygui runtime [ci build] 2021-04-24 18:53:21 +08:00
halx99 39b5e14489 Update spine runtimes 2021-04-24 18:14:30 +08:00
halx99 e8c1d7bc2c Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 958f6c3a93 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
HALX99 1590c200d5
Merge pull request #331 from c4games/cmake-improve 
Improve cmake scripts
 2021-03-13 18:46:32 +08:00
halx99 9aebfd4b0d 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 a5cf017e0f Lua 5.4 compatible 2021-03-13 16:47:09 +08:00
halx99 f771a92ca2 lua api compatible 2021-01-09 18:32:22 +08:00