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

2659 Commits

Author SHA1 Message Date
HALX99 5b47d8f839
Sets ndk minimum required version to r19c [ci build] 2021-04-28 17:48:26 +08:00
HALX99 ce6117fa65
Fix tool script cocos 2021-04-25 09:22:07 -07:00
halx99 8eac361f40 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 22:35:29 +08:00
halx99 e3005cb1bd Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 22:30:39 +08:00
HALX99 6d57ecccc2
Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 21:39:42 +08:00
halx99 3a7594d965 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 21:02:55 +08:00
halx99 82fefa78d3 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:58:09 +08:00
halx99 d8a1298245 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:46:32 +08:00
halx99 cb7f26dbe1 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:44:12 +08:00
halx99 612710b1b6 Refine somethings & improve command cocos python3 support [ci build] 
a. Change android sdk root env var to `ANDROID_SDK`
b. Change android ndk root env var to `ANDROID_NDK`
 2021-04-20 16:13:48 +08:00
HALX99 273cd3c7c3
Update before-install.sh [ci build] 2021-04-08 23:32:34 +08:00
HALX99 b0d56dbc7c
Update before-install.sh [ci build] 2021-04-08 23:28:46 +08:00
HALX99 ab904cdcb1
Update before-install.sh [ci build] 2021-04-08 23:08:05 +08:00
halx99 c44d94a2b2 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 2b7ca1b858 Merge branch 'master' of https://github.com/c4games/engine-x 2020-12-16 12:47:04 +08:00
halx99 d467b647e2 Sync luabinding config file 2020-12-16 12:46:37 +08:00
HALX99 29819491f7
Update README.md 2020-12-16 12:33:22 +08:00
halx99 1a9d91127f fix cocos chmod 2020-11-24 19:08:28 -08:00
Eismann a606572775 Update cocos.bat 2020-11-23 09:55:07 +01:00
halx99 76ad6ce1ac CI don't needs download deps manually [ci build] 2020-11-16 16:02:47 +08:00
halx99 38fd8e71aa fix android nasm version print for ci [ci build] 2020-11-12 18:01:27 +08:00
halx99 023f72f2b9 Install nasm for ci [ci build] 2020-11-12 17:48:31 +08:00
halx99 e0a36031c9 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 c72d21b1a3 fix android ci [ci build] 2020-11-09 19:40:43 +08:00
halx99 b5e9f00307 fix ci [ci build] 2020-11-09 18:27:52 +08:00
HALX99 8698214b9e
Update run-scripts.sh [ci build] 2020-11-09 17:53:23 +08:00
halx99 043d139669 Now, the lua binding generator should works [ci build] 2020-11-02 16:47:33 +08:00
halx99 e2c3e53997 Sync readme files 2020-11-02 16:40:05 +08:00
halx99 c56cae2b87 Sync tolua template file 2020-11-02 16:38:08 +08:00
halx99 877de444e4 tolua mutli search paths support 2020-11-02 16:37:18 +08:00
halx99 2471f74de0 Sync config files 2020-11-02 12:50:51 +08:00
halx99 940f4fccaa Optimize python scripts 2020-11-02 11:35:44 +08:00
halx99 c563bc295f Sync folder for binding generator config 2020-11-01 20:18:50 +08:00
halx99 f13bc32512 Build android arch arm64-v8a only for ci, fix test case compiling warning 2020-10-26 11:12:55 +08:00
HALX99 4e25fe1d89
Migrate to github ci (#247) 2020-10-24 18:41:20 +08:00
halx99 3250d4ebf5 Change cocos script, python3 also works 2020-10-21 07:04:43 -07:00
halx99 c154a2f6f4 Python3 no raw_input 2020-10-21 21:37:45 +08:00
halx99 418f7c590e Remove unused plugin_jscompile 2020-10-21 21:07:23 +08:00
halx99 df72e8fa98 Remove json tail comma 2020-10-21 20:55:23 +08:00
HALX99 9158963baf
Use space instead tab [skip appveyor][skip travis] 2020-10-21 19:54:24 +08:00
xxcoder99 89dcff9b27
Update strings.json (#243) 2020-10-21 19:51:25 +08:00
HALX99 9f36564651
Add missing tips for ccoos new 2020-10-21 19:43:36 +08:00
halx99 546ebfc4d4 Also replace so name for proj.android when new project 2020-10-20 16:26:53 +08:00
halx99 ee3bd4cfd9 The command 'cocos new' python script now works both 2.x and 3.x 2020-10-20 12:51:04 +08:00
halx99 7ddd03ed9b Make console tool scripts compitable with python3 syntax 2020-10-20 00:15:10 +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 5bc9904f75 Sync build script 2020-10-08 23:25:32 +08:00
halx99 8e07009a68 Sync official v4 tools 2020-10-08 22:32:07 +08:00
HALX99 0d84d722b8
Use pyenv manage python version for travis-ci (#229) 2020-10-07 22:45:05 +08:00
HALX99 7ae50f4cfd
Android travis ci [skip appveyor] (#228) 
Set python to 2.7.12
 2020-10-07 12:35:08 +08:00
halx99 7d426d9342 build mac with alsoft 2020-10-06 16:50:06 +08:00
HALX99 235f09f635
Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
HALX99 5a32bcfdaf
RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
halx99 41d7f571ef Move fbx-conv to tools [skip appveyor][skip travis] 2020-09-10 11:08:26 +08:00
halx99 743b414bf1 Enable mac build for ci 2020-09-04 16:47:32 +08:00
halx99 7cd25f5a66 Improve ios CMake scripts 2020-08-24 01:26:12 -07:00
halx99 77fb065481 Update CMake scripts 2020-08-17 19:18:18 +08:00
halx99 ef47ff48df Add missing console tool 2020-08-05 14:10:09 +08:00
halx99 bac5a56d0d Set CC_USE_ALSOFT_ON_APPLE=ON at travis build script 2020-07-31 15:11:13 +08:00
halx99 20ebd388da Add console scripts & bindings-generator 2020-07-20 18:46:15 +08:00
halx99 a70b43af1e Remove a submodules. 2020-07-20 18:41:45 +08:00
HALX99 f37a125c1b
fix ci error 2020-05-18 09:16:10 +08:00
HALX99 3fb83491c5
fix ios openssl link error 2020-02-08 22:10:08 +08:00
halx99 9e0ea2583d fix cmake gen command for vs2019 2020-02-08 15:41:13 +08:00
HALX99 c51140bf74
Reset ios toolchain 2020-02-07 20:59:22 +08:00
HALX99 cffc332499
Use ios.toolchain.cmake 2020-02-07 19:26:45 +08:00
halx99 e0070f910a Add ios.toolchain.cmake 2020-02-07 18:59:44 +08:00
HALX99 df688d49ae
test iphoneos 2020-02-07 16:14:27 +08:00
halx99 f167a22dad update file attributes 2019-11-30 20:16:33 +08:00
Arnold d78905c0be [CI ]add cocos new for iOS (#20380) 2019-11-30 16:58:49 +08:00
halx99 35f2ec6897 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
HALX99 5a2e9e4930
Update run-script.sh 2019-11-30 07:08:58 +08:00
HALX99 4e671a97b9
Update run-script.sh 2019-11-30 06:15:54 +08:00
Arnold cea283c489 fix appvenyor env (#20372) 2019-11-26 23:40:57 +08:00
Arnold 45caf37c65 update submodule (#20362) 2019-11-26 23:40:51 +08:00
HALX99 60662af671
skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
HALX99 aad1a18a8f
Temporary disable auto luabindings push 2019-11-25 19:48:31 +08:00
Arnold e3c636c23c Sync resource automatically on Windows and Linux (#20319) 2019-11-15 10:24:38 +08:00
coulsonwang d03411d6eb update submodule (#20324) 2019-11-14 09:43:14 +08:00
Arnold 48239ee160 update external (#20310) 2019-11-08 16:29:04 +08:00
minggo f52df598e6
update cocos console (#20293) 2019-11-05 15:23:09 +08:00
minggo b852fc3355
Revert "don't compile codes for binding generator if it is a pull request (#20237)" (#20283) 
This reverts commit c2c6aa4268.
 2019-11-01 12:02:48 +08:00
minggo c2c6aa4268
don't compile codes for binding generator if it is a pull request (#20237) 2019-10-24 17:25:35 +08:00
coulsonwang b5f1b0ecd9 support iphone simulator (#20235) 2019-10-24 17:24:13 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
coulsonwang b8cf680342 update ProgramState usage in lua (#20204) 2019-10-16 09:48:38 +08:00
Arnold d3359c3e4a [v4] update submodule cocos2d-console (#20170) 
disable compile lua scripts on linux
 2019-09-26 16:10:53 +08:00
Arnold 0d9b5ff442
rebase (#20166) 2019-09-25 09:13:23 +08:00
Arnold 18165adf5b \[v4\] update submodule console (#20147) 2019-09-21 08:43:43 +08:00
Arnold 9791ad635c
[v4] update console submodule: remove cmake toolchain file (#20138) 
remove parameter CMAKE_TOOLCHAIN_FILE
 2019-09-20 18:03:58 +08:00
patricejiang ca39907660
[v4] update submodule cocos2d-console 
recompile luajit-mac with -DLUAJIT_ENABLE_GC64
 2019-09-19 15:49:16 +08:00
Arnold eb8fffec8e Fix `cocos run -m release -p android` for lua-tests (#20070) 2019-09-04 10:02:30 +08:00
CHP b9df8ad823 remove_ios.toolchain.cmake (#20058) 
* remove_ios.toolchain.cmake

* simplify osx configuration

* Remove ios.toolchain.cmake
 2019-08-26 10:01:16 +08:00
CHP 4d0e76bf68 ios_cmake_3_14 (#20055) 
* ios_cmake_3_14

* disabled ios_cmake

* Update .travis.yml

change to xcode11
 2019-08-22 18:39:20 +08:00
Arnold f880350c65 [v4] update luajit (#20052) 
* update ref tools/cocos2d-console

* update luajit
 2019-08-22 09:36:16 +08:00
minggo f2831b4bf1
Revert "update cmake to v3.14 for travis (#20042)" (#20054) 
This reverts commit 19ce98424c.
 2019-08-21 10:47:23 +08:00
minggo 19ce98424c
update cmake to v3.14 for travis (#20042) 2019-08-20 09:44:39 +08:00
coulsonwang c4e6ede197 move VertexLayout to ProgramState (#20029) 
* move VertexLayout to ProgramState

* fix lua
 2019-08-15 16:51:49 +08:00
coulsonwang 320b9b4e67 Feature/sprite optimized (#19998) 
Optimize sprite creation speed
 2019-08-06 09:37:49 +08:00
minggo d49d44c398
fix travis error when installing Android SDK (#19995) 2019-07-30 14:45:29 +08:00