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

437 Commits

Author SHA1 Message Date
halx99 09db3594f2 Merge: 3d97d1bcc1 0a63a8e364 
Merge branch '1.x' into dev
 2023-08-31 17:57:36 +08:00
halx99 a3a117ad2d Update script permision 2023-08-31 17:57:19 +08:00
halx99 449a596f3e Merge: fd2cbdc331 a816a8ac64 
Merge branch '1.x' into dev

# Conflicts:
#       README.md
#       README_CN.md
#       install-pwsh.sh
#       tools/console/axmol
 2023-08-31 17:56:09 +08:00
halx99 c2e55c4cdc Merge console-next from dev into 1.x 2023-08-31 17:48:39 +08:00
Deal 0ddf2949e5 Update README.md 2023-08-30 19:41:44 +08:00
halx99 5183995a36 Merge: f9b6553e57 94be720d3f 
Merge branch '1.x' into dev
 2023-08-25 16:57:54 +08:00
halx99 2bf41d7d31 Fix ci 2023-08-25 16:57:38 +08:00
halx99 46f668b01b Remove render backend setLineWidth [skip ci] 
Due to not all of GL and Metal support it, so remove it unify behavior
developers shouldn't relay on it
 2023-08-25 16:49:08 +08:00
halx99 f525d6c726 Update docs 2023-08-25 16:46:32 +08:00
halx99 78fae85462 Update readme files 2023-08-16 00:00:51 +08:00
halx99 8e6c3f791f Update readme files 2023-08-15 20:51:37 +08:00
halx99 bfe167121e Add cmake option AX_GLES_PROFILE 
Valid value of AX_GLES_PROFILE: 0, 200, 300

By default, the AX_GLES_PROFILE is:

- android: 200, allow axmol apps runs on: API 17 Android 4.2+ devices
- winuwp: 300
- Win32/linux/osx/ios/tvos: 0

For ios/tvos, will forcing AX_GLES_PROFILE to 300 if AX_GLES_PROFILE not 0
 2023-08-14 20:40:05 +08:00
Deal 9dc9e9adc7 Update android.yml 2023-08-13 23:58:18 +08:00
halx99 bd0e1fef4b Fix compile error 2023-08-13 22:09:02 +08:00
Deal 572bb2f700 Test use glad on android 2023-08-13 00:24:35 +08:00
halx99 b125be598a Update readme files 2023-08-11 15:31:36 +08:00
halx99 cc9cbcbff9 Merge: eba7fc17ba 6bbdc273f8 
Merge branch 'main' into dev
 2023-08-10 18:53:35 +08:00
halx99 46ed10dac3 Update yasio to v4.1.0 2023-08-10 18:36:45 +08:00
halx99 e945a5b3b2 Update readme files 2023-08-09 22:29:40 +08:00
halx99 f63932bb91 Update ios GLES to GLES3 2023-08-09 22:25:15 +08:00
halx99 1ec408812f Fix cmake setup 2023-08-09 14:37:43 +08:00
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 842d7c1666 Update readme files [skip ci] 2023-08-01 12:07:19 +08:00
halx99 3d41b53500 Update README.md notice 2023-07-28 15:48:04 +08:00
halx99 caacef1215 Merge: c9436765b4 ed0b22ac70 
Merge branch 'main' into dev
 2023-07-18 15:17:31 +08:00
halx99 1c669912b5 More easy for dev 2023-07-17 20:51:28 +08:00
Deal 071d9aa8ea Remove gitter [skip ci] 
It's only bakup IM room, discord is preferred
 2023-07-17 12:39:19 +08:00
Deal(涓€绾跨伒) c5a61124c0 Add chat badges [skip ci] 2023-07-15 11:25:48 +08:00
halx99 1c25aea206 Reduce ci checks 2023-07-01 21:54:12 +08:00
halx99 6f672eefa5 Update readme files [skip ci] 2023-06-19 16:06:37 +08:00
halx99 a603350a3a Update readme files 2023-06-12 11:12:39 +08:00
Deal(涓€绾跨伒) 85f77eaf73 Update README.md 2023-06-11 15:36:27 +08:00
Deal(涓€绾跨伒) bc82034ffd Improve media-engine for android, linux (#1228) 
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme

* Fix ci

* Improve code style

* Improve

* Update VlcMediaEngine.cpp

* Update AvfMediaEngine.h

* Fix ci

* Improve code style

* Enable androidx gradle.properties [skip ci]

* Improve code style

* Remove unnecessary callbacks

* Rename VideoPlayer to MediaPlayer
 2023-06-10 22:05:49 +08:00
halx99 278b1ac184 Update README.md 2023-06-05 21:47:37 +08:00
halx99 e05d0c4905 [Video] Enable VideoTexture streaming for iOS 2023-06-01 12:48:40 +08:00
Deal(涓€绾跨伒) 406f4e3b56 Update README.md 2023-06-01 00:06:35 +08:00
halx99 c097fc0271 Improve docs, move dev setup instructions to docs/DevSetup.md 2023-05-31 12:58:15 +08:00
aismann 8a3112cc49 Update README.md (#1207) 
Fix typo
 2023-05-15 13:51:30 +08:00
aismann 697fd0fac7 Update README.md (#1189) 
Add the UWP step
 2023-04-28 07:02:33 +08:00
aismann 6f838557c1 Update README.md (#1188) 
Removed.
Seems more a dopple entry as some new informationa
 2023-04-27 16:01:33 +08:00
halx99 fd88e2de3b Update AGP to 7.4.2, gradle to 8.1 2023-04-20 08:54:24 +08:00
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159) 
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
 2023-04-02 16:04:19 +08:00
Deal(涓€绾跨伒) 621c94c9e7 Enable video player(VideoTexture) based on new MediaEngine for macOS and tvos (#1154) 
* Ready for PR macOS

* Update videoTexture.frag

* Fix compile

* Fix h265 for mac [skip ci]

* Fix compile error

* Update readme [skip ci]
 2023-04-02 01:51:36 +08:00
halx99 72d1f96b6e Update readme files 2023-04-01 16:14:05 +08:00
halx99 2209df46a1 Update readme 2023-04-01 16:07:55 +08:00
halx99 dc4e141387 Update readme & ci files 2023-03-25 11:18:21 +08:00
Deal(涓€绾跨伒) 1e6e9d4a8d Media engine video texture (#1133) 
* VideoPlayer based on new MediaEngine[Win32/UWP]

* Improve MediaEngine interface

* Update readme

* Improve pixel format

* Improve MediaEngine interface

* Ready for PR UWP/Win32

* Ready for PR UWP,Win32

* Update reademe files

* Update readme files

* Update UIVideoPlayer-android.cpp [skip ci]

* Update UIVideoPlayer-ios.mm

* Update MFUtils.cpp

* Fix ci
 2023-03-25 08:37:51 +08:00
halx99 2f04914405 [UWP] Add cmake option: AX_VS_DEPLOYMENT_TARGET 
a. It's useful to specify UWP apps deploy target version, vs property is
TargetPlatformMinVersion
b. Use `CMAKE_VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION` possible
supported by cmake-3.27.0 or later
 2023-03-14 08:24:27 +08:00
halx99 53208eedbc Update build status badges 2023-03-11 23:34:10 +08:00
halx99 1c97c31799 Update readme files 2023-03-11 23:08:08 +08:00
Deal(涓€绾跨伒) 277bcd44ce Windows Store UWP apps support (#1108) 
* [BIG FEATURE] Windows Store UWP apps support

* Fix ci, add uwp for pr-ci

* Fix ci

* Improve ci script

* Fix ci

* Fix ci

* Fix ci

* Fix ci

* Upload uwp appx package artifacts [skip ci]

* Use d2d draw system font text

* Fix ci

* Improve code style
 2023-03-11 22:10:18 +08:00
RH 7d9d09563b Update readme to fix new project command template (#1107) 
* Indicate how to get more information regarding axmol new command
 2023-03-10 22:11:17 +08:00
aismann b65b2e1892 Update README.md (#1103) 
better readable of some links
 2023-03-08 08:10:49 +08:00
halx99 7202e55ba2 Drop python2 support 2023-02-13 17:52:05 +08:00
CHP 10088a72d1 Use standard cmake CMAKE_CXX_STANDARD instead of CXX_STD (#987) 
* Update AXConfigDefine.cmake

* Use standard cmake CMAKE_CXX_STANDARD instead of CXX_STD

* Fix formatting

* remov empty line

* Update AXConfigDefine.cmake

Fix typo
 2022-12-20 11:31:52 +08:00
halx99 50447f3003 Update logo [skip ci] 2022-12-17 16:32:20 +08:00
RH ed4d2251df Clarify the order of steps required to create and build new projects (#970) 
* Committing genbindings changes

* Clarify instructions on how to create new projects and build files
 2022-11-27 22:57:06 +08:00
涓€绾跨伒|Deal 5f3c1b4a45 Fix #957 2022-11-08 23:28:15 +08:00
aismann cf9c7267c0 Update README.md 
Improve Extensions part
 2022-10-27 10:09:15 +02:00
halx99 056e5f2e6f Update libpng to v1.6.38 stable 2022-10-27 13:00:59 +08:00
涓€绾跨伒|Deal 972aba96e6 Merge: 0b0f0fcc99 9d4dfea74a 
Merge pull request #926 from aismann/patch-1

Update README.md
 2022-10-18 08:49:58 +08:00
涓€绾跨伒|Deal 30298a456e Create README.md 2022-10-17 22:15:27 +08:00
aismann b69cd4d8c8 Update README.md 2022-10-17 16:05:47 +02:00
aismann fe172f4254 Update README.md (#912) 
cmake 3.22.1+
 2022-10-11 10:40:39 +08:00
涓€绾跨伒|Deal f72f18ce64 Merge: 6220071b3b 97fc3b7bcf 
Merge pull request #896 from crazyhappygame/patch-1

Enable C++20 by default
 2022-10-06 08:50:39 +08:00
CHP 026e694b5f Delete setup_android.py 
This file is not needed with latest android SDK
 2022-10-05 21:18:06 +02:00
CHP 3597262bb8 Update README.md 2022-10-05 21:16:33 +02:00
aismann 3f4bc95d53 Update README.md 
looks better now
 2022-10-05 10:24:16 +02:00
aismann fd62b1a2cb Update README.md 2022-10-05 08:32:06 +02:00
涓€绾跨伒|Deal f211cfafd6 Merge: 59257bbbb3 7dbc5ee0d2 
Merge pull request #889 from aismann/patch-7

Update README.md
 2022-10-04 11:02:14 +08:00
halx99 74ba83b711 Fix model render blend state, refer to: #879 2022-10-04 10:42:21 +08:00
aismann c005e6c8fa Update README.md 2022-10-04 04:40:31 +02:00
aismann c522f6d02f Update README.md 2022-10-03 17:55:54 +02:00
aismann 08d22908b1 Update README.md 2022-10-03 16:57:36 +02:00
aismann d0bd27606a Update README.md 
Add experimental C++20  support (VS2022 64 Windows 11 tested)
 2022-10-03 16:00:34 +02:00
aismann 07db2e9a86 Update README.md 
add link (not the project list again)
 2022-10-01 10:57:17 +02:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
aismann e8727d23c0 Update README.md 
https://github.com/aismann/game-controller-test
Example using different game controller like XBox One, PS4, PS3 controller with axys
 2022-09-30 19:30:04 +02:00
Paulo Coutinho f5aeb5a8c2 Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
涓€绾跨伒 a5ee1f0a98 Feature 803 (#804) 
* Improve libpng cmake script to allow osx-arm64 target

* Update run-script.sh

* Update osx-ci.yml

* Update pr-ci.yml

* Update android-ci.yml

* Update pr-ci.yml

* Update osx-ci.yml

* Update README.md

* Update README.md

* Update libs

* Use macos-12 for osx target

* Fix ci
 2022-08-14 11:19:56 +08:00
halx99 2f400931d6 Fix #786 2022-08-09 16:44:52 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 484aa38856 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
涓€绾跨伒 3804acfaae Fix typo 2022-08-06 19:49:25 +08:00
halx99 4555804b22 Update readme files 2022-08-06 19:47:45 +08:00
涓€绾跨伒 c5d4ca17ff Update README.md 2022-08-06 19:29:04 +08:00
halx99 27232ecafd Update readme files 2022-08-02 17:54:18 +08:00
halx99 8efce27d0c Update readme files 2022-07-21 22:15:13 +08:00
halx99 a402a80ad7 Fix ios device build issue 2022-07-14 17:20:18 +08:00
涓€绾跨伒 5fdd3d6bc2 Update Codacy Badge [skip ci] 2022-07-08 15:04:01 +08:00
涓€绾跨伒 cb20eb614c Merge: 35a95b0c0f a4d40c0bbe 
Merge pull request #726 from DelinWorks/migrate-engine-name

Improve Readme title.
 2022-07-07 18:27:42 +08:00
halx99 f11930eb08 Auto ignore all *.md files for ci 2022-07-07 17:42:45 +08:00
DelinWorks 973d065ba7 Update README.md 2022-07-07 12:07:34 +03:00
DelinWorks 9dae9ddaff Improve Readme title. 2022-07-07 12:05:04 +03:00
DelinWorks 3b1c7f9d74 Revert "Revert "Update README.md" [skip ci]" 
This reverts commit 54189e0ae3.
 2022-07-07 11:23:03 +03:00