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

718 Commits

Author SHA1 Message Date
halx99 3d7218a0eb Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 e534dd66c0 Rename core folder name 2021-12-31 14:39:08 +08:00
halx99 8fd4a8afc3 Fix android ci 2021-12-29 13:44:39 +08:00
halx99 ce5adf35f7 Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 b459acbcf7 Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
halx99 95a1734cd7 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 86a28937fc
Merge pull request #521 from adxeproject/refine-lua-loader 
Refactor lua loader, reload lua with file name as-is
 2021-10-12 14:18:02 +08:00
halx99 846231e2f1 Fix #522 2021-10-12 13:16:27 +08:00
halx99 c270fc3579 Remvoe lua 64bit bytecode spec 
a. since we know how to compile compatible bytecode for both plainlua and LuaJIT
 2021-10-11 23:26:25 +08:00
halx99 bbd3a78ae4 Improve lua workflow on windows 
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
 2021-10-07 18:44:34 +08:00
halx99 56edf5c339 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
halx99 6ee687302b Xcode Embed Frameworks support 
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
 2021-08-10 11:43:16 +08:00
halx99 7ee1785858 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 61af6d75f9 Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 29015e1cd7 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 f0dc1582fb [Gradle] Find ndk with env ANDROID_NDK [ci build] 2021-06-02 05:37:18 +08:00
halx99 adce3298de Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
HALX99 a42f9ac25c
Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 97e8d4c58a Replace jcenter with mavenCentral [ci build] 2021-05-15 12:15:38 +08:00
halx99 bb1871b0e0 Gradle Plugin no longer support cmake 3.10.0+ 2021-05-15 11:58:56 +08:00
halx99 412a6fa9e2 Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 798e0fe1a1 Update gradle stubs [ci build] 
a. wrapper  to  6.9
b. plugin to 4.2.0
 2021-05-14 12:11:19 +08:00
halx99 3348f10813 Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
halx99 49c1318fc1 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
halx99 e8c1d7bc2c Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 3ff5b16847 Ensure build native first before compile java code 2021-04-20 20:25:32 +08:00
halx99 d33ffa67cd Set gradle-wrapper to 6.8.3 [ci build] 2021-04-08 22:42:15 +08:00
halx99 958f6c3a93 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
halx99 9972ddd71c fix lua-tests cmake script 2021-03-26 17:10:37 +08:00
halx99 adf3483943 Fix CMakeLists for separating test projects [ci build] 2021-03-15 09:50:32 +08:00
halx99 46287b84c2 Rollback gradle plugin version 4.0.1, since there is no benefit upgrade to 4.1.0 2020-11-12 22:50:38 +08:00
halx99 755714c103 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 863bd35676 Finish #244 2020-10-25 16:25:08 +08:00
halx99 975ef2ff61 Lock name 2020-10-24 21:57:36 +08:00
halx99 8a69a3a5cc Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake 2020-10-22 17:50:25 +08:00
halx99 eb52b0d319 Make setup.py works with python3 2020-10-22 16:53:28 +08:00
halx99 119e62f164 Update gradle plugin to 4.1.0 2020-10-21 10:55:32 +08:00
halx99 25cc511532 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 bacba846af Sync SharedLoader template. 2020-10-19 19:19:17 +08:00
halx99 919d48d68e Finish cpp and lua template to use env var 'COCOS2DX_ROOT' to avoid copy whole engine source when new project. 2020-10-19 18:33:10 +08:00
halx99 8450babc16 Remove gradle compile lua to fix compile error, needs tools to compile and encrypt lua later 2020-10-18 01:12:11 +08:00
halx99 4142499bc4 Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:05:36 +08:00
halx99 dfce234ced Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:01:36 +08:00
halx99 71c9b2b101 fix #146 2020-08-18 10:51:32 +08:00
halx99 67ef8bb624 Improve shared library for android, remove mojoal,sdl2, still use OpenAL.framework on apple platform, alsoft on other platforms. 2020-08-17 18:45:14 +08:00
halx99 bcc00eaffe Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
halx99 f38f76c1a1 Sync spine code and resource to 3.8 2020-08-05 17:04:57 +08:00
halx99 6eb58f58bd Optimize CMake scripts 2020-08-04 14:05:00 +08:00
halx99 da7e235b25 Optimize link, remove -Wl,--whole-archive for linking 3rd libs. 2020-07-29 18:55:45 +08:00
halx99 d1cd05c0c8 Copy angle binaries 2020-07-23 10:32:50 +08:00
halx99 5416b4d34c Remove xxtea, cleanup xxtea reference sources 2020-02-15 20:54:33 +08:00
halx99 3f78448495 Fix .so auto link when folder not exists 2020-02-04 20:57:20 +08:00
halx99 a40c81e984 load .so at AppActivity.java 2020-02-04 19:22:11 +08:00
halx99 a350f4be88 solve auto link .so for android platform 2020-02-03 21:18:23 +08:00
minggo 589e09c328 set xcode installation path to (#20402) 2020-01-18 20:40:21 +08:00
Arnold cdc0d4702c [bugfix] set CFBundleExectuable in template info.plist (#20425) 
fix #20414
 2020-01-18 20:40:00 +08:00
Arnold b74af1970b [bugfix] set Info.plist path (#20405) 
fix bug introduced in #20205
 2019-12-12 23:55:18 +08:00
coulsonwang abc25ae04a adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
minggo 514834c4c0 use sprite to create editbox (#20371) 2019-11-26 23:40:48 +08:00
coulsonwang 5b15737b3a fix walking boundary of terrain (#20364) 2019-11-22 16:07:14 +08:00
Arnold 3b4748009f
use copy instead of linkis (#20356) 2019-11-21 15:12:37 +08:00
Arnold e3c636c23c Sync resource automatically on Windows and Linux (#20319) 2019-11-15 10:24:38 +08:00
coulsonwang dde4780e14 decrease the font size or it will be conflict (#20333) 2019-11-14 18:11:15 +08:00
coulsonwang a6f73e2f5a adjust testItem relative position (#20331) 2019-11-14 15:13:20 +08:00
Arnold 6a53b31d08 [bugfix] add pagezero_size link flags (#20321) 2019-11-13 11:07:52 +08:00
minggo 98ab6d23b6
set iOS default deployment version in correct place (#20307) 2019-11-08 10:30:51 +08:00
minggo 5acc952a17
fix iOS build issue (#20292) 2019-11-05 15:23:54 +08:00
coulsonwang 8126cfafd5 add defualt ios deloyment target (#20282) 
* add defualt ios deloyment target
 2019-11-01 17:07:52 +08:00
coulsonwang d41457d447 comment spine codes in lua (#20272) 2019-10-30 16:25:08 +08:00
coulsonwang 4f486528cc fix walking boundary of 3D test in lua 2019-10-29 19:24:35 +08:00
minggo 487634b5b7
Merge pull request #20264 from Mee-gu/fixLua 
fix experimental namespace
 2019-10-29 14:30:10 +08:00
coulsonwang d77cd8f3b1 fix experimental namespace 2019-10-29 14:19:16 +08:00
minggo 2f79eb10af fix installation error on some Android devices 
May meet "The application could not be installed: INSTALL_FAILED_TEST_ONLY" error on some devices.
 2019-10-29 11:35:22 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
coulsonwang ee4432661c fix label text word wrong warp issue (#20226) 2019-10-23 14:13:38 +08:00
Andy Duplain 1a04787287 Rework CMake Xcode support. (#20205) 
- Build using C++17 by default.
- Simplified customization of Xcode project via cmake.
- Add documentation to demonstrate how to use the customization.

- NOTE: I believe we could compile with bitcode enabled if the box2d
        library was compiled using bitcode.
 2019-10-22 13:42:56 +08:00
coulsonwang b8cf680342 update ProgramState usage in lua (#20204) 2019-10-16 09:48:38 +08:00
coulsonwang 67ae2e756e fix ProgramState and Program performance (#20189) 
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
 2019-10-15 09:40:59 +08:00
coulsonwang 5918758904 fixLuaNodeTest (#20145) 
set depth write mask correctly
 2019-09-20 17:30:52 +08:00
coulsonwang 83dd39ec0b remove unneeded codes (#20126) 
was removed from Sprite3D. Should not be call from lua.
 2019-09-18 09:22:15 +08:00
Arnold 96ae05d511 [bugfix] Android compile error on arm64 (#20128) 
* add --no-warn-shared-textrel only in android/x86

* update comment position
 2019-09-18 09:21:56 +08:00
Arnold eed319938d [lua tests] MaterialSystemTest update u_Time uniform (#20083) 2019-09-05 15:56:39 +08:00
Arnold 56c9ec137c add link flags (#20069) 2019-09-02 09:39:43 +08:00
minggo 5e40f5e6a5
remove tiff (#20047) 2019-08-20 15:15:40 +08:00
coulsonwang c4e6ede197 move VertexLayout to ProgramState (#20029) 
* move VertexLayout to ProgramState

* fix lua
 2019-08-15 16:51:49 +08:00
coulsonwang e23f1f34c3 remove step mode (#20032) 2019-08-15 09:31:44 +08:00
Arnold f440369f1c Update gradle to 5.1.1 (#19958) 2019-07-24 09:53:02 +08:00
coulsonwang 57a3bd98f1 fix glfw3.3 no respond issue (#19963) 2019-07-23 16:58:35 +08:00
coulsonwang 7b7cf55efb remove vertex step mode (#19921) 2019-07-17 13:59:37 +08:00
coulsonwang e70f09368b fix fast tile map (#19905) 2019-07-04 17:54:10 +08:00
coulsonwang fbd0062e3d fix tile map test in lua (#19897) 2019-07-03 16:03:58 +08:00
Arnold 888cd9b159 fix lua (#19888) 2019-07-02 09:29:20 +08:00
coulsonwang e8839cefbe Feature/lua drawing node (#19863) 
* fix DrawInRect in lua

* fix

* rename
 2019-06-27 17:44:07 +08:00
Arnold 4f6e6454ba convert to integer (#19872) 2019-06-27 13:38:27 +08:00
Arnold 0dfb0de1d3 remove removeFromParentAndCleanup (#19860) 2019-06-25 09:18:06 +08:00
coulsonwang 22e8a651d2 Feature/lua render texture test (#19827) 
* fix render texture test in lua

* remove unnecessary code

* fix CI compile error
 2019-06-18 22:45:14 -07:00
Arnold cf83c91480 [cmake] Update plist template for iOS projects (#19828) 
* update cmake template

* fix tabs

* use function instead of macros

* rename local variables & cocos_fake_set

* use g++ 7 in travis ci

* use clang

* use g++6
 2019-06-17 18:37:56 -07:00
Arnold 7851f212bf Rename backend::Texture2D (#19821) 
* compile on windows

* compile on mac

* rename to Texture2DBackend

* compile on mac
 2019-06-12 00:01:15 -07:00
Arnold 36228d0182 use https (#19820) 2019-06-11 18:23:56 -07:00
minggo 1273fb305d
Remove simple audio engine (#19802) 2019-06-11 18:23:16 -07:00