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

25504 Commits

Author SHA1 Message Date
Mircea Rila a643f05330 add touch callback types 2014-11-11 18:00:34 +02:00
Vladimir Timofeev 77ab866090 Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications. 2014-11-11 10:30:48 +03:00
Vladimir Timofeev 72e59a53a8 cmake: Build application bundles on Mac for test applications (this allow run they from Xcode) 2014-11-11 10:30:48 +03:00
Vladimir Timofeev 8910b962a0 cmake: 
- fix Audio engine build on Mac
- remove duplicated defintions of _EXPORT_DLL_
 2014-11-11 10:30:48 +03:00
Vladimir Timofeev dba8ef33bd cmake: connect mac specific UIEditBox implementation to build 2014-11-11 10:30:48 +03:00
Vladimir Timofeev 0059c93757 cmake: protobuf should be linked with cocos2d.a in every platform (not only on linux) 2014-11-11 10:30:48 +03:00
Vladimir Timofeev e3e3de2d87 Remove unused variable from composed include_directories 2014-11-11 10:30:48 +03:00
minggo 6c67c6921d Merge pull request #8977 from pipu/v3_Modify_TextReader 
Modify that parsing attribute "fontName" of TextReader
 2014-11-11 12:05:49 +08:00
Ricardo Quesada 7417d59447 Merge pull request #9078 from ricardoquesada/releasing_fixes 
fixes for releasing
 2014-11-10 19:30:08 -08:00
Ricardo Quesada 9da8188012 fixes for releasing 2014-11-10 19:29:44 -08:00
Ricardo Quesada 377af3b447 Merge pull request #9076 from ricardoquesada/android_build_fix 
fixes how to check for CPU in android-build
 2014-11-10 16:09:00 -08:00
Ricardo Quesada 4d2752e84f fixes how to check for CPU in android-build 2014-11-10 16:08:12 -08:00
minggo 8e3590978d Merge pull request #9072 from andyque/fixCompileError 
fix compile error
 2014-11-10 16:03:21 +08:00
andyque 16d0419136 fix compile error 2014-11-10 16:02:06 +08:00
Christopher O'Connell 5d26bc045c Fixed failure in call to make when the android app folder contains spaces in the path. 2014-11-10 00:38:32 -07:00
Christopher cd24f91014 Merge pull request #1 from cocos2d/v3 
Updates
 2014-11-10 00:26:02 -07:00
minggo 23430c0190 Merge pull request #9069 from CocosRobot/update_lua_bindings_1415547046 
[AUTO]: updating luabinding automatically
 2014-11-10 14:39:30 +08:00
yangxiao 6ecb9a7b04 fix #9031 2014-11-10 12:48:42 +08:00
CocosRobot a908c391b0 [AUTO]: updating luabinding automatically 2014-11-09 15:33:08 +00:00
minggo 6ac6e07a4d [ci skip] Update CHANGELOG 2014-11-09 23:30:39 +08:00
minggo 8476956ef9 Merge pull request #9057 from andyque/fixScale9FlipIssueNew 
fix scale9sprite flip issue
 2014-11-09 23:27:40 +08:00
minggo d2fd1a1152 [ci skip]Update Authors 2014-11-09 23:27:13 +08:00
minggo e7d5e79e88 Merge pull request #8998 from aeonmine/v3 
fix memory leak cocos studiov2.0 engine v3.3
 2014-11-09 23:24:16 +08:00
minggo 0bbb9e9368 Merge pull request #9056 from CocosRobot/update_lua_bindings_1415327766 
[AUTO]: updating luabinding automatically
 2014-11-09 23:19:53 +08:00
minggo c1d25e18ce Merge pull request #9055 from CocosRobot/update_cocosfiles_1415327684 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-09 23:19:28 +08:00
cpascal 74ba46f225 Fixed "warning: bundle reader out of range" 
This warning was displayed even if it's valid c3b file..
Changed "validLength <= needLength" to "validLength < needLength".
 2014-11-09 07:38:44 +09:00
joewanchen c4b1aeb0ec fix momery leak (partly fix, memory leak still exist). 2014-11-07 11:43:55 +08:00
andyque 8433127b45 finish tests 2014-11-07 11:11:51 +08:00
andyque 4bfa94b8c2 add button flip test 2014-11-07 11:11:51 +08:00
andyque 9c3c693a21 refactor Widget flip logic 2014-11-07 11:11:51 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
CocosRobot aae2fd9e2a [AUTO]: updating luabinding automatically 2014-11-07 02:38:01 +00:00
CocosRobot 80ce1537e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-07 02:34:46 +00:00
minggo db659107d3 Merge pull request #9052 from huangshiwu/v3_fixbug 
fix ui crash bug caused by DrawNode
 2014-11-07 10:33:08 +08:00
minggo 3b8ddf1b54 Merge pull request #9005 from joshuastray/add-resource-folder-def 
Update CCFileUtils-linux.cpp
 2014-11-07 10:25:14 +08:00
joewanchen b05f558214 fix compile error. 2014-11-07 10:14:07 +08:00
huangshiwu ace9933d72 fix ui crash bug caused by DrawNode 2014-11-07 10:05:29 +08:00
joewanchen b682438b68 revert some modifications. 2014-11-07 09:17:32 +08:00
joewanchen c2b97a3b13 fix sprite frame cache, and remove unnecessary headers dependencies. 
we should add private headers for ccs, do not expose privae headers to users.
 2014-11-07 09:13:59 +08:00
Ricardo Quesada 9558d97517 Merge pull request #9047 from ricardoquesada/releasing 
Adds releasing rules
 2014-11-06 14:44:21 -08:00
Ricardo Quesada 120e31f4fe Adds releasing rules 2014-11-06 14:43:45 -08:00
Ricardo Quesada 738deddd42 Update CONTRIBUTE.md 2014-11-06 14:30:00 -08:00
Ricardo Quesada 9e795777b3 Merge pull request #9042 from ricardoquesada/contribute 
How to contribute to cocos2d-x
 2014-11-06 14:17:07 -08:00
Ricardo Quesada 8926e115cd How to contribute to cocos2d-x 2014-11-06 14:16:39 -08:00
Ricardo Quesada f8b1915970 Merge pull request #9040 from ricardoquesada/warnings_fixes 
fixes some compiler warnings
 2014-11-06 12:26:30 -08:00
Ricardo Quesada 3d448e86ef fixes some compiler warnings 
don't call deprecated functions
 2014-11-06 12:25:55 -08:00
G17hao c7f5c3052d Update CCBone.cpp 
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
 2014-11-06 17:51:19 +08:00
samuele3hu e2474e1f96 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-11-06 14:38:55 +08:00
samuele3hu 76ab86674e Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android 2014-11-06 14:32:03 +08:00
minggo 4911ae448d Merge pull request #9032 from cocoscodeide/v3 
runtime demo is ugly when screen orientation is portrait
 2014-11-06 11:59:53 +08:00