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

32955 Commits

Author SHA1 Message Date
pandamicro f2898ecf30 Merge pull request #14207 from super626/terrain 
fix shader on pc
 2015-10-22 10:10:10 +08:00
yangxiao cca25f5b5c fix shader on pc 2015-10-22 09:29:12 +08:00
pandamicro d3664b9616 #14128 Fix cc.loader.getRes crash caused by null type 2015-10-22 01:16:56 +08:00
Jim Range 5c93c56d80 Updated Lua and JavaScript iOS Info.plist, iOS splash screens and iOS icons. 2015-10-21 11:11:02 -05: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
dimon4eg 27d5ad920e Update comment 2015-10-21 16:55:45 +03:00
dimon4eg 7e43e28ca2 Fix crash in java code only 2015-10-21 16:55:25 +03:00
dimon4eg 82bcbb0325 Revert: Fix crash in web view on android 2015-10-21 16:54:41 +03:00
pandamicro 558ac3cfa0 Made CC_CONSTRUCTOR_ACCESS public only when script binding is enabled 2015-10-21 16:05:31 +08:00
mogemimi 4012dd8455 Fix naming typos 2015-10-21 15:56:47 +09:00
pandamicro d8baf75748 Merge pull request #14195 from liamcindy/v3.9_light 
fix light3D reader error
 2015-10-21 13:45:37 +08:00
pandamicro c318db94dd Merge pull request #14200 from MSOpenTech/v3-winrt-js 
V3: updated winrt temporary app certificates expiration dates
 2015-10-21 11:10:14 +08:00
pandamicro 6ca67c4963 Merge pull request #14203 from xiaofeng11/v3_39betaPrepaire 
Fix spell error
 2015-10-21 11:08:59 +08:00
XiaoFeng ae93112ec6 Fix spell error 2015-10-21 10:13:27 +08:00
Dale Stammen b0ba569285 updated package guids and app certificate 2015-10-20 16:26:17 -07:00
Dale Stammen 4b8cc00853 use correct name for pfx file 2015-10-20 10:48:01 -07:00
Dale Stammen d8e10981db added check to see if app is already visible 2015-10-20 10:38:42 -07: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
Dimon4eg 6581954b5b Merge pull request #1 from Dimon4eg/v3 
merge
 2015-10-20 12:48:16 +03:00
XiaoFeng 3d626940af Roll back debug commented code 2015-10-20 17:23:31 +08:00
pandamicro 7466c4c71e Merge pull request #14194 from super626/v3 
check light enable or not when switching shader
 2015-10-20 17:09:37 +08:00
pandamicro f40f3bf5a9 Merge pull request #14198 from xiaofeng11/v3_39betaPrepaire 
[ci skip]Update 3.9 beta0 change log & version info
 2015-10-20 17:08:55 +08:00
XiaoFeng 428db9c458 update js binding version info 2015-10-20 17:04:31 +08:00
XiaoFeng 18b7b533ce Update 3.9 beta0 change log & version info 2015-10-20 16:46: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 7443cf915d Merge pull request #14185 from mogemimi/fix-memory-leak 
Fix some memory leaks
 2015-10-20 15:56:39 +08:00
geron-cn be8a158bd7 fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio 2015-10-20 15:49:12 +08:00
Liam 7280a963b3 fix light3D reader error 2015-10-20 15:24:34 +08:00
pandamicro 8b5ba448cb Merge pull request #14193 from xiaofeng11/v3_39betaPrepaire 
Update authors for 3.9 beta version
 2015-10-20 15:23:12 +08:00
pandamicro 1144327003 Merge pull request #14186 from xiaofeng11/v3_xf 
Fix simulator run time only check screen direction flag, but won't check if size setting need swap
 2015-10-20 15:22:30 +08:00
yangxiao a4d67867d7 check light enable or not when switching shader 2015-10-20 15:11:39 +08:00
XiaoFeng 41c0add76f Update authors for 3.9 beta version 2015-10-20 14:20:50 +08:00
子龙山人 320de102bb Merge pull request #14191 from CocosRobot/update_lua_bindings_1445308648 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-20 10:44:16 +08:00
子龙山人 cc3a1380f9 Merge pull request #14190 from CocosRobot/update_cocosfiles_1445308559 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-10-20 10:43:57 +08:00
CocosRobot 6a0e1b323f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-20 02:42:17 +00:00
CocosRobot 518f800c75 [AUTO][ci skip]: updating cocos2dx_files.json 2015-10-20 02:36:00 +00:00
pandamicro dddf3e62e9 Merge pull request #14189 from chengstory/Fix#23433 
Fix #23433
 2015-10-20 10:34:16 +08:00
zhangcheng 8d22beeae4 Fix #23433 
Fix javascript project can't be opened directly in visual studio 2015.
 2015-10-20 10:17:50 +08:00
XiaoFeng 83a48ee501 Fix simulator run time only check screen direction flag, but won't check if size setting need swap 2015-10-19 19:43:10 +08:00
mogemimi c3194ac34d Fix memory leak in TMXLayer 2015-10-19 19:47:36 +09:00
mogemimi 34831d48ce Fix memory leak in GLViewImpl 2015-10-19 19:46:45 +09:00
pandamicro f4a2a53f6d Merge pull request #14184 from xiaofeng11/v3_xf 
Fix EventListenerCustom registered by UILabel never has been released bug
 2015-10-19 17:13:25 +08:00
XiaoFeng 762e25ad33 Remove unused parameter 2015-10-19 16:06:39 +08:00
XiaoFeng ffb2cfa9e0 Fix EventListenerCustom registered by UILabel never has been released bug 2015-10-19 14:07:50 +08:00
pandamicro 82881bf92f Merge pull request #14109 from loadrunner/label3 
Added line spacing/leading feature to Label
 2015-10-19 10:55:53 +08:00
pandamicro c57adeae4d Merge pull request #14183 from VisualSJ/v3-webIndex 
Update web index
 2015-10-19 10:25:35 +08:00
VisualSj c3eca0089e Update web index 2015-10-19 10:19:12 +08:00
pandamicro be45e0bc50 Merge pull request #14174 from noshbar/v3 
CPPCheck fixes, correct deallocation, array size.
 2015-10-19 10:05:01 +08:00