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

1770 Commits

Author SHA1 Message Date
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
halx99 c44d94a2b2 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 c3ad19df96 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
aismann dbf81d7511 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 72be372699 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
aismann 5e249bf6f8 Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
halx99 192a59f39e Sync extension fairygui 2020-11-26 17:40:32 +08:00
Oren Bengigi a6b3b7050a Fix manifest version greater check 2020-11-18 20:43:49 +02:00
halx99 ca42ef08ba Refine jni methods decls [ci build] 2020-11-18 13:25:00 +08:00
halx99 1051d38562 Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-18 12:16:36 +08:00
halx99 53122216ee Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
halx99 a708c2f904 Improve lua framework code 2020-11-17 23:17:40 +08:00
halx99 acc064770c fix #263 2020-11-17 21:57:35 +08:00
halx99 7852cb21e5 fix #262 2020-11-16 22:38:18 +08:00
halx99 cd34ea9c4d fix compile issue 2020-11-16 14:19:56 +08:00
wtfdnvxk f5fcd5592c
Update lua_module_register.cpp 
extend lua by register extensions
 2020-11-11 16:53:00 +08:00
halx99 d1f0a287ac Remove ENABLE_CJSON_GLOBAL from cmake 2020-11-11 16:37:33 +08:00
halx99 0bc8728342 mandatory yasio for lua bindings 2020-11-11 15:51:46 +08:00
halx99 e0a36031c9 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 5da2894e1b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 c5493b4230 Update extension spine README.md 2020-11-04 23:28:51 +08:00
halx99 f90046f0ac Tidy extension spine folder structure [ci build] 2020-11-04 23:17:05 +08:00
halx99 d5d11d203a fix lua bindings [ci build] 2020-11-04 19:35:58 +08:00
halx99 c9873122b5 spine-c runtime compatible [ci build] 2020-11-04 19:10:02 +08:00
halx99 9d0cb09f5d Remove Sprite::updateShaders [ci build] 2020-10-31 20:08:32 +08:00
halx99 645364864b Optimize FUISprite::setGrayed for engine-x 2020-10-31 13:58:47 +08:00
halx99 3fa65521e3 Sync https://github.com/EsotericSoftware/spine-runtimes/pull/1801 2020-10-27 17:08:26 +08:00
HALX99 9156bc122c
Update README.md 2020-10-25 22:01:32 +08:00
halx99 863bd35676 Finish #244 2020-10-25 16:25:08 +08:00
halx99 975ef2ff61 Lock name 2020-10-24 21:57:36 +08:00
halx99 4a93071ab0 Simplify interface include for extension GUI 2020-10-22 23:14:58 +08:00
halx99 a09d53bf05 Remove unused comment 2020-10-22 21:32:09 +08:00
halx99 b8834bc086 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 c9dda9145e fix lua bindings build 2020-10-21 17:58:05 +08:00
HALX99 0a1af78a0e
Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 834cf88a8a Fix compile error at non-win32 platforms 2020-10-21 10:57:37 +08:00
halx99 86f3c58c39 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 d88518f508 fix compile error when disable script 2020-10-20 17:45:50 +08:00
HALX99 7f2b8dfac5
fix ci 2020-10-20 00:34:14 +08:00
halx99 25cc511532 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 bd76794a36 fix lua compile on android, link needs to fix later 2020-10-19 20:01:13 +08:00
halx99 cdaed31389 fix lua build on android 2020-10-19 19:56:48 +08:00
halx99 d87af8e76a fix ci 2020-10-18 16:54:45 +08:00
halx99 e2d5d9423a fix ci 2020-10-18 15:48:06 +08:00
halx99 adf09cf173 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
halx99 6448083c7d Remove deprecated sources, remove old extension GUI 2020-10-18 00:27:23 +08:00
halx99 8f1ae3cee2 delete for rename 2020-10-18 00:24:34 +08:00
halx99 c7a2582afa 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 c6d8d395a3 fix #234, spine custom shader doesn't work. 2020-10-17 22:00:53 +08:00
halx99 9e46cdc192 Sync official fix 2020-10-17 21:58:15 +08:00
HALX99 90ecc475f0
Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 2f934aeedc Simplfy hsv color 2020-10-16 17:23:29 +08:00
HALX99 b342ebd7ae
Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
halx99 b5780531d5 win32 dll improvements 2020-10-07 00:15:11 +08:00
halx99 4130fbd729 Refine code 2020-10-04 23:41:01 +08:00
HALX99 235f09f635
Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
HALX99 5a32bcfdaf
RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
halx99 436bb5bb0e ImGui multi-viewports Compatible with desktop GLES 2020-09-16 20:16:32 +08:00
halx99 165b588a10 Add ImGuiEXT::end to end game 2020-09-10 17:53:17 +08:00
halx99 0141396fde Sync fairygui extension to https://github.com/fairygui/FairyGUI-cocos2dx/commit/bc45f58 2020-09-08 19:15:28 +08:00
HALX99 57a0034668
Add useful resource links [skip appveyor][skip travis] 2020-09-08 18:21:41 +08:00
HALX99 44ed3af78e
Fix readme example [skip appveyor][skip travis] 2020-09-08 17:06:12 +08:00
halx99 44940933a0 Remove TODO 2020-09-08 16:31:11 +08:00
halx99 b50bea8702 Refine code style 2020-09-08 16:15:40 +08:00
halx99 5b3c7f0d81 Update ImGuiEXT readme[skip appveyor][skip travis] 2020-09-08 15:15:25 +08:00
HALX99 128ac5b2e0
Merge pull request #199 from halx99/imgui-hdpi 
ImGuiEXT improvements
 2020-09-08 00:07:16 -07:00
halx99 a824eb4050 Checking condition for dirty ImGui device objects [skip appveyor][skip travis] 2020-09-08 14:21:26 +08:00
halx99 7a15d5b74f Update CMake scripts and readme 2020-09-08 13:44:59 +08:00
halx99 090cd1002b Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
halx99 500e913517 ImGUIEXT addRenderLoop support global without any target scene 2020-09-07 23:21:15 +08:00
HALX99 cde039b34b
More cleary comment [skip appveyor][skip travis] 2020-09-07 21:25:22 +08:00
HALX99 c251213953
Update CCImGuiEXT.h 2020-09-07 21:22:03 +08:00
HALX99 c01b11dbb0
Update ImGUIEXT readme [skip appveyor][skip travis] 2020-09-07 20:52:16 +08:00
halx99 e005bb15fe ImGuiEXT: hdpi support, Add APIs: scaleAllByDPI, addFont, clearFonts for more easy to use 2020-09-07 20:31:50 +08:00
halx99 4d0375e7a8 ImGuiEXT manage ImGui render loop more clearly 2020-09-07 19:15:53 +08:00
halx99 6e4cee5855 Refine code 2020-09-07 14:15:09 +08:00
halx99 d9cd3e1256 Mac currently dosn't works on multi-viewports 2020-09-05 23:29:16 +08:00
halx99 cc2c524573 Refine extension ImGui, and rename director to ImGuiEXT 2020-09-05 17:10:09 +08:00
halx99 40b5efc011 fix .travis.yml ident, update readme [skip appveyor] 2020-09-04 16:55:13 +08:00
halx99 d9c4be96a2 Add ImGuiEXT extension support 2020-09-04 16:13:40 +08:00
halx99 f3c17427aa More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 50fe831d7a fix ci 2020-08-28 17:26:30 +08:00
halx99 ae99a5965b Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00