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

247 Commits

Author SHA1 Message Date
halx99 94b5705bd3 Improve cmake script 
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
 2023-07-06 19:21:36 +08:00
halx99 0d5addaf39 Update setup.py to setup.ps1 in cmake [skip ci] 2023-07-06 14:00:21 +08:00
Deal(涓€绾跨伒) 2ff94f287e Improve ci files (#1247) 
* Improve ci files

* Fixup

* Fix ci

* Update DevSetup.md

* Remove duplicated code

* Fix setup_jdk

* Fix typo

* Check jdk setup

* Update build1k.ps1

* Update build.ps1

* Update build1k.ps1
 2023-07-01 08:52:14 +08:00
Deal(涓€绾跨伒) 8a981d7242 Almost pwsh for ci (#1244) 2023-06-29 19:46:52 +08:00
CHP f729bce152 Increment PROP_MIN_SDK_VERSION to 21 (#1236) 2023-06-20 20:49:48 +08:00
halx99 359ba3ab8b Migrate templates includes 2023-06-11 17:42:53 +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 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
aismann 2469c1506e Fix: error C2360: initialization of 't' is skipped by 'case' label (#1146) 
* Fix: error C2360: initialization of 't' is skipped by 'case' label

case ExampleGameState::update:
/////////////////////////////
// Add your codes below...like....
//
// UpdateJoyStick();
// UpdatePlayer();
// UpdatePhysics();
// ...
int t = 10;
break;

* Update HelloWorldScene.cpp

* Update HelloWorldScene.cpp
 2023-03-30 21:41:44 +08:00
halx99 42567d0c98 Update ios splash images [skip ci] 2023-03-21 19:40:55 +08:00
aismann d58d4198e4 improve cpp template (add more event handler) (#1118) 
* improve cpp template (add more event handler)

* fix C-style pointer casting
 2023-03-14 15:25:12 +08:00
halx99 760c59ab6e [UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets 2023-03-12 17:57:54 +08:00
RH 3f6847ebf0 Set default project in Visual Studio for UWP (#1111) 2023-03-12 12:34:51 +08:00
halx99 517ffeedc6 Update project url in sources 2023-03-12 01:44:55 +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 00989196af Fix incorrect content variable in cpp template (#1095) 
* Fix cpp-template-default CMakeLists.txt content folder reference
Update test project content folder variable name to match cpp template
 2023-03-04 21:25:05 +08:00
RH 14ccdfcffa [Apple] Fix for missing resources (#1092) 
* [Apple] Ensure resources are mapped to the expected directory by iOS and MacOS targets
 2023-03-03 21:53:18 +08:00
Deal(涓€绾跨伒) b06c60dfe5 Update lua debug project files 2023-02-24 04:31:05 +08:00
halx99 b377f1238e Tidy lua-template-default 2023-02-24 00:17:36 +08:00
halx99 b6ca5716c5 Fix android assets 2023-02-23 23:48:06 +08:00
Deal(涓€绾跨伒) 83d53ba46b Tidy project tree and full symlink support (#1072) 
* Tidy project file tree and all symlink support
 2023-02-23 21:57:30 +08:00
RH a8b02df98a Update app icon to Axmol logo (#1070) 
* [iOS] Axmol logo

* [Windows] Add Axmol logo as icon
Replace old logos in test resources with Axmol logo

* [tvos] Update to Axmol logo

* Update iOS and tvOS app logo

* Update cpp template app logos

* Fix resources for iOS and tvos. Update to new Axmol logo.
 2023-02-23 13:07:12 +08:00
halx99 452754981a [CMake] Add symlink support, refer to #1005 
- Rename ax_<xxx>_copy_xxx to ax_<xxx>_sync_xxx
- Add optional arg `SYM_LINK`
 2023-02-22 23:37:32 +08:00
Oren Bengigi 5713b3c31b Update CMakeLists.txt (#1031) 2023-01-14 16:34:50 +08:00
RH 991252ed32 Fix cpp-template (#1016) 
* Committing genbindings changes

* Fix compilation error related to redefinition of 'pause'
Fix update override warning
Improve code

* Revert "Fix compilation error related to redefinition of 'pause'"

This reverts commit 1744a48fec.

* Fix compilation error related to redefinition of 'pause'
Fix update override warning
Improve code
 2023-01-06 13:02:55 +08:00
aismann 2ad35decc3 Update HelloWorldScene.cpp (#1008) 
replace   _director->end();  with menuCloseCallback(this);
 2023-01-03 17:40:05 +08:00
aismann d842f6fdfb Improve cpp-template 
Add:
- scheduleUpdate()
- HelloWorld::update(float delta) with some "gamestate switch/cases"
 2023-01-02 22:26:23 +01:00
halx99 060a24d641 Add win32 console for cpp template [skip ci] 2022-12-29 19:00:40 +08:00
CHP 8d36190c98 Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08:00
halx99 50447f3003 Update logo [skip ci] 2022-12-17 16:32:20 +08:00
halx99 176d4384b3 Remove unnecessary cmake include 2022-12-17 14:32:20 +08:00
AsakuraMizu 0f32899747 experimental linux prebuilt support 2022-11-17 22:25:13 +08:00
halx99 d742dceb9f Improve gradle scripts 
Add cmake options from gradle command line properties support
 2022-11-10 22:53:54 +08:00
halx99 a2a3bbe6c4 Migrate namespace for templates [skip ci] 2022-10-19 13:17:18 +08:00
aismann 3ef8ac63f2 rename cocos2d to axmol (#920) 
* rename cocos2d to axmol

* rename cocos2d.h to axmol.h

* Update Physics3DTest.cpp

replace Sprite3D -> MeshRenderer
 2022-10-12 00:15:09 +08:00
涓€绾跨伒|Deal 7e69fa2d0f Merge: 90e8893e05 dbedd025d7 
Merge pull request #903 from aismann/patch-2

Update AppDelegate.h
 2022-10-07 23:44:37 +08:00
涓€绾跨伒|Deal 8a8afc5fe1 Merge: 9eec6d817f be406badfe 
Merge pull request #902 from aismann/patch-1

Update AppDelegate.cpp
 2022-10-07 23:05:34 +08:00
halx99 95d3fcb16a Migrate lua scripts, remove deprecated files 2022-10-07 21:24:11 +08:00
aismann 9886367acd Update AppDelegate.h 
#883
 2022-10-07 15:24:01 +02:00
aismann 634dfb48ce Update AppDelegate.cpp 
#883
 2022-10-07 15:21:07 +02:00
涓€绾跨伒|Deal aed34cd009 Merge: faa6962ce6 2d666a6b84 
Merge pull request #884 from aismann/patch-5

Update HelloWorldScene.h
 2022-10-02 21:49:01 +08:00
涓€绾跨伒|Deal 0844893fb8 Merge: b249282234 3af8ad9580 
Merge pull request #882 from aismann/dev

Adapt Physics3DTest.cpp to #879
 2022-10-02 19:43:32 +08:00
aismann a5acb0d180 Update HelloWorldScene.h 2022-10-02 13:09:56 +02:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08: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
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +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
halx99 87f71ba3a9 Migrte lua script files 2022-08-15 16:28:32 +08:00
halx99 8be2beff6d Improve template HelloCpp code style [skip ci] 2022-08-13 09:35:38 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 5b8cb6995c Migrate lua template [skip ci] 2022-08-11 15:28:32 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 93550405bc Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 484aa38856 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
halx99 448c76c108 Update android target and compile sdk to android 12 2022-08-06 19:26:44 +08:00
aismann e1f458c679 Renamed 'CC_CALLBACK_1' to 'AX_CALLBACK_1' 2022-07-19 08:32:18 +02:00
halx99 5f04e88dc7 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 955c42c7a2 [skip ci] 2022-07-08 07:36:32 +03:00
DelinWorks 519eef7cc4 Fix project creation tools. [skip ci] 2022-07-08 07:27:10 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
涓€绾跨伒 e6ae7c44b3 Merge: 555f847c1f 6dd8b2c74a 
Merge pull request #702 from DelinWorks/improve-engine-types

[PROPOSAL] Move global enums to their own file.
 2022-07-05 00:39:20 +08:00
DelinWorks 96158090db Add stride functions and remove unneeded UNSPEC value. 2022-07-04 19:20:04 +03:00
DelinWorks 7e199cce21 Update lua_cocos2dx_auto.cpp 2022-07-04 18:34:50 +03:00
halx99 a31ba3caae Improve meshdata load 
- Avoid GC alloc when store indices
- Fix indices iterator by IndexArray::for_each
 2022-07-04 23:23:33 +08:00
DelinWorks 0d9f8d8d5d Fix compilation. 2022-07-04 17:55:41 +03:00
halx99 0e300d7d3e Improve project template [skip ci] 2022-06-24 03:09:20 +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
aismann f829e50afb SimpleSnake example 2022-06-14 19:48:06 +02: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
Turky Mohammed d0b551d26b Merge: 6e1d48835e 193ed82788 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 16:55:30 +03:00
DelinWorks 5239256b13 Improve particle RNG and add useful functions 
Replaced M11 RNG with KISS RNG which is better and fixes a problem with particle strafing, added the ability to pause the entire particle system (useful for pause menus) and ability to control particle system time speed multiplier 馃挭馃ザ
 2022-05-23 16:04:09 +03:00
halx99 71c27f43d8 Fix ios device install problems 
- lua template missing `CFBundleExecute`
- Use `_` instead tests project to avoid unknown error
 2022-05-23 17:03:07 +08:00
halx99 349a53fce6 Improve cmake scripts 2022-05-19 10:54:42 +08:00
halx99 98294c911a Fix cmake link 2022-05-18 22:27:43 +08:00
halx99 0811b361a6 Fix app link with prebuilt msedge webview2 2022-05-18 12:49:12 +08:00