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

522 Commits

Author SHA1 Message Date
James Chen b191318e15 Auto hide home indicator for iPhoneX. () 2017-11-27 17:08:34 +08:00
minggo dacd8e664f
fix issue that can not generate archieve file with Xcode9 () 2017-11-24 10:38:41 +08:00
Mozart Louis bb479e4f6d Android Studio 3.0 + Switching to libc++ (c++_static) + Simplify PROP_* values + Adding default Proguard Config for cocos () 
* Updated android build process to use c++_static

* Comment out org.gradle.jvmargs

* Updated all project in test directory

* Update C++ Template

* Update js and lua projects

* Update Proguard + Lower minSdkVersion to 14

* Added All PROP_* values + updated build.gradle

* Updated versions
 2017-11-23 09:08:50 +08:00
James Chen 69e5a056e6 Uses Images.xcassets instead of several icon png files. () 
* Uses Images.xcassets instead of several icon png files.

* Renames AppIcon.

* Sets AppIcon from Images.xcassets

* Uses Images.xcassets instead of several icon png files for template projects.

* Modify permission to 644
 2017-11-21 15:31:29 +08:00
minggo cfaa77be28
Update spine () 2017-11-02 09:06:13 +08:00
minggo 496de07633 don't have to set NDK_MODULE_PATH manually 2017-10-26 13:40:27 +08:00
minggo b275a3e2f0 fix conflict 2017-09-20 09:11:35 +08:00
James Chen 0c5ba220b1 Supports full screen for iPhone X and uses Storyboard for launch screen. () 
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-empty-tests done.

* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-tests, js-tests, lua-empty-test, lua-tests done.

* Removes unused UILaunchImages for test projects.

* Removes unused UILaunchImages for template projects.

* Adds LaunchScreen.storyboard / LaunchScreenBackground for template projects.

* Fixes lua template.
 2017-09-19 15:01:19 +08:00
minggo 186e05f7c5 adjust z order () 2017-09-18 17:18:20 +08:00
James Chen a73d5893b4 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. () 
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.

* Update AppActivity.java

* Update AppActivity.java
 2017-09-18 15:12:30 +08:00
minggo c4042c220b [ci skip]fix issue that can not change position style, can not add new emitter () 2017-09-15 10:49:04 +08:00
minggo 19962a3b59 [ci skip]don't clean layer when switch to another layer () 2017-09-14 17:42:56 +08:00
minggo 36f7f3c37e Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316 2017-09-13 11:18:39 +08:00
James Chen ec83cc99cc [ci skip] [lua-tests] fix wrong position of 'save' button in renderTextureTest. () 2017-09-08 16:42:12 +08:00
James Chen 5cf8db85d4 Fixes crash of lua particle test while building lua-tests in release mode. () 2017-09-06 15:06:21 +08:00
James Chen 30266b4ddd [ci skip]Fixes crash of lua particle test while building lua-tests in release mode. () 2017-09-06 15:05:47 +08:00
James Chen afe7ddcad3 Updates EventDispatcherTest for js-tests and lua-tests. () 
Fixes http://punchbox.info:3000/issues/26293
Uses removeFromParent(false) for not cleaning up EventListener associated with node.
 2017-09-06 15:05:03 +08:00
minggo c89e35e22a Merge pull request from cocos2d/v3.16 
V3.16
 2017-09-06 14:59:36 +08:00
minggo 15b43659c2 update to use Android Studio 2.3.3 () 2017-09-01 17:46:26 +08:00
minggo 4a0b9b1fd3 [ci skip]remove tizen projects () 2017-08-28 14:33:01 +08:00
Valera 03635ecc4a Improved Cocos2dxLuaLoader.cpp () 
* Improved Cocos2dxLuaLoader.cpp

* Added testcase for new LuaLoader
 2017-08-25 09:32:02 +08:00
jett_yu d11674fd9c [ci skip]implementation conversion lua table to ObjC Dictionary () 2017-08-24 14:17:21 +08:00
minggo 8fcf0d7fd9 fix gradle setting () 2017-06-05 11:35:48 +08:00
minggo ee84d9f12e update v3.15 2017-04-14 13:45:32 +08:00
James Chen e5e87311b6 [lua-tests] Check the validity of label instance before setString. () 
* [lua-tests] Check the validity of label instance before setString.
fixed http://punchbox.info:3000/issues/26233

* Minor fix: Adds missing test case in NewAudioEngineTest.
 2017-04-10 10:14:06 +08:00
minggo 513092bd88 fix error () 2017-04-06 16:18:28 +08:00
minggo 8a587a3681 [ci skip]fix some error for Android Studio project () 
* use '/' for path separator on windows

* enable short commands
it is useful on windows because windows has length limitation of commands
 2017-04-06 15:41:38 +08:00
minggo 9ed5127edc synchronize v3.15 2017-04-01 17:16:45 +08:00
minggo d2a5c194cc adjust position () 2017-03-31 10:20:08 +08:00
minggo b6d42e0b42 fix error effect () 2017-03-29 17:20:01 +08:00
minggo 9d81f16bc5 [ci skip]make android studio work for release mode () 
* release mode of lua test case work with Android Studio

* add missing file

* fix error for debug mode

* make android studio work
 2017-03-29 15:56:46 +08:00
minggo c5140f7af2 remove unneeded test case () 2017-03-29 14:24:11 +08:00
minggo c8af3fe0bd fix crash in release mode () 2017-03-27 15:19:24 +08:00
minggo db837ebdae remove unneeded test cases and fix parameter length limitation on windows 
* delete unnneded test case on windows

* delete unneeded test cases

* avoid parameter length limit when building android on windows

* adjust project setting to delete unneeded test cases

* remove unneeded test cases for windows10

* remove unneeded test cases for tizen

* remove unnedded test case for android
 2017-03-22 13:43:12 +08:00
James Chen 3bd09ae286 [win32] Fixes cpp-tests/FileUtilsTest crash. () 2017-03-22 11:17:52 +08:00
mogemimi f90691eb63 Fix spelling: billborad -> billboard () 2017-03-22 09:21:34 +08:00
rh101 f8eccb9608 Added VS2017 support in project files () 
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h

* Added support for VS2017 in project files.
 2017-03-20 09:36:07 +08:00
minggo ebdae8c2da use different separator on different platforms and make path length short () 2017-03-17 11:54:36 +08:00
mogemimi 8be22ce55c Fix typos in comments and strings () 2017-03-17 10:44:38 +08:00
Bin Zhang 010a724149 Solve the error when building Android Studio project. () 2017-03-15 15:45:50 +08:00
minggo 7d3b9de866 update gradle version and build tool version () 2017-03-14 18:13:47 +08:00
Bin Zhang 769f7830f0 Improve the AndroidStudio configurations of tests & templates () 
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.

* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
 2017-03-14 13:41:28 +08:00
James Chen b04fcbcd30 fix the broken of lua-tests after PR was merged. () 
repeat is a keyword in lua.
 2017-03-07 10:14:55 +08:00
mogemimi e293520057 Fix some local variable names in tests () 2017-03-06 10:01:53 +08:00
mogemimi cfbbc65c71 Fix various typos in comments and strings () 2017-02-27 11:12:29 +08:00
mogemimi 454fd8518b Fix minor typos in tests () 2017-02-24 12:45:41 +08:00
mogemimi 48cbc890c6 Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` () 2017-02-23 17:05:08 +08:00
minggo 5ae8a95c6f [ci skip]make all tests and template support Android Studio () 
* make all tests and template support Android Studio

* use grable 2.2.3
 2017-02-21 17:58:30 +08:00
James Chen 619e012d9b [WebSocket] Adds support for getting url and server selected protocol () 
* [WebSocket] Adds support for getting url and server selected protocol

* Adds const keyword for getter methods, and make LOGE also works in release mode.
 2017-02-20 09:44:20 +08:00
CocosRobot d07794052f Update license to 2017 () 
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
 2017-02-14 14:36:57 +08:00