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

327 Commits

Author SHA1 Message Date
aismann f3a1ab1942 Update README.md 2022-06-30 13:46:29 +02:00
aismann f90a56df97 Update README.md 2022-06-30 13:24:54 +02:00
aismann 9420129082 Update README.md 2022-06-30 13:19:37 +02:00
涓€绾跨伒 6f1d7221d6 Update readme files (#674) 
* Update README_CN.md

* Update README.md
 2022-06-27 22:21:19 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +08:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08:00
DelinWorks 73b29e235e Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
halx99 5c9ab14d3e Fix astc cmake simd check for windows x64 2022-06-15 21:16:51 +08:00
DelinWorks 82722eefc2 Fix rotation override and node base class calls. 
Make sure Node class calls it's base functions and NOT the ones overridden when changing position, and make sure the rotation set for the camera isn't altered when calling applyCustomProperties().
 2022-06-15 16:10:47 +03:00
aismann a0dfe6e2ab SimpleSnake small updates 
- CodeCleanup
- MIT License file
- readme update
 2022-06-15 07:02:08 +02:00
DelinWorks 14666d9c1f Add position rotation setters & getters override for custom behaviors. 2022-06-15 03:48:26 +03:00
涓€绾跨伒 b9bc6b7357 cocos2dVersion compatible (#655) 
* cocos2dVersion compatible

* Update [skip ci]
 2022-06-14 13:33:45 +08:00
DelinWorks a9f2e29ebf Add zoom and camera features. 2022-06-13 21:04:24 +03:00
halx99 e3314e1222 Update minimal xcode version requirement 2022-06-13 20:12:14 +08:00
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00
涓€绾跨伒 03c8056078 Merge: 5138d701d6 5c35eda3b9 
Merge pull request #650 from adxeproject/ndk-r23c

Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 9bf295d8e4 Upgrade android toolsets 
- ndk to r23c
- gradle plugin to 7.2.0
- gradle wrapper to 7.4.2
- config ndk ver at adxetools.gradle
 2022-06-11 16:16:47 +08:00
涓€绾跨伒 b6790e40e4 Merge: 1cdbf8c273 d2e96534d2 
Merge pull request #645 from aismann/patch-1 [skip ci]

Update readme.md
 2022-05-25 18:17:43 +08:00
DelinWorks e6c13ac358 Revert stashed changes temporarily. 2022-05-25 10:20:35 +03:00
aismann 66b1421fa7 Update readme 
maybe the folder 'cpp-test' should be also renamed to 'cpp_test'?
 2022-05-25 07:07:00 +02:00
涓€绾跨伒 4ccdd211ec Update README.md 2022-05-16 15:47:10 +08:00
aismann 2469df48c6 Update README.md #599 2022-03-24 15:17:41 +01:00
halx99 a435a3a224 Update readme files and changelog 2022-02-26 15:24:20 +08:00
halx99 9672a50007 Update reference links on README files 2022-02-26 14:33:48 +08:00
deal 669ed192b8 Update README.md 2022-02-24 22:36:08 +08:00
halx99 1e1644da37 Update readme & copyright year 2022-02-24 20:34:24 +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
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
deal 46e4228109 Merge: 5c0a41d579 50a190984d 
Merge pull request #589 from DelinWorks/patch-1

Update README.md
 2022-02-16 06:55:07 +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
Delin 2b36188111 Update README.MD 2022-02-10 09:22:41 +03:00
Delin a49a0ad057 Update 2022-02-10 08:55:35 +03:00
DelinWorks 069fea62bd Update README.md 2022-02-09 23:12:57 +03:00
DelinWorks 875c246b2f Update README.md 2022-02-09 22:21:22 +03:00
DelinWorks 3698b5b0a5 Update README.md 2022-02-09 22:19:59 +03:00
DelinWorks df51ade33a Update README.md 2022-02-09 22:17:40 +03:00
DelinWorks a73c0d6af7 Update README.md 2022-02-09 22:15:53 +03:00
aismann 6bde63a054 Update README.md 2022-02-08 10:07:07 +01:00
halx99 0f212a69c8 Update recommend android studio and gradle 
- Android Studio 2021.1.1+ (More intelligent)
- Gralde wrapper to 7.2: https://services.gradle.org/distributions/gradle-7.2-bin.zip.zip
- Gradle Plugin to 7.1: com.android.tools.build:gradle:7.1.0

These upgrades will fix the issue: #573
 2022-01-28 12:47:05 +08:00
deal 325a1fb7ee Add project status 2022-01-27 18:23:44 +08:00
halx99 d5dd3bc175 Update changelog 2022-01-05 14:50:39 +08:00
deal f32280ff42 Merge: 687d15f16e 369de31853 
Merge pull request #560 from adxeproject/ahead

Merge ahead to dev
 2021-12-31 12:12:40 +08:00
halx99 64d7b55366 Update ci branch name 2021-12-31 11:00:35 +08:00
halx99 688447a524 Update badges 2021-12-28 21:50:41 +08:00
halx99 4be73844b6 Update badges 2021-12-28 21:32:25 +08:00
halx99 cf9f4b342b Update version 2021-12-28 21:28:04 +08:00
halx99 0adc8310aa Update README.md 2021-12-17 11:55:57 +08:00
halx99 3e30f3f613 Update README.md 2021-12-16 19:03:57 +08:00
halx99 23e7140949 Update README.md 2021-11-29 22:04:31 +08:00
aismann dd8193428e Add Visual Studio 2022 2021-11-23 13:16:36 +01:00
halx99 c60f5774ff Update README.md 2021-11-09 16:34:32 +08:00
halx99 c463b0fac7 Update README files 2021-11-09 15:59:17 +08:00
halx99 efac239a75 Update README.md 2021-10-09 11:29:09 +08:00
halx99 34f0a204ff Merge: 226ef68d96 68eb67b9a2 
Merge pull request #500 from aismann/patch-11

Update README.md
 2021-09-17 16:11:45 +08:00
halx99 53ac32b74a Update pr-ci.yml 2021-09-17 16:09:00 +08:00
aismann 8b223f22ba Update README.md 2021-09-17 10:02:36 +02:00
halx99 e2b0d3d49e Update README.md 2021-09-14 12:52:27 +08:00
aismann 6865b688d5 Update README.md 2021-09-07 12:35:58 +02:00
aismann 2a88e5de49 Update README.md 2021-08-27 10:43:35 +02:00
halx99 f6033421d0 Add Contributing guide 2021-08-27 15:47:40 +08:00
aismann 0baf946df7 Merge: cbeeb8d8ab 3990cc765d 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 07:49:17 +02:00
aismann 6632c5c3f6 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 d6a54f02a0 Update Windows build status badge 2021-08-27 13:27:04 +08:00
halx99 aca4d274c8 Update README.md 2021-08-27 12:45:20 +08:00
halx99 b04fd70cc7 Merge: bdd69746ae 26f2caad68 
Merge pull request #477 from aismann/patch-7

Update README.md
 2021-08-27 12:34:49 +08:00
halx99 62e42ffad5 Merge: 87871ed557 9c2889be38 
Merge pull request #476 from aismann/patch-6

Update README.md
 2021-08-27 12:34:38 +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 8e10b0bf51 Update README.md 2021-08-27 06:27:45 +02:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
aismann 86f512b81c Update README.md 2021-08-13 08:13:25 +02:00
aismann e0023fb4f9 Update README.md 2021-08-12 11:24:22 +02:00
halx99 152a038751 Merge: 397877134d cc9a32306b 
Merge pull request #448 from aismann/patch-2

Update README.md
 2021-08-12 15:34:56 +08:00
halx99 84a84a8931 Merge: 39eb09daad 861c356bb4 
Merge pull request #447 from aismann/Box2D_TestBed_improvement

Box2D_TestBed_improvement
 2021-08-12 15:34:24 +08:00
aismann d0a18036b5 Update README.md 2021-08-12 07:03:14 +02:00
aismann 97a6104516 Update README.md 2021-08-06 12:19:45 +02:00
The Codacy Badger 797522bb41 Add Codacy badge 2021-07-15 13:21:38 +00:00
aismann 6b8fec01ee Update README.md 2021-07-14 11:16:25 +02:00
halx99 41c8df71c5 Update readme 2021-07-09 10:31:04 +08:00
halx99 e58472901c Sync CMakeLists.txt and README files [skip ci] 2021-07-08 22:55:33 +08:00
halx99 445eeb8845 Merge: eb41e213a6 6edb71d3dc 
Merge pull request #426 from aismann/patch-1

Update README.md
 2021-07-07 13:16:36 +08:00
halx99 58bd65348f Update docs-ci.yml 2021-07-07 12:26:06 +08:00
aismann bd6f18c0df Update README.md 
typo and wiki replace
 2021-07-07 06:16:29 +02:00
halx99 3f79ed9fea Update README.md 2021-06-26 12:03:37 +08:00
halx99 fe4f151b1f Update README.md 2021-06-08 22:52:31 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
aismann 2a6fd50931 fix roadmap link 2021-06-07 10:11:57 +02:00
halx99 e2c1e135f8 Update README.md [ci build] 2021-05-28 15:37:18 +08:00
halx99 5a9fe68c35 Update readme 2021-05-26 14:46:15 +08:00
halx99 65b2b8f65d Merge: 75a07cbaad b46e127cc9 
Merge pull request #355 from aismann/patch-2

'adxe' always lowercase
 2021-05-19 11:42:53 +08:00
halx99 ac180232bf Merge: 7f248efcee 0ffec3873a 
Merge pull request #354 from aismann/patch-1

'adxe'  always lowercase
 2021-05-19 11:42:41 +08:00
aismann 510867c4b3 'adxe' always lowercase 2021-05-19 02:15:21 +02:00
halx99 96cbcce4b0 Merge: 71ebb455a6 2dd4051cbb 
Merge branch 'master' of https://github.com/adxeproject/adxe
 2021-05-18 18:09:06 +08:00