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

4310 Commits

Author SHA1 Message Date
songchengjiang 64f082ab7c add bumped testing model 2015-11-26 10:14:27 +08:00
songchengjiang 9241797acb support normal mapping material 2015-11-25 10:45:03 +08:00
pandamicro a74c8ccded Merge pull request #14292 from xiaofeng11/v3 
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
 2015-11-03 17:46:34 +08:00
pandamicro 6010879ecf Merge pull request #14305 from pandamicro/v3 
[ci skip] Fix SocketIO test on iOS 9
 2015-11-03 17:27:21 +08:00
pandamicro 6a454d3eba Fix SocketIO test on iOS 9 2015-11-03 17:26:37 +08:00
zhangcheng 39f68e9885 Update ccs-res submodule to the latest. 2015-11-03 13:08:56 +08:00
XiaoFeng 8e6e46d596 Fix "BillBoard Test->Rotation Test" won't resume after switch back from background. 2015-11-02 14:50:45 +08:00
XiaoFeng 0c8aed8a1a Remove redundancy code 2015-11-02 13:40:08 +08:00
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
pandamicro b66fa04c21 Merge pull request #14255 from xiaofeng11/v3_23634 
Fix "UItest->UicheckBox" display status, make it same as C++ version
 2015-10-28 18:32:49 +08:00
XiaoFeng 53d2874507 Fix "UItest->UicheckBox" display status, make it same as C++ version 2015-10-28 17:38:17 +08:00
pandamicro 15e400fb2e Merge pull request #14248 from xiaofeng11/v3_23634 
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
 2015-10-28 15:49:52 +08:00
XiaoFeng 80b2def648 Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status. 2015-10-28 14:12:24 +08:00
pandamicro 5a963c66cd Merge pull request #14240 from neokim/android_test_app_landscape_reversible 
Change the android test app to be landscape reversible.
 2015-10-28 13:03:33 +08:00
XiaoFeng c55f030218 Fix "Test change animation intenal" under js test can not change back to 60fps 2015-10-28 11:18:12 +08:00
Neo Kim 11b46a7b04 Change the android test app to be landscape reversible. 2015-10-27 20:43:56 +09:00
pandamicro aa9f0d5bd5 Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
 2015-10-27 17:28:22 +08:00
pandamicro 175f4c02ad Merge pull request #14197 from xiaofeng11/v3_xf 
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
 2015-10-22 14:45:20 +08:00
pandamicro 43c19fd1e7 Merge pull request #14205 from pandamicro/v3 
Fix Scheduler API inconsistency
 2015-10-21 22:11:16 +08:00
pandamicro 9eeda122e9 Fix Scheduler API inconsistency 2015-10-21 22:10:48 +08:00
Dale Stammen 3f359381dc moved file to correct folder in vcxproj 2015-10-20 10:07:30 -07:00
Dale Stammen f9d8907697 updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
XiaoFeng 3d626940af Roll back debug commented code 2015-10-20 17:23:31 +08:00
XiaoFeng 7e54a91ee6 Fix CCDownloader-curl will crash in js-test 
Fix broken image link in TextureCacheTest.js
 2015-10-20 16:28:03 +08:00
pandamicro 3bf0d0fe44 Merge pull request #14168 from MSOpenTech/v3-win10-fix 
V3: fixed msbuild by removing incorrect AppxBundle properties from project
 2015-10-19 08:22:24 +08:00
pandamicro cde67d1261 Merge pull request #14162 from mogemimi/fix-warnings 
Fix warnings on Xcode 7
 2015-10-18 22:56:12 +08:00
pandamicro c365fc5883 Merge pull request #14180 from pandamicro/v3 
Fix issue for web engine upgrade
 2015-10-18 22:48:16 +08:00
pandamicro 11890d6c4b Fix issue for web engine upgrade 2015-10-18 00:19:02 +08:00
Dale Stammen e2730a3d92 fixed msbuild by removing incorrect AppxBundle properties from project 2015-10-16 09:25:24 -07:00
mogemimi 73c0ce1a9a Replace String::createWithFormat() with StringUtils::format() 2015-10-16 15:02:14 +09:00
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09:00
pandamicro efeb6a44fb Merge pull request #14143 from MSOpenTech/v3-win10-curl 
V3 win10 curl
 2015-10-16 13:35:48 +08:00
pandamicro e789ab97be Merge pull request #14139 from super626/v3 
fix obb performance test
 2015-10-15 16:00:51 +08:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
pandamicro 1c085c96f1 Merge pull request #14136 from songchengjiang/cocos2d-v3-bugfix 
fix lua Scene3DTest "back" button not working issue
 2015-10-14 14:01:58 +08:00
yangxiao 85f40de424 fix obb performance test 2015-10-14 13:43:02 +08:00
songchengjiang 29c5ca6ea9 fix the #23309 bug 2015-10-14 11:23:11 +08:00
XiaoFeng 767a4afb9f Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1 2015-10-14 09:16:34 +08:00
pandamicro f2e3a0c071 Merge pull request #14104 from xiaofeng11/v3_bugfix 
Bug fix
 2015-10-12 10:14:26 +08:00
XiaoFeng aee3244ad3 Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2 2015-10-10 17:50:48 +08:00
pandamicro cff1a8ed50 Merge pull request #14103 from xiaofeng11/v3_bugfix 
Bug fix
 2015-10-10 17:20:07 +08:00
XiaoFeng 4df211fa0b Fix particle test under lua test project display different in different platform 
Fix cocostudio 3d test under lua test project crash bug
 2015-10-10 14:51:14 +08:00
pandamicro f64105b3dc Merge pull request #14047 from liamcindy/v3.9 
update for light3d reader
 2015-10-10 11:43:05 +08:00
pandamicro c2571f950c Merge pull request #14003 from zilongshanren/fixWebViewCallback 
fix ui::WebView callback operate OpenGL issue.
 2015-10-10 11:32:02 +08:00
pandamicro 8b0a6a6c29 Merge pull request #14099 from pandamicro/v3 
[ci skip]Sync with CCBoot for web
 2015-10-10 10:16:16 +08:00
pandamicro 5ae2812bf8 Sync with CCBoot for web 2015-10-10 10:15:36 +08:00
pandamicro bc9b59b7f7 Merge pull request #14096 from pandamicro/v3 
[ci skip]Add opacity/color cascade test case for Scale9Sprite
 2015-10-09 21:07:27 +08:00
pandamicro 0ea54868e2 Add opacity/color cascade test case for Scale9Sprite 2015-10-09 21:01:49 +08:00
pandamicro 87677cdbd1 Merge pull request #14088 from chengstory/Fix#23321 
Fix Bug #23321
 2015-10-09 15:27:56 +08:00
Liam 68f25f65c4 update submodule 2015-10-08 14:59:48 +08:00