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

307 Commits

Author SHA1 Message Date
halx99 0f25bc842c Remove unnecessary function 2021-10-23 23:36:48 +08:00
halx99 554412f4fd Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
halx99 a49bba32ef Merge: 846231e2f1 cc1d09d04d 
Merge pull request #521 from adxeproject/refine-lua-loader

Refactor lua loader, reload lua with file name as-is
 2021-10-12 14:18:02 +08:00
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 c15442eaad Fix some warnings 2021-10-09 13:48:56 +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 7c940546a5 Fix #508 warnings 2021-09-26 21:52:36 +08:00
halx99 abca030baf Fix warnings 2021-09-26 21:03:41 +08:00
halx99 5a2afd2d43 Refine ImGuiEXT 2021-09-26 19:56:34 +08:00
halx99 24f76a53b3 Fix #507 2021-09-26 12:05:42 +08:00
halx99 629625a976 Fix #505 2021-09-23 14:53:57 +08:00
halx99 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 fb980f51ab Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +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 97fbec0b36 Merge: 95b9969365 80e0e3b941 
Merge pull request #485 from adxeproject/fix-spine-uniform-location-mismatch

Fix spine command pipeline state uniform location mismatch
 2021-08-30 18:57:36 +08:00
halx99 32b86c53c9 Update changelog 2021-08-30 17:55:00 +08:00
halx99 1a7d23eff5 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann 74dfe14b16 Merge: 1c05947474 7dd7422abd 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 08:33:22 +02:00
halx99 fc1c901209 Macro compatible 2021-08-27 13:54:05 +08:00
aismann 0baf946df7 Merge: cbeeb8d8ab 3990cc765d 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 07:49:17 +02:00
aismann 6632c5c3f6 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 44ea2208a6 Delete x-studio.cmake 2021-08-27 13:23:51 +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 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 860400cb8c Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 d59bcadf23 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 45b5a9f689 Update imgui 2021-08-23 17:49:38 +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
aismann 4ec017f4bc class PhysicsDebugNodeBox2D cleanup 2021-08-19 06:03:58 +02:00
aismann 18184b1d31 fix 2021-08-18 06:00:43 +02:00
aismann 2ab8f26871 Update CCPhysicsDebugNodeBox2D.cpp 2021-08-18 05:31:33 +02:00
aismann 5f086208a0 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 288941a63f cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 bd4d07b86e Update LUA bindings 2021-08-18 01:01:56 +10:00
rh101 4a0d48d93e Fix for incorrect method name 2021-08-17 14:51:17 +10:00
rh101 c60f66c9bb Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 7a6734408d Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
halx99 de54082c76 Update lua bindings 2021-08-14 13:22:03 +08:00
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +08:00
halx99 fd9422d36d Update lua bindings 2021-08-13 20:36:10 +08:00
halx99 84a84a8931 Merge: 39eb09daad 861c356bb4 
Merge pull request #447 from aismann/Box2D_TestBed_improvement

Box2D_TestBed_improvement
 2021-08-12 15:34:24 +08:00
aismann d0a18036b5 Update README.md 2021-08-12 07:03:14 +02:00
aismann c94562d417 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 5254edc733 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
halx99 50c270e8f5 Merge: 0a682f0dc1 c2b44cc7e1 
Merge pull request #445 from aismann/Box2D-Basic-Clean-code-and-speed-optimized

Box2D - Basic ready for use (clean code and speed optimized)
 2021-08-06 19:40:32 +08:00
aismann 97a6104516 Update README.md 2021-08-06 12:19:45 +02:00
aismann 4c6f9fcc3d Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann b5d0326e6e 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 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 f0a2bd416a Improve code quality 2021-07-17 23:32:31 +08:00
halx99 bd6bbaf4d7 Update fairygui 2021-07-17 19:51:27 +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 ec5ef59474 Improve code quality 2021-07-15 23:03:43 +08:00
halx99 36042fdb55 Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
aismann b9942e0ac3 Update README.md 2021-07-08 07:42:15 +02:00
halx99 4d6ece53f2 Sync lua bindings [ci build] 2021-06-27 21:47:15 +08:00
halx99 10c1ed15ef 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 2f9d7c5d3f 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 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
aismann d7b13b36d7 Chipmunk2D - TestBed Add more examples and improve using the original source 2021-06-18 16:52:56 +08:00
halx99 cbb1df02c4 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 9ed3be94c0 Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 e5237503fb Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 8b9d3ce3cd Revert "Fix imgui draw frame cause drawNode Afterimage" 2021-06-17 21:16:30 +08:00
halx99 f0f4ea4567 Fix imgui draw frame cause drawNode Afterimage 2021-06-17 12:20:23 +08:00
aismann a8f7a7d7c1 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 c513e20e2f Update imgui to 1.84 WIP [ci build] 2021-06-15 22:30:54 +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 6c558db560 Update README.md 2021-05-24 17:54:18 +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