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

37245 Commits

Author SHA1 Message Date
minggo a4fb692f36
fix for #19713 (#19714) (#19939) 
#19713
 2019-07-22 09:35:44 +08:00
minggo 0b7448bfc0
remove duplicate function call in cmake (#19697) (#19938) 
* AssureOutOfSourceBuilds() is called in module file. No need to
call it in root cmake file.
 2019-07-22 09:35:30 +08:00
minggo 5820915287
sync 19693: FIX ios bug : You don’t have permission to save the file Documents_temp (#19937) 2019-07-22 09:35:15 +08:00
minggo df9fa6c8fd
fix twice copy lua scripts error (#19687) (#19936) 2019-07-22 09:34:56 +08:00
minggo 956fd85401
sync 19661: Clear the scene stack in the expected order (#19935) 2019-07-19 16:53:20 +08:00
minggo 838c285696
sync 19655 (#19932) 2019-07-19 13:45:08 +08:00
minggo e47d6b664f
sync 19649 and fix conflict (#19931) 2019-07-19 13:43:20 +08:00
minggo ad54a24cf0
sync 19634 and fix conflict (#19930) 2019-07-19 11:57:11 +08:00
minggo e93d4cb1d6
fix outdated documentation [ci skip] (#19618) (#19929) 2019-07-19 10:19:13 +08:00
coulsonwang 7b7cf55efb remove vertex step mode (#19921) 2019-07-17 13:59:37 +08:00
coulsonwang cb07f599f8 add api comments (#19922) 2019-07-17 09:26:15 +08:00
coulsonwang 03ea495fd6 add API comments (#19919) 2019-07-16 10:01:23 +08:00
coulsonwang f0f9cf612c add api comments (#19916) 2019-07-15 09:28:38 +08:00
coulsonwang de8cf4c45b set default frameBufferOnly to false for ios (#19915) 2019-07-15 09:28:18 +08:00
coulsonwang b96c467318 fix stencil issue (#19910) 2019-07-10 09:56:55 +08:00
coulsonwang 77b1535a9d add api document (#19909) 2019-07-09 09:43:45 +08:00
Arnold 23f8aa85da Update README.md (#19908) 
* update frameworks

* remove js
 2019-07-08 13:45:23 +08:00
coulsonwang a92ab26096 remove unUsed member (#19906) 2019-07-05 10:11:12 +08:00
coulsonwang e70f09368b fix fast tile map (#19905) 2019-07-04 17:54:10 +08:00
coulsonwang f72dbd28d0 add copyright (#19903) 2019-07-04 17:47:24 +08:00
minggo 67d43ca591
Update CMakeLists.txt 2019-07-04 09:48:45 +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
coulsonwang fbd0062e3d fix tile map test in lua (#19897) 2019-07-03 16:03:58 +08:00
minggo 96534de260
fix warnings (#19891) 2019-07-03 10:43:10 +08:00
Arnold 888cd9b159 fix lua (#19888) 2019-07-02 09:29:20 +08:00
Arnold 2eb4625cbc
regenerate (#19887) 2019-07-01 13:51:02 +08:00
coulsonwang 7f96375871 Feature/fix tile map (#19883) 2019-06-30 11:36:52 +08:00
minggo e0200eaa54
should unbind prebound attachments to avoid error on some android devcies (#19875) 2019-06-28 08:56:13 +08:00
coulsonwang e8839cefbe Feature/lua drawing node (#19863) 
* fix DrawInRect in lua

* fix

* rename
 2019-06-27 17:44:07 +08:00
Arnold 76edaa0993 [bugfix] fix TextureInfo copy constructor (#19865) 
* fix copy

* fix compile error

* Update cocos/renderer/backend/ProgramState.cpp
 2019-06-27 17:42:32 +08:00
minggo b9d72cdb53
add missing label (#19871) 2019-06-27 13:41:41 +08:00
Arnold 4f6e6454ba convert to integer (#19872) 2019-06-27 13:38:27 +08:00
Arnold 75ba0f91d1 add break statement (#19867) 2019-06-27 09:40:53 +08:00
coulsonwang bbc6a88c51 optimize the uniform buffer (#19845) 
* optimize the uniform buffer

* update review
 2019-06-26 10:26:49 +08:00
Arnold 3620633fd8 [lua] remove simulator code from template project (#19862) 
* update template'

* fix compile error
 2019-06-25 18:14:50 +08:00
Arnold abd7ffddc6 [lua] remove TODO in LuaBasicConversions.cpp (#19848) 
* remove todos

* merge
 2019-06-25 10:22:03 +08:00
Arnold a0e114a07f remove cc.SimpleAudioEngine (#19859) 2019-06-25 09:41:19 +08:00
Arnold 0dfb0de1d3 remove removeFromParentAndCleanup (#19860) 2019-06-25 09:18:06 +08:00
coulsonwang ab749c69ec fix setBlendFunc (#19858) 2019-06-24 15:30:15 +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
coulsonwang 1b6c3a7173 setFrameBufferOnly to false when necessary (#19843) 2019-06-18 18:05:22 -07:00
coulsonwang 2c5fc38297 add test case (#19830) 
* add test case

* comment meaningless test case
 2019-06-18 18:04:56 -07:00
coulsonwang 7a94e66a14 Feature/fix alpha test (#19824) 2019-06-18 00:25:26 -07:00
coulsonwang 7486fe89dc fix flip issue (#19831) 
* fix flip

* fix flip issue
 2019-06-18 00:20:29 -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 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
coulsonwang fef1752cfe fix TODO (#19793) 2019-06-11 23:58:07 -07:00