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

37543 Commits

Author SHA1 Message Date
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
coulsonwang 1888267fa9 add particle texture (#20144) 
add particle texture
 2019-09-20 17:31:08 +08:00
coulsonwang 5918758904 fixLuaNodeTest (#20145) 
set depth write mask correctly
 2019-09-20 17:30:52 +08:00
minggo b3dba7b93e
Merge pull request #20131 from Mee-gu/checkMemoryLeak 
fix memory leak on metal app
 2019-09-20 14:37:02 +08:00
minggo 965ea379a7
Merge pull request #20139 from Mee-gu/fixWarning 
fix warning
 2019-09-20 14:36:36 +08:00
coulsonwang 0dbe3419d2 fix warning 
fix warning
 2019-09-20 11:20:07 +08:00
minggo 00f8713f26
Merge pull request #20133 from PatriceJiang/v4_update_console_submodule_luajit 
[v4] update submodule cocos2d-console
 2019-09-20 09:26:03 +08:00
minggo 6287aaf5f0
Merge pull request #20135 from Mee-gu/fixWarings 
Fix warnings
 2019-09-20 09:21:25 +08:00
minggo edb6d90f39
Merge pull request #20130 from Mee-gu/fixParticleIssue 
add particle texture
 2019-09-20 09:19:34 +08:00
coulsonwang fb39795d27 fix warning 2019-09-19 18:43:31 +08:00
patricejiang ca39907660
[v4] update submodule cocos2d-console 
recompile luajit-mac with -DLUAJIT_ENABLE_GC64
 2019-09-19 15:49:16 +08:00
coulsonwang e9a33903f0 fix memory leak for metal app 2019-09-19 15:31:05 +08:00
coulsonwang 4c3375bc41 add particle texture 2019-09-18 10:02:33 +08:00
minggo 302007976a
getting correctly uniform location value (#20127) 
* fix uniformLocation

* set the right position of uniform location
 2019-09-18 09:44:44 +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
coulsonwang c17417f3cb set the right position of uniform location 2019-09-17 17:15:16 +08:00
coulsonwang dc910efee7 fix uniformLocation 2019-09-17 15:09:44 +08:00
minggo f3b09563f8
Mac label v4 (#20125) 
* fix system font issue on macOS Catalina
 2019-09-17 13:35:19 +08:00
Arnold f3caa09fd6 code review update: cmake ios simulator limitation MacOS 10.15 (#20120) 2019-09-16 15:09:01 +08:00
Arnold 860b537b3e update readme (#20109) 2019-09-06 18:51:12 +08:00
minggo 9df47ef6fd
use WKWebview instead (#20103) 
UIWebView is removed in iOS 13.
 2019-09-06 09:57:38 +08:00
coulsonwang d9e6c74ea6 particle use tiff issue (#20105) 2019-09-06 09:46:15 +08:00
Arnold eed319938d [lua tests] MaterialSystemTest update u_Time uniform (#20083) 2019-09-05 15:56:39 +08:00
minggo dcf7baf8c0
remove tiff 2019-09-05 09:33:54 +08:00
coulsonwang 816289ccf5 fix clipping node issue (#20100) 
Children are not correctly clipped.
 2019-09-05 09:17:43 +08:00
minggo d1abfd8aa2
use AVPlayerController instead (#20099) 2019-09-04 20:45:51 +08:00
Arnold 92b48359ea add cert file (#20081) 2019-09-04 10:09:12 +08:00
coulsonwang 5ab04a7001 set default color attachment format (#20073) 2019-09-04 10:07:31 +08:00
Arnold 7c3a7153c8 update' (#20082) 2019-09-04 10:06:38 +08:00
Arnold 55f6f6d6e7 [bugfix] Fileutils iOS isDirectory (#20079) 2019-09-04 10:03:38 +08:00
Arnold eb8fffec8e Fix `cocos run -m release -p android` for lua-tests (#20070) 2019-09-04 10:02:30 +08:00
coulsonwang 469fc61d5a set depth write (#20071) 2019-09-04 10:02:03 +08:00
coulsonwang 4d04b64a3a add specific define for metal (#20084) 2019-09-04 09:58:40 +08:00
coulsonwang f97717265b fix shader header defines (#20077) 2019-09-04 09:56:28 +08:00
coulsonwang b4d0522116 shader value validation (#20086) 2019-09-04 09:53:26 +08:00
Arnold a9a322331b update external (#20067) 2019-09-02 09:40:06 +08:00
Arnold 56c9ec137c add link flags (#20069) 2019-09-02 09:39:43 +08:00
coulsonwang 48e0d7d3a6 resize metal drawable (#20074) 2019-08-31 20:10:32 +08:00
coulsonwang 73ad115702 fix FastTMXLayer (#20065) 2019-08-29 22:30:03 +08:00
coulsonwang 66c4892b22 fix attribute location (#20064) 2019-08-29 18:15:03 +08:00
CocosRobot 6d8b1f5b9d [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20061) 2019-08-26 15:51:44 +08:00
coulsonwang de3f252794 generate project for cocos2d (#20056) 2019-08-26 10:01:50 +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 50df439e87
update changelog and version (#20053) 2019-08-21 10:45:45 +08:00
CocosRobot 6c3ae9a7c5 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20049) 2019-08-20 16:19:47 +08:00