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

40326 Commits

Author SHA1 Message Date
aismann 880ec7321e Update SpritePolygonTest.cpp 2022-08-28 07:17:10 +02:00
aismann 73e8740e82 Improve SpritePolygonTest 2022-08-28 06:34:20 +02:00
一线灵|Deal a893bf5ffd
Merge pull request #823 from aismann/Clipper2_replace_Clipper1 
Clipper2 replacing clipper1
 2022-08-28 08:07:50 +08:00
aismann 8b6767e9f6 Update CCAutoPolygon.cpp 2022-08-27 18:30:22 +02:00
aismann 9f5a5491e7 Rename folder to clipper2 2022-08-27 18:28:21 +02:00
aismann 898b9cd9af cleanup2 2022-08-27 17:41:12 +02:00
aismann bb05337bfe cleanup 2022-08-27 17:40:03 +02:00
aismann 9242920857 add some more stuff 2022-08-27 17:10:36 +02:00
aismann 6276c41281 Replace Clipper1 (all stuff) 2022-08-27 17:03:38 +02:00
aismann 9d1f2f3487 Replace Clipper1 (all stuff) 2022-08-27 17:00:10 +02:00
一线灵|Deal e6765eb19b
Merge pull request #816 from aismann/Fix-for-issue-#231 
Update SpritePolygonTest.cpp  (fix for #231)
 2022-08-25 09:13:34 +08:00
aismann 84b40f5dea Update SpritePolygonTest.cpp 
Fix for issue #231
 2022-08-24 19:44:53 +02:00
一线灵 680066ae89
Improve astc cmake script 2022-08-22 11:47:52 +08:00
halx99 8670f2fb2d Update lz4 to v1.9.4 2022-08-19 20:39:14 +08:00
halx99 07fbe78c5d Fix #810 2022-08-19 19:52:10 +08:00
一线灵 bf4c7fefa8
[CMake] Mark engine pch as private 2022-08-19 12:15:49 +08:00
一线灵 44e98f9c41
Update AXLinkHelpers.cmake 2022-08-19 10:12:06 +08:00
一线灵 746f396dca
Update README.md 2022-08-18 09:13:09 +08:00
unknown c26ab44880 Add empty check 2022-08-16 15:12:45 +05:30
halx99 264d6f28d1 Improve code style 2022-08-16 17:15:56 +08:00
halx99 d8c9a8826a Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 8a462d89c9 Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
halx99 6f5a4fc2bb Update gh actions config files 2022-08-16 08:26:20 +08:00
一线灵 95e8fe4e74
Fix compile error when AX_USE_LUAJIT=TRUE 2022-08-15 16:37:53 +08:00
halx99 6de08175bb Migrte lua script files 2022-08-15 16:28:32 +08:00
一线灵 b580991236
Update README.md 2022-08-14 18:13:58 +08:00
一线灵 460e59f4de
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
一线灵 a2e3f42ae2
Merge pull request #805 from solan-solan/dev 
writable-path-android
 2022-08-14 09:55:32 +08:00
DESKTOP-16GC0B8\813658 31c06c658a Fixed get writable path for android 2022-08-13 23:53:40 +03:00
halx99 0465664ea1 Rename jpeg-turbo folder 2022-08-13 09:51:21 +08:00
halx99 7e1db178ab Improve template HelloCpp code style [skip ci] 2022-08-13 09:35:38 +08:00
一线灵 bc50642e5f
Merge pull request #802 from axys1/revert-773-dev 
Revert "Support for Apple Silicon / M1"
 2022-08-13 09:32:27 +08:00
一线灵 23c2dcb539
Revert "Support for Apple Silicon / M1" 2022-08-12 16:39:06 +08:00
unknown f5c7940418 RichElementImage - Add support for scaling 2022-08-12 03:58:36 +05:30
halx99 46bee8284f Fix ci 2022-08-11 22:05:23 +08:00
halx99 92914f47b0 Update astcenc to v4.0.0 2022-08-11 21:38:19 +08:00
一线灵 ea62fba423
Merge pull request #796 from aismann/dev 
Update setup.py
 2022-08-11 18:30:12 +08:00
aismann 3bb03df452
Update setup.py 
typo
 2022-08-11 11:29:05 +02:00
halx99 9150b9db83 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 eb4aa7fb8b Migrate lua template [skip ci] 2022-08-11 15:28:32 +08:00
一线灵 2abcab8de8
Merge pull request #795 from axys1/fix-osx-ios-ci 
Fix osx/ios ci
 2022-08-11 13:44:29 +08:00
halx99 20a83d198a Fix osx/ios ci 2022-08-11 13:08:14 +08:00
halx99 2c07233232 Committing genbindings changes 2022-08-11 03:03:29 +00:00
halx99 3cf19787ce Fix #791 really 2022-08-11 10:52:38 +08:00
halx99 e2918ad924 Migrate extension 'ImGUI' 2022-08-11 10:02:30 +08:00
halx99 2b1770bdc7 Committing genbindings changes 2022-08-11 01:57:48 +00:00
一线灵 6c0f9ab7f4
Merge pull request #792 from DelinWorks/fix-camera-view-calculation 
[BUG] Fix camera view calculation and tidy up system.
 2022-08-11 09:50:46 +08:00
DelinWorks 4ed7c32cf3 Remove assign dups and simplify function naming. 2022-08-11 01:52:04 +03:00
Turky Mohammed 84003b66b2
Update CCCamera.h [skip ci] 2022-08-10 21:10:34 +03:00
DelinWorks dcd0fd6001 Add initialize member function. 2022-08-10 21:09:10 +03:00