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

56 Commits

Author SHA1 Message Date
姒嗘煶鏉? 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 ec6cd65917 Update some copyright notice 2021-09-03 10:59:08 +08:00
halx99 39064cde56 Fix #491 2021-09-03 10:49:44 +08: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
rh101 d8fd94db8a Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate. 2021-09-02 15:39:28 +10:00
halx99 756ff065c8 Enum compatible [skip ci] 2021-08-31 15:50:18 +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 860400cb8c Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 0d4aec88d1 Improve code style 2021-07-15 23:10:36 +08:00
halx99 ec5ef59474 Improve code quality 2021-07-15 23:03:43 +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
halx99 68a40694a8 Fix ci warnings [ci build] 2021-04-26 17:28:58 +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 fce0f9caf0 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
halx99 315e42b126 Merge: 4c1ff6bd01 369bef3614 
Merge pull request #286 from rh101/add-center-vertical-layout-support

Add support for center vertical layout
 2020-11-26 23:43:25 -08:00
halx99 cc7366845e Merge: 74add84559 f113e1f2ed 
Merge pull request #285 from rh101/fix-listview-dimensions

Fix ListView dimensions when child elements are scaled
 2020-11-26 23:08:30 -08:00
halx99 bcb96e66ee Merge: 289bc4fccc ee996a5cfb 
Merge pull request #282 from rh101/fix-editbox-globalz

Ensure global Z is correctly set on all child items of EditBox
 2020-11-26 23:00:14 -08:00
rh101 220ef7a6bf Allow user to set custom program type value 2020-11-27 17:26:02 +11:00
rh101 11e78b27c0 Add support for center vertical layout 2020-11-27 17:24:07 +11:00
rh101 25bf822fb8 Fix ListView dimensions when child elements are scaled. 2020-11-27 17:02:31 +11:00
rh101 35e57843c8 Ensure global Z is correctly set on all child items of EditBox 2020-11-27 16:59:34 +11:00
halx99 dd5f706dff Refine jni methods decls [ci build] 2020-11-18 13:25:00 +08:00
halx99 74133ec753 Add missing JNIEXPORT 2020-11-13 23:03:05 +08:00
halx99 257e5ce0e0 Use move assignment 2020-10-07 23:59:26 +08:00
halx99 11ffba3758 API qualifiers improments 2020-10-07 00:07:53 +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
minggo 1934eb5ac9 close keyboard when Done is pressed (#20341) 
* close keyboard when Done is pressed
 2020-08-28 14:50:52 +08:00
halx99 6df5f91142 Sync LayoutHelper APIs 2020-08-26 12:46:41 +08:00
halx99 083d14f342 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 9c92a5e4ab Sync optimize code from v3 2020-08-06 17:37:34 +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
halx99 54e390ef9f Optimize, avoid include self. 
Even through all compiler can handle it, we should not do that include, thanks: https://github.com/cocos2d/cocos2d-x/pull/20525
 2020-05-20 08:56:12 +08:00
halx99 52058861a0 Refactor CCValue. 2020-03-03 19:24:07 +08:00