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

114 Commits

Author SHA1 Message Date
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
pandamicro e6d4beef8a Merge pull request #15388 from pandamicro/v3 
Issue fixes and update engine version
 2016-04-07 23:15:39 +08:00
pandamicro 1ada222c36 Fix some issues 
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
 2016-04-07 22:40:32 +08:00
zilongshanren 6e3d69dded Merge pull request #15336 from cocos2d/v3.10 
V3.10
 2016-03-29 11:23:11 +08:00
zilongshanren b879dce607 add audio SimpleAudioEngine.h search path back 2016-03-28 14:35:59 +08:00
minggo 488930119d fix compiling error in new JSB project 2016-03-28 10:37:35 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
Xpol Wan d6b2f08b30 The CC_TARGET_OS_* in xcodeproj are now not needed. 2016-03-16 13:20:53 +08:00
zilongshanren af5c5ae1e8 Merge pull request #14777 from raksa/v3.10 
prevent recompile when run Android app on Android Studio to device or Emulator.
 2016-03-11 09:34:59 +08:00
Vladimir Perminov 2a201a5c4e WinRT support key repeat and implement dispatchControlKey 2016-03-07 14:43:44 +03:00
zilongshanren 7467611daf Merge pull request #14810 from GuoLunHao/v3.10_templates 
fix compile error in visual studio 2015
 2015-12-30 11:39:00 +08:00
lunhao.guo d3387f5ab2 change the resolution size of js template to (960 * 640) ,consistent with other templates 2015-12-29 15:24:21 +08:00
lunhao.guo d216785f43 fix compile error in visual studio 2015 2015-12-29 15:02:22 +08:00
raksa 9b5b87b505 reprepare assets on rebuild 2015-12-22 13:56:21 +07:00
Dale Stammen 908d872a0e updated winrt template files with typo fixes 2015-12-09 17:33:50 -08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
pandamicro e7dca08df9 Add js test case for fix, improve template 2015-12-03 16:55:15 +08:00
pandamicro a6fdd9aa09 Improve js template documentation 2015-11-24 16:31:14 +08:00
yinjimmy 7f10d6d894 Template: keep compatibility 2015-11-04 18:26:59 +08:00
yinjimmy 517567c56c Template : fix link libraries 
1. GameController.framework in JS template
2. CFNetwork.framework in Lua template
 2015-11-04 12:19:29 +08:00
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
pandamicro 65fafef044 Merge pull request #14209 from pandamicro/v3 
Disable bitcode for all targets
 2015-10-22 12:55:25 +08:00
pandamicro 4633a93631 Disable bitcode for all targets 2015-10-22 12:18:51 +08:00
pandamicro 316d37ad51 Merge pull request #14130 from jimrange/iconSplash 
Fixed issues with the iOS icons and splash screens.
 2015-10-22 12:17:02 +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
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 f9d8907697 updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
Dale Stammen fdebb373b1 updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5 2015-10-16 15:36:34 -07:00
Vincent Yang fa6e6f8074 Fix js-template-default compile error. 2015-09-21 19:28:16 +08:00
pandamicro 07edc1f81d Merge pull request #13948 from pandamicro/v3 
[ci skip] Update web reference
 2015-09-19 00:27:46 +08:00
pandamicro 6a975fe641 Merge pull request #13599 from perminovVS/winrt-mouse-support 
WinRT support mouse
 2015-09-18 17:26:15 +08:00
pandamicro fa1e2ce3c4 Update web reference 
Set js templates mac target to 10.8
 2015-09-18 15:58:00 +08:00
Vladimir Perminov 583e780e29 Correct all templates 2015-09-17 22:09:41 +03:00
pandamicro 78c07c1c54 Set js templates Mac target platform from null to 10.7 2015-09-17 23:10:23 +08:00
pandamicro 737dc5ba8d Fix build_native for js default template 2015-09-14 11:18:32 +08:00
zhangbin 4996fe5c1b Solve the error in templates. 
When creating project from template, the app name of android-studio project is not changed.
 2015-09-09 16:08:15 +08:00
WenhaiLin be60f7f65c [ci skip]js-template-default:Fixed the path of link resources. 2015-09-02 13:48:57 +08:00
Dale Stammen c47de9d04f make new render surface current after device lost 2015-08-20 13:26:03 -07:00
pandamicro 31bc04a301 Merge pull request #13455 from MSOpenTech/v3-win10 
Windows 10 UWP and WP8.1 app certification fixes
 2015-08-19 13:36:29 +08:00
pandamicro 6d0422bcc3 Merge pull request #13448 from VisualSJ/v3.8-webIndex 
[ci skip] Set the transparency will affect the labelTTF
 2015-08-19 11:41:58 +08:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
WenhaiLin 5cdfdf8497 [ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0 2015-08-18 22:37:00 +08:00
VisualSj 4d9a61569a Set the transparency will affect the labelTTF 2015-08-18 18:30:03 +08:00
pandamicro 2d1fcecfa5 Add default viewport meta to js templates 2015-08-17 18:56:10 +08:00
andyque 9a83ed9b28 remove unneeded protocol in AppController.h. 2015-08-12 13:55:36 +08:00
pandamicro a89a3c0c56 Merge pull request #13184 from pandamicro/v3.7.1 
[ci skip]Add remote debugger support in JS templates
 2015-08-04 11:18:18 +08:00
pandamicro 06bd3b8868 Add remote debugger support in JS templates 2015-08-04 11:16:58 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00