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

1433 Commits

Author SHA1 Message Date
CocosRobot 0fbc404cd9 [AUTO][ci skip]: updating cocos2dx_files.json (#16403) 2016-08-22 09:38:51 +08:00
minggo 2c37be5d86 fix lua tempate error (#16377) 2016-08-17 16:09:48 +08:00
CocosRobot 9019d7f2c4 [AUTO][ci skip]: updating cocos2dx_files.json (#16374) 2016-08-17 13:59:55 +08:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 (#16371) 
* use java reflection to avoid API level dependent, use app-abi 10

* add license header
 2016-08-17 13:55:26 +08:00
CocosRobot c03f6468fc [AUTO][ci skip]: updating cocos2dx_files.json (#16368) 2016-08-15 17:27:05 +08:00
minggo 1cb506a5c5 fix compiling error if building for Android Studio (#16317) 2016-08-05 14:03:35 +08:00
QingliWang bbfd2d334c Some bug-fix and quality assurance for Tizen support. (#16281) 
* Support audio interruption and resume callback when change earphone status.

* Refactor keyevent callback and add makecurrent for compatible with different binary.

* Enable Tizen indicator.

* Remove the unnecessary evasobject in the window and refactor the function for glview mode.

* Fix the compatible issue between Tizen 2.3 and 2.4.

* Fix the wrong directory of script resources for HellLua template project.

* Create performance-test project for Tizen platform.
 2016-07-31 22:32:59 +08:00
CocosRobot dea3a83efc [AUTO][ci skip]: updating cocos2dx_files.json (#16272) 2016-07-29 17:39:32 +08:00
minggo 7131451f1b change to use api 19 (#16248) 
* change to use api 19

* update deps version
 2016-07-29 13:57:01 +08:00
CocosRobot fbf74a49d5 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-29 01:38:42 +00:00
minggo ddc5a90686 Merge pull request #16247 from minggo/js-template 
[ci skip]fix JS template
 2016-07-28 15:55:03 +08:00
minggo fc36ce3c92 copy script 2016-07-28 10:40:08 +08:00
CocosRobot 9096e19ec7 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-28 01:59:39 +00:00
Vladimir Perminov 09aa7d9cf4 Win32 move unicode utils global. (#16234) 
* Win32 move unicode utils global.

It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.

* Move to CCUtils-win32

Also in WinRT version.

* Copyright
 2016-07-28 09:57:29 +08:00
minggo b74900fe70 fix js template 2016-07-27 16:57:03 +08:00
minggo 67ec4521e5 explicitly set app-abi to armeabi 2016-07-27 10:10:09 +08:00
CocosRobot 588ac1c70d [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-25 09:33:45 +00:00
minggo 358f247700 remove unneeded flag 2016-07-22 09:42:08 +08:00
minggo a97906a280 Merge pull request #16184 from minggo/issue-16161 
Issue 16161
 2016-07-22 13:51:54 +08:00
minggo 5f2c1df448 use android 21 to fix compiling error 2016-07-22 10:53:56 +08:00
CocosRobot 235e65b835 [AUTO][ci skip]: updating cocos2dx_files.json (#16174) 2016-07-21 10:09:27 +08:00
CocosRobot 9c35dedb75 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-18 06:17:04 +00:00
Bojan Matić 727138b800 Fix browserVersion detection 
Due to typo, the code meant for browser versions below 6.2 would
never run.
 2016-07-14 08:24:12 +02:00
CocosRobot eea229c101 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-13 04:38:56 +00:00
zhangbin f4accbdf3e Solve the error in command gen-templates & gen-simulator. 2016-07-13 09:42:05 +08:00
zhangbin 4408f28480 Solve the error in simulator project. 
Remove unused files.
 2016-07-12 17:33:43 +08:00
CocosRobot ca28b5b603 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-11 04:04:47 +00:00
minggo d4bd1d0c9a fix conflict 2016-07-08 18:15:57 +08:00
minggo 826b142096 remove ide-support in framework project 2016-07-08 18:07:57 +08:00
minggo 3f60d1d886 remove code ide related codes in tempaltes 2016-07-08 17:17:23 +08:00
minggo 734d857ced Merge branch 'v3.12' into merge-v312 2016-07-07 15:13:21 +08:00
pandamicro d99a8f0f84 Made css style inline 2016-07-06 19:42:27 +08:00
pandamicro 96155a670f Improve web template and update web ref 2016-07-06 13:54:55 +08:00
Ricardo Quesada afe36e4a00 feat: upgrades to GLFW v3.2 
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script

fixes github issue #11748

uses WINAPI instead of APIENTRY

it seems that it is being redefined somewhere... but I couldn't find
exactly where
 2016-06-29 16:11:30 -07:00
minggo 076e0b488b Merge pull request #15980 from minggo/merge-v312 
Merge v312
 2016-06-29 09:41:30 +08:00
CocosRobot 2fbf3c9940 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-29 01:01:21 +00:00
pandamicro 6e54080e83 Fix style issue in html page 2016-06-28 21:59:37 +08:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +08:00
pandamicro 683a4bfec6 Fix tests for v3.12 web 2016-06-22 17:39:38 +08:00
CocosRobot 1c8ab4f504 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-20 05:41:22 +00:00
CocosRobot eee0d14e8f [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-17 02:17:23 +00:00
CocosRobot 134a09da6f [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-16 07:51:35 +00:00
CocosRobot 600175a93c [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-16 03:10:20 +00:00
minggo 925e938724 Merge pull request #15839 from Shulepov/refactor_and_cleanup_RootViewController 
Cleanup and refactor RootViewController
 2016-06-15 14:17:05 +08:00
CocosRobot 77e71fa638 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-15 02:45:36 +00:00
子龙山人 51f4deee01 Add system label overflow (#15827) 
* Add system font overflow

1. currently only iOS, Mac and Android platform are supported

add mac label overflow shrink

modify system font overflow test

fix warning and possible memory leaks

add ios system label overflow support

add iOS system font overflow support

fix iOS system font overflow

fix Mac System font overflow

add android system font clamp

add Android system font shrink

cleanup iOS shrink related code

fix Android system font clamp

add core text to project template

fix iOS tests project

fix mac and iOS shrink

improve iOS and Mac clamp feature

fix header file include path

* modify the comments, make it more clearer
 2016-06-15 10:43:15 +08:00
Mikhail Shulepov 2cd7850427 Cleanup and refactor RootViewController 2016-06-14 19:55:31 +03:00
AlwynC 70000bcc84 Refine cpp template for iOS (#15792) 
* Modified the layer follow action class to include a horizontal (x) and vertical (y) offset on the screen from which the node is to be followed.

* Added offsetX and offsetY parameters in Follow::clone() method.

* Added test case for follow action with offset.

* Made changes to the test case on follow action with offset.

* Added new createWithOffset function to create a follow action with offset.

* Modified the test case for followWithoffset to use the newly added createWithOffsets function for follow action.

* Refined the code for creating follow action with offsets.

* Modified test case for follow with offset as per updated create method.

* Code refined in createWithOffset method of follow action.

* Refined AppController.mm,RootViewController.mm and HelloWorldScene.cpp to load the cocos2d-x scene more effectively.Also included the procedure to dismiss the game scene and navigate back to iOS screen.
 2016-06-08 10:55:02 +08:00
Shulepov 21ab86b5fe iOS: ARC support #12518 (#13937) 
* iOS: ARC support #12518

* Use @autoreleasepool with and without ARC

* Missed release for _viewController
 2016-06-06 13:48:02 +08:00
CocosRobot 6a2f417498 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-30 09:23:17 +00:00