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

2623 Commits

Author SHA1 Message Date
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
Arnold d4eb421d42 suppess log (#19988) 2019-07-26 09:40:14 +08:00
Arnold 2572188042
fetch --unshallow (#19984) 2019-07-25 14:16:58 +08:00
Arnold 262f28ad9d
travis git push enable error log (#19982) 
* git push verbose

* enable error log
 2019-07-25 13:49:07 +08:00
Arnold 0bd77e8d49
set -x (#19981) 2019-07-25 13:38:11 +08:00
Arnold 0c383aacfe Fix travis script (#19964) 2019-07-24 09:57:58 +08:00
Arnold 5683664832 update submodule cocos2d-console (#19896) 2019-07-03 22:23:12 +08:00
Arnold 097a4a74dc [Lua] Export ccexp.AudioEngine on linux (#19898) 
* export ccexp.AudioEngine on linux

* revert auto bindings

* gen bindings
 2019-07-03 18:57:18 +08:00
Arnold 888cd9b159 fix lua (#19888) 2019-07-02 09:29:20 +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 9281ca701e
fix ref of binding-generators' (#19839) 2019-06-17 10:35:18 +08:00
Arnold c8e909eecf
update tools/cocos2d-console (#19838) 2019-06-17 10:15:57 +08: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
minggo 1273fb305d
Remove simple audio engine (#19802) 2019-06-11 18:23:16 -07:00
Arnold 60deaa60ca run genbindings.py (#19805) 2019-06-06 02:49:33 -07:00
minggo 23a21ef298
Remove jsb related (#19729) 
* remove jsb related codes
* update 3rd party
 2019-05-24 00:00:51 -07:00
minggo e401bfd265
Merge pull request #19667 from PatriceJiang/cocos_run_on_linux 
fix `cocos run` on linux
 2019-05-06 18:42:33 -07:00
Arnold 401ce1ee1c
run genbinding 2019-05-06 09:43:40 +08:00
Arnold 2641e5a88a
update submodule 2019-05-05 18:28:25 +08:00
Arnold 98d5f37a30 fix lua-tests errors (#19646) 
* enable test case

* save

* generate enum classes

* save

* autobindg backend interface

* safe

* fix typos

* fix setUniform

* enable draw primitives and fast tmx tiled map

* save all

* update

* fix compile error on mac

* fix locations

* fix locations

* deduce vertexlayout

* clean

* compile on mac

* fix resource path

* save

* update bindings-generator

* remove unused code

* rename ccbackend to ccb

* remove todo
 2019-05-05 00:26:34 -07:00
minggo e8993c9860
Remove jsb/h5 (#19621) 
* remove h5 engine

* remove jsb codes

* remove js tests

* remove js templates and tojs

* remove h5 submodule
 2019-04-18 23:56:12 -07:00
minggo c5f2047905
update cocos console (#19620) 2019-04-18 23:08:44 -07:00
minggo 6067d62341
adapt ClippingNodeTest (#19528) 2019-03-24 19:08:49 -07:00
Arnold 0922ca9e7f
add doc 2019-03-19 02:03:48 +08:00
patricejiang a03109ca36
remove log 2019-03-18 16:27:46 +08:00
Arnold b3d5b6ef39
fix 1 2019-03-18 16:22:02 +08:00
patricejiang 0c8ae82fe3
fix lua bindings 2019-03-18 13:56:19 +08:00
minggo 509fd2f70d
enable windows ci (#19497) 
* enable windows ci

* build with cmake

* fix default project name
 2019-03-12 18:21:02 +08:00
minggo ed1e8c2c2f
make new project work (#19493) 2019-03-12 13:59:29 +08:00
minggo 262c9e5aec
print more message (#19483) 2019-03-11 10:28:32 +08:00
minggo 34631bf02c
print more message (#19481) 2019-03-11 09:34:15 +08:00
minggo de6612f416
comment generating JSB currently (#19479) 2019-03-08 17:10:24 +08:00
minggo 4854f1c3e7
make travis work (#19478) 
* make travis work

* don't compile ios as needing team id
 2019-03-08 15:24:47 +08:00
minggo e63c4d1ba6
make lua binding work (#19474) 2019-03-07 18:29:06 +08:00
minggo c040a2d49b
Cocos console (#19466) 
* modify to work for new console

* fix for windows

* update cocos console
 2019-03-06 17:01:26 +08:00
minggo 10f7790069
remove build folder (#19448) 2019-02-28 15:01:59 +08:00
minggo e991fd392c
fix folder error if path is not start with v (#19328) 2019-01-21 11:47:15 +08:00