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

1384 Commits

Author SHA1 Message Date
CocosRobot 6a2f417498 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-30 09:23:17 +00:00
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3 
Support cc.view.setOrientation on web
 2016-05-27 14:26:50 +08:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
BQ 93ed59bfb3 English grammar corrections. 2016-05-25 15:25:38 +01:00
BQ 6097c3abd1 English grammar corrections. 
Make brackets consistent.
 2016-05-25 15:18:57 +01:00
minggo 5019dc7878 don't strip png text 2016-05-24 10:06:28 +08:00
minggo ecf181036a remove unneeded files 2016-05-18 16:44:06 +08:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
CocosRobot 530d890c6c [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-10 02:41:22 +00:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
CocosRobot 2184600565 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-04 01:24:01 +00:00
zilongshanren c8d570c310 fix tizen template api-version issue 2016-05-03 11:22:34 +08:00
zilongshanren 675fe8e811 fix template project running 2016-05-03 11:02:22 +08:00
zilongshanren b2b774b66b fix tizen lua template 2016-04-29 17:59:10 +08:00
zilongshanren 915ea19e2e fix tizen cpp template settings 2016-04-29 17:28:38 +08:00
Dale Stammen 8f37130569 added missing winrt template code for inplace EditBox 2016-04-28 08:37:55 -07:00
CocosRobot 011523cb56 [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-28 01:52:35 +00:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
Josh Bodily 614c3c47d7 Josh/winrt inplace editbox (#15473) 
* WinRT in-place edit box

* Fix static analysis errors
 2016-04-25 11:17:09 +08:00
minggo 7ccd05548e Merge pull request #13936 from Shulepov/app_controller_synthesize_window 
AppController: synthesize window #13285
 2016-04-21 15:02:07 +08:00
mogemimi 85646b8d80 Fix warning C4305 while compiling AppDelegate with MSVC 2016-04-20 04:01:06 +09:00
Dale Stammen 4d7bf1f827 updated expiration dates of all winrt test app and template certificates 2016-04-19 09:07:30 -07:00
minggo 9c40277e48 Merge pull request #14980 from catinred2/dev 
fix typo
 2016-04-18 17:21:40 +08:00
CocosRobot 121e784484 [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-18 07:48:59 +00:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
CocosRobot f136e9d94e [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-18 01:43:40 +00:00
CocosRobot d1ced49baa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-14 01:57:22 +00:00
minggo 61a83aca2e Merge pull request #15407 from minggo/sync-to-v3.11 
Sync to v3.11
 2016-04-11 12:53:52 +08:00
pandamicro f9f9551645 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-11 11:11:34 +08:00
CocosRobot 02e3fca1fa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-11 01:39:26 +00: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 1eacab01fb fix windows platform simpleaudioengine include 2016-03-28 20:15:06 +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
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
CocosRobot 970d5f09ff [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-22 12:55:27 +00:00
zilongshanren 8eb683310d Merge pull request #15295 from CocosRobot/update_cocosfiles_1458635195 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-22 19:52:22 +08:00
CocosRobot c7cbe2dda3 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-22 08:26:39 +00: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
CocosRobot 8f6da161d1 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-04 20:56:11 +00:00
Ricardo Quesada 21cd5d08f7 Merge pull request #15177 from ricardoquesada/cmake_fixes 
"cocos new" fixes for cmake
 2016-03-04 12:38:13 -08:00
CocosRobot 836a6ffa42 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-04 03:45:48 +00:00
Ricardo Quesada 5b3942fcbb "cocos new" fixes for cmake 
cmake for mac compiles. doesn't link since it needs iconv.
 2016-03-03 19:21:30 -08:00