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

172 Commits

Author SHA1 Message Date
minggo 3f60d1d886 remove code ide related codes in tempaltes 2016-07-08 17:17:23 +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
子龙山人 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
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 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08: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 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
zilongshanren b879dce607 add audio SimpleAudioEngine.h search path back 2016-03-28 14:35:59 +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
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +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 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
Dirk de la Hunt 88bcaad518 General fixes: 
- changed some delete operations to be deletions of arrays where applicable
 - changed some "free" operations to "delete" where memory was allocated with "new"

CCPUScriptCompiler.cpp:
 - added checks to see if temp1 and temp2 are non-null before dereferencing them

FileServer.cpp:
 - changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
   is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
 2015-10-16 21:43:09 +02: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
zhangbin 38edfea28a Solve the error effect of lua portrait project created from template. 2015-08-14 17:20:21 +08:00
子龙山人 675d5efb39 Merge pull request #13151 from flashjay/patch-2 
Update AppController.h
 2015-08-12 13:43:39 +08:00
zhangbin 9fd88d6587 Optimize the lua & js templates. 
The changes are used for generating templates of Cocos Framework.
 2015-08-05 16:51:33 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
HuaYang Huang abbf7eabfc Update AppController.h 2015-08-01 17:49:12 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00
Wenhai Lin 70628c9dec Fixed link errors on iOS/Mac 2015-07-29 13:59:58 +08:00
zhangbin 4d46a03797 Solve the error : the VS release configuration of lua template cause `cocos run` error. 2015-07-28 14:54:42 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
Wenhai Lin 45e0eda81c Fixed compile error 2015-07-17 11:34:26 +08:00
andyque 451bedbaad change sign team to none. 2015-07-07 22:02:35 +08:00
andyque 04ade7c16e remove xcode scheme 2015-07-07 14:57:25 +08:00
andyque 302976b603 add shared scheme to iOS & Mac project. 2015-07-07 14:24:17 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
Bin Zhang 01cb135e77 Solve the error in the VS project of templates. 2015-06-17 18:06:09 +08:00
tangziwen b84531ea04 add librecast to js and lua templates 2015-06-17 13:39:28 +08:00
pandamicro f3765a4c5f Fix physics 3d macro include issue 2015-06-12 15:58:43 +08:00
andyque a6649e24fe fix resource not copy issue on windows 2015-06-01 18:59:27 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +08:00