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

632 Commits

Author SHA1 Message Date
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 4f0f713977 Merge: 6a868299f5 9aebfd4b0d 
Merge pull request #331 from c4games/cmake-improve

Improve cmake scripts
 2021-03-13 18:46:32 +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 78aaf568c6 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
halx99 04db04ad93 Merge: 3f4178cc27 dbf81d7511 
Merge pull request #295 from aismann/master

CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann fd70034958 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 73b2b175d9 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
halx99 43f5a305c8 Merge: 079ecdbbec 5e249bf6f8 
Merge pull request #293 from aismann/master

Chipmunk2D and Box2D works together now (add two new classes) and FIX  ImGuiEXTTest window size problem
 2020-12-01 01:52:47 -08:00
aismann 18cc4a9eb4 Update README.md 
change wiki link:  https://github.com/c4games/engine-x-wiki
 2020-12-01 10:32:09 +01:00
aismann 91843b3fae 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 910c1d95a7 Sync extension fairygui 2020-11-26 17:40:32 +08:00
Oren Bengigi f7c9666c41 Fix manifest version greater check 2020-11-18 20:43:49 +02: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 f6e87217bf fix #263 2020-11-17 21:57:35 +08:00
halx99 c17a21eb8c fix #262 2020-11-16 22:38:18 +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 c98313ac4b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 ba783a7b1f Update extension spine README.md 2020-11-04 23:28:51 +08:00
halx99 7d71da30c0 Tidy extension spine folder structure [ci build] 2020-11-04 23:17:05 +08:00
halx99 5a7c94c971 fix lua bindings [ci build] 2020-11-04 19:35:58 +08:00
halx99 306f74d94e spine-c runtime compatible [ci build] 2020-11-04 19:10:02 +08:00
halx99 60a6d97d86 Remove Sprite::updateShaders [ci build] 2020-10-31 20:08:32 +08:00
halx99 474d2d2f24 Optimize FUISprite::setGrayed for engine-x 2020-10-31 13:58:47 +08:00
halx99 865c1e22ac Sync https://github.com/EsotericSoftware/spine-runtimes/pull/1801 2020-10-27 17:08:26 +08:00
halx99 e3ea57296e Update README.md 2020-10-25 22:01: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 e3c6edd8e1 Simplify interface include for extension GUI 2020-10-22 23:14:58 +08:00
halx99 83bec7092e Remove unused comment 2020-10-22 21:32:09 +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 ac21c27140 Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 9f7590ffa1 Fix compile error at non-win32 platforms 2020-10-21 10:57:37 +08:00
halx99 5748bbee85 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 47d15cae76 fix compile error when disable script 2020-10-20 17:45:50 +08:00
halx99 e59109080c fix ci 2020-10-20 00:34:14 +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 7164d6bfc8 fix ci 2020-10-18 16:54:45 +08:00
halx99 d9e5af585f fix ci 2020-10-18 15:48:06 +08:00
halx99 5dc2626894 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
halx99 7a4a5d0100 Remove deprecated sources, remove old extension GUI 2020-10-18 00:27:23 +08:00
halx99 2083d15340 delete for rename 2020-10-18 00:24:34 +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 82c864f2ed fix #234, spine custom shader doesn't work. 2020-10-17 22:00:53 +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
halx99 5401bbf821 Simplfy hsv color 2020-10-16 17:23:29 +08:00
halx99 c594e3789c 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 d535b47145 win32 dll improvements 2020-10-07 00:15:11 +08:00
halx99 99498c5b30 Refine code 2020-10-04 23:41:01 +08:00
halx99 cca0739793 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 6e7e117a0d RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
halx99 689657391e ImGui multi-viewports Compatible with desktop GLES 2020-09-16 20:16:32 +08:00
halx99 66ebe11bb4 Add ImGuiEXT::end to end game 2020-09-10 17:53:17 +08:00
halx99 0d4d652634 Sync fairygui extension to https://github.com/fairygui/FairyGUI-cocos2dx/commit/bc45f58 2020-09-08 19:15:28 +08:00
halx99 f5250f1804 Add useful resource links [skip appveyor][skip travis] 2020-09-08 18:21:41 +08:00
halx99 89620c53c5 Fix readme example [skip appveyor][skip travis] 2020-09-08 17:06:12 +08:00
halx99 dcb3fd9116 Remove TODO 2020-09-08 16:31:11 +08:00
halx99 71954dac32 Refine code style 2020-09-08 16:15:40 +08:00
halx99 7619f957b8 Update ImGuiEXT readme[skip appveyor][skip travis] 2020-09-08 15:15:25 +08:00
halx99 db972a87d3 Merge: c01b11dbb0 a824eb4050 
Merge pull request #199 from halx99/imgui-hdpi

ImGuiEXT improvements
 2020-09-08 00:07:16 -07:00
halx99 52973784ca Checking condition for dirty ImGui device objects [skip appveyor][skip travis] 2020-09-08 14:21:26 +08:00
halx99 7f6b6dfa90 Update CMake scripts and readme 2020-09-08 13:44:59 +08:00
halx99 ddbb6bb0b9 Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
halx99 45b0b3ff78 ImGUIEXT addRenderLoop support global without any target scene 2020-09-07 23:21:15 +08:00
halx99 23cdbd734d More cleary comment [skip appveyor][skip travis] 2020-09-07 21:25:22 +08:00
halx99 18b5fd0df2 Update CCImGuiEXT.h 2020-09-07 21:22:03 +08:00
halx99 885c949956 Update ImGUIEXT readme [skip appveyor][skip travis] 2020-09-07 20:52:16 +08:00
halx99 20e5733c5e ImGuiEXT: hdpi support, Add APIs: scaleAllByDPI, addFont, clearFonts for more easy to use 2020-09-07 20:31:50 +08:00
halx99 f357b7207b ImGuiEXT manage ImGui render loop more clearly 2020-09-07 19:15:53 +08:00
halx99 c722d64876 Refine code 2020-09-07 14:15:09 +08:00
halx99 d3f4b0b77a Mac currently dosn't works on multi-viewports 2020-09-05 23:29:16 +08:00
halx99 ade15f070b Refine extension ImGui, and rename director to ImGuiEXT 2020-09-05 17:10:09 +08:00
halx99 d8f6edd211 fix .travis.yml 2020-09-04 17:19:51 +08:00
halx99 170d8eb0f5 test 2020-09-04 17:03:25 +08:00
halx99 801c827802 fix .travis.yml ident, update readme [skip appveyor] 2020-09-04 16:55:13 +08:00
halx99 9b2665e9ce Add ImGuiEXT extension support 2020-09-04 16:13:40 +08:00
halx99 cc53868d27 More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 8f448b517c fix ci 2020-08-28 17:26:30 +08:00
halx99 4674b1e89d Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 2619296c6f fix compile warning and uninitialized member variable ActionTimeline::_loop 2020-08-26 15:26:06 +08:00
halx99 13137a40ff Backport CCValue APIs 2020-08-18 11:40:45 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 4dde85e3b4 Sync from official-v4 pr 2020-08-14 18:57:08 +08:00
halx99 af8fa43c8c Disable double use in chipmunk_types.h instead CMakeLists.txt more stable for ENGX 2020-08-09 22:41:06 +08:00
halx99 ebc8086a4c Sync optimize code 2020-08-06 19:58:24 +08:00
halx99 8af53505c1 Merge: 3cf637418f 137ded73a5 
Merge branch 'master' of https://github.com/c4games/engine-x into master
 2020-08-05 18:12:31 +08:00
halx99 4713580381 Update features [skip appveyor] [skip travis] 2020-08-05 18:11:52 +08:00
halx99 ff5ec02d77 Merge: bda1fce2b1 f38f76c1a1 
Merge pull request #145 from halx99/spine-3.8

Sync spine code and resource to 3.8
 2020-08-05 02:38:59 -07:00
halx99 03816cd0c0 fix console output error on win32, see #144 2020-08-05 17:30:30 +08:00
halx99 e8765c88f8 Sync spine code and resource to 3.8 2020-08-05 17:04:57 +08:00
halx99 205d6e5fb9 fix lua compile issue 2020-08-04 22:38:57 +08:00
halx99 ce9fb1c42c Finish dragonbones, all extensions can be remove one by one (#142) 
* Finish dragonbones, all extensions can be remove one by one, by default, all extensions are enabled
 2020-08-04 21:13:26 +08:00
halx99 1a42556199 fix logic 2020-08-04 12:39:34 +08:00
halx99 2e95efdde9 Add extension fairygui support 2020-08-04 12:31:33 +08:00
halx99 a4162b559c [CMake] remove unnecessary print 2020-08-04 11:35:01 +08:00
halx99 bc94591603 Tidy sources 2020-08-04 10:55:30 +08:00
halx99 e638e0bd68 Tidy sources 2020-08-04 00:14:35 +08:00
halx99 8b9a6bbbf1 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 1e392c9dfe Refine readme [skip appveyor][skip travis] 2020-08-03 19:12:07 +08:00
halx99 3049b8f751 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
aismann a4ee58eec8 Update CCPhysicsDebugNode.cpp 
class "cpShape" has no member "CP_PRIVATE"
 2020-07-28 21:29:08 +02:00
halx99 ae1a271593 Resume scissor of CCScrollView, indent correct with vs2019 2020-05-20 10:35:30 +08:00
halx99 04a460705d finish issue: #85 2020-05-06 15:42:25 +08:00
halx99 9d797b6998 Clean JSB sources, optmize script event dispatch. 2020-02-28 02:15:33 +08:00
halx99 075aadee32 Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 7856224ff2 Refactor CCDownloader, use curl for all platforms. 2019-11-24 15:43:28 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00