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

223 Commits

Author SHA1 Message Date
halx99 680f14a5e2 Improve VS Ninja workflow 2022-04-28 11:43:59 +08:00
halx99 ba66918607 Improve Ninja build with visual studio ide 
a. Disable PCH for Ninja, just a workaround fix compiler always said: can't open xxx.pch files
b. Remove unnecessary definition _WINSOCKAPI_ for Ninja build
 2022-04-27 18:48:57 +08:00
halx99 a6e7eb8942 Rename source file name match with class name 2022-04-27 18:24:33 +08:00
Turky Mohammed bdd69e9d7f [Fix] Camera masking bug deep child nesting (#623) 
Co-authored-by: 涓€绾跨伒 <halx99@live.com>
 2022-04-27 16:23:57 +08:00
halx99 6939196d5c Match compression test images PMA with engine settings 2022-04-26 16:38:59 +08:00
halx99 da1b16432e Remove duplicated include 2022-04-26 16:33:04 +08:00
涓€绾跨伒 bd79e4965e Merge: bc16bb1cd3 d71c620fc1 
Merge pull request #622 from shatyuka/dev

Compatible with Ninja
 2022-04-26 16:20:11 +08:00
Shatyuka d9d6509c2b Compatible with Ninja 2022-04-26 15:16:02 +08:00
halx99 83b8828e8d Fix missing include 2022-04-26 12:51:01 +08:00
halx99 5412c14e58 Remove duplicated macros 2022-04-25 21:39:49 +08:00
halx99 cc5509f23a Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 57eefa9d12 Add ktxv1.1 file format for etc2/etc1 support 2022-04-25 19:11:58 +08:00
halx99 5c695d12bf Alloc astc block_size_descriptor same with original repo 2022-04-25 10:28:34 +08:00
Turky Mohammed a1ebd965c9 [Fix] Node Camera Masking Design Flaw (#621) 
* Update CCNode.cpp

* Add a separate method for assigning mask to children

* Update CCNode.cpp

* Tidy Up Stuff
 2022-04-25 09:37:41 +08:00
涓€绾跨伒 821be105dc MSVC compiler bug? 2022-04-24 22:25:27 +08:00
halx99 96e789f5c8 Reindent code [skip ci] 2022-04-24 21:44:41 +08:00
halx99 21254dcfe0 Try fix windows ci 2022-04-24 21:23:28 +08:00
halx99 cc48a75983 Update astcenc to v3.6 2022-04-24 19:15:08 +08:00
Turky Mohammed 11a3b711c5 Remove annoying logs when adding multiple components to a single node (#619) 2022-04-24 10:51:37 +08:00
halx99 4bd1163242 Delete DEPRECATED code 2022-04-23 17:49:42 +08:00
halx99 f4d493651c All compressed image should do PMA at texture convert tools or GPU fragment shader 
such as astcenc-2.3+(https://github.com/ARM-software/astc-encoder/releases) with -pp-premultiply
 2022-04-23 17:45:07 +08:00
halx99 19b979473c Delete unused code 2022-04-05 13:58:55 +08:00
halx99 1b0d6d0873 Improve use prebuilt engine libs for windows 
a. Fix msedge webview2 include for win32
b. Fix msedeg webview2 linking for apps which use prebuilt libs
c. Improve optional libs linking for apps which use prebuilt libs
d. Auto build optional libs which not dependent by engine, such as yaml-cpp
 2022-04-02 13:50:53 +08:00
halx99 73430a4835 Fix #609 2022-03-24 11:03:17 +08:00
deal fc03414f37 Update CCBundle3D.h 2022-03-18 22:20:31 +08:00
halx99 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 f7b4536bae Fix #602 c++20 compile errors 2022-03-17 09:37:56 +08:00
halx99 43765519aa Improve shader compatible 2022-03-13 13:07:58 +08:00
halx99 8caed810e0 Fix leak 2022-03-13 12:05:22 +08:00
halx99 d88768e865 Fix #597 2022-02-25 15:04:52 +08:00
halx99 13d90b76ee Enable video player test case for windows 2022-02-24 18:30:58 +08:00
halx99 ae2fc24f78 Move video player implementation to a unique folder 2022-02-24 18:13:01 +08:00
deal 9afd478ea9 Add windows video play support [render video sample to texture2d] (#577) 
* [Draft] Implement windows video player

Based on microsoft media foundation

* Delete pvd

* Shutdown MF media before release player

* Consider MFMediaPlayer ref leak

* Use Microsoft::WRL::ComPtr

* Simplify code

* Improve code and take care COM object refs

* Update UIVideoPlayer-win.cpp

* Delete unused code

* Add play from url support

* Update logic

* Rename ADXE_ENABLE_MFMEDIA to AX_ENABLE_MFMEDIA

* Rescale video render sprite to view node

* Fix warnings

* Don't shallow copy the video context, it's very dangerous

* Fix compile error CC_VIDEOPLAYER_DEBUG_DRAW=1

* Fixup

* [Window video player] play event dispatch

* support switch video file

* Update UIVideoPlayer-win.cpp

* [windows-video-player] keep aspect ratio and full screen support

* Improve code

* Update changelog [skip ci]

* Update README.md

* Update README.md

* Update README.md

* Update README_CN.md

* Update README_CN.md
 2022-02-24 17:57:08 +08:00
deal 1028488de2 Fixup 2022-02-23 18:56:26 +08:00
halx99 ba56042bd5 Fix compile error CC_VIDEOPLAYER_DEBUG_DRAW=1 2022-02-23 18:39:02 +08:00
halx99 183b8f10c1 Don't shallow copy the video context, it's very dangerous 2022-02-23 17:38:21 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
halx99 d8ee872fe9 Fix #587 
Note: New OS feature 'Beta: Use Unicode UTF-8 for worldwide language support' since win10/win11
- OFF: GetACP() equal to current system locale, such as chinese simplified is 936, english is 437
- ON: GetACP() always equal to 65001(UTF-8)

Remark:
The macro CP_ACP for ntcvt::from_chars works for converting chraset from current code page(936,437,65001) to utf-16
 2022-02-16 11:56:33 +08:00
deal 885d99751b Merge: e7d683958b f0c91e38c1 
Merge pull request #588 from DelinWorks/feature-proposals

Expose detach IME function for custom behaviors in UITextField
 2022-02-16 06:54:38 +08:00
Delin 3799344fa3 Update README.md 
Update README.md to version v1.0.0-beta6 badge
 2022-02-15 17:42:19 +03:00
DelinWorks c350e5a628 Update UITextField.h 2022-02-15 17:19:26 +03:00
DelinWorks b19133e96d feature-expose-detach-function 2022-02-15 17:17:45 +03:00
deal 768d716caf Update adxe.cpp 2022-02-08 23:22:14 +08:00
halx99 d07c36f60f Fix #580 2022-02-08 12:41:18 +08:00
halx99 df441ca0c9 Fix ci 2022-02-06 13:18:27 +08:00
halx99 bc1d0223c0 Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
halx99 6131b237b2 [Android][freetype] Change streamingParsingEnabled to true 
Add noCompress config to build.gradle for all templates & tests project

Exists project, please add follow config

android {

// Other configs
// ...

// noCompress config
aaptOptions {
noCompress 'mp3','ogg','wav','mp4','ttf','ttc'
}

}
 2022-01-29 14:54:32 +08:00
deal 9f86eef0db Update adxetools.gradle 2022-01-28 19:59:27 +08:00
deal a285c80f89 Update adxetools.gradle 2022-01-28 19:51:42 +08:00
deal 8682491014 Update adxetools.gradle 2022-01-28 19:31:42 +08:00
halx99 231ba0cf5c Improve gradle script to find cmake 2022-01-28 18:25:50 +08:00
halx99 9623414a2f Downloader: download file with cacert support 2022-01-20 19:15:37 +08:00
halx99 0652d1a2d4 Fix log order when create download task fail 2022-01-20 19:00:52 +08:00
deal 73e056f720 Update adxetools.gradle 2022-01-17 10:57:48 +08:00
deal 68215b792e Why FMT_HEADER_ONLY doesn't works on android 2022-01-08 16:15:56 +08:00
halx99 beb8606e16 Fix ci & update project url in sources 2022-01-04 12:36:20 +08:00
halx99 12b4023db2 Fix ci 2022-01-04 11:48:28 +08:00
halx99 30f9bbf307 Update uthash to 2.3.0 and move to thirdparty 2022-01-04 11:18:44 +08:00
halx99 64a6c1b105 Improve linkage 2022-01-04 11:00:07 +08:00
deal 15cc403967 Remove dup sources 2022-01-04 09:42:10 +08:00
halx99 cd98e6c880 Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
Delin 55aa56584a Update CCLabelTextFormatter.cpp 2022-01-03 08:57:40 +03:00
Delin 82a354d803 Update CCLabel.cpp 2022-01-03 08:56:25 +03:00
Delin 110e0578c4 Update CCLabel.h 2022-01-03 08:55:52 +03:00
Delin 717f5d9397 Update CCLabel.cpp 2022-01-03 08:39:18 +03:00
Delin ebd93353bb Update CCLabel.cpp 2022-01-03 08:33:00 +03:00
Delin 8806136b52 Update CCLabel.cpp 2022-01-03 08:20:34 +03:00
halx99 4920faf8f3 Add missing files 2022-01-03 11:42:07 +08:00
halx99 74271f207b Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 e8ef4eb750 Fix TTFconfig construct with nullable customGlyphCollection 2022-01-01 21:21:34 +08:00
halx99 71c997d1ae Fix isAbsolutePathInternal for string_view 2021-12-31 15:50:34 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00