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

11527 Commits

Author SHA1 Message Date
samuele3hu 70fcf47a3e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-26 21:39:34 +08:00
James Chen 2bfccb4a43 A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType 2013-07-26 21:36:32 +08:00
James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 
Conflicts:
	scripting/javascript/bindings/generated
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 21:22:16 +08:00
James Chen fe3f953493 Merge pull request #3278 from CocosRobot/updategeneratedsubmodule_1374842827 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-26 05:53:04 -07:00
James Chen f144df7f45 Update AUTHORS [ci skip] 2013-07-26 20:49:59 +08:00
James Chen 6c2e6e8cb0 Merge pull request #3253 from metalbass/patch-3 
Added virtual destructors to some interfaces to fix issue 3095
 2013-07-26 05:47:35 -07:00
CocosRobot e9b32f1f0c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-26 12:47:22 +00:00
James Chen a73a4b9837 Merge pull request #3276 from dumganhar/constants-refactor 
Enumeration refactoring
 2013-07-26 05:36:16 -07:00
James Chen 0dce6d9cf3 Merge pull request #3227 from azmeuk/file-utils 
Added some guards in file utils
 2013-07-26 05:31:02 -07:00
James Chen c9def73930 Application::Platform::OS_MACOS --> Application::Platform::OS_MAC. 2013-07-26 20:24:33 +08:00
Éloi Rivard 95b826d82a Fixed a bug in emscripten file utils. 2013-07-26 14:19:47 +02:00
Éloi Rivard 3ffc026c6c Added some guards in file utils. 2013-07-26 14:19:20 +02:00
James Chen 9b6d3e6090 ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT 2013-07-26 20:07:41 +08:00
James Chen 0ae5ea334f Merge pull request #3277 from CocosRobot/updategeneratedsubmodule_1374834840 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-26 05:00:49 -07:00
James Chen 49c727e122 Updating LuaCocos2d.cpp 2013-07-26 19:57:22 +08:00
James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 19:56:04 +08:00
James Chen 7d9d799194 issue #2430: Fixing a typo. 2013-07-26 19:54:44 +08:00
CocosRobot 9fb6d032ca [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-26 10:34:03 +00:00
James Chen 1122432f80 Merge pull request #3268 from samuele3hu/deprectedOperator 
issue #2404:replace deprecated functions in testlua and hellolua sample
 2013-07-26 03:27:09 -07:00
James Chen e16a5f469b issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
James Chen 2f8d3587bd Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk. 2013-07-26 18:17:30 +08:00
minggo 3cb40b36e4 issue #2430:fix some errors 2013-07-26 18:07:40 +08:00
minggo 859da78499 Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum 2013-07-26 17:47:52 +08:00
minggo 7817dd6c0f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-26 17:45:24 +08:00
minggo a7c1904eb8 issue #2430:move EditBox enum into class 2013-07-26 17:45:01 +08:00
boyu0 02bdfbf169 Combine CCTextureETC to CCImage and CCTexture2D. 2013-07-26 17:34:44 +08:00
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
James Chen 54ab99bf74 enum class for ProgressTimer::type 2013-07-26 17:28:18 +08:00
James Chen 6ff6aa20b1 Merge pull request #3271 from natural-law/develop 
Update class ProtocolAds to compatible with more Ads SDKs.
 2013-07-26 02:23:48 -07:00
Thomas Perl 2f35353020 Qt 5 port: Fixes to build against "develop" branch 
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
 2013-07-26 08:55:46 +00:00
minggo 0b3ed85914 issue #2430:fix some compiling error 2013-07-26 16:43:40 +08:00
zhangbin f847bf4757 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-26 16:11:11 +08:00
zhangbin 4ea5d0509f Update the JS binding for the change of class ProtocolAds. 2013-07-26 16:07:30 +08:00
minggo bafc01c2aa issue 2430:fix a compiling error and add missing cpp 2013-07-26 15:55:12 +08:00
zhangbin bbe649812a Update class ProtocolAds to compatible with more Ads SDKs. 2013-07-26 15:51:06 +08:00
metalbass 5183803784 Removed delete from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SAFE macros 
This implements this issue: https://github.com/cocos2d/cocos2d-x/issues/3099

I've also change all pointer assignments to 0 to assignments to nullptr on the CC_SAFE macros.
Also aligned them for better readability :)
 2013-07-26 09:33:40 +02:00
minggo 0870581623 fix warnings 2013-07-26 15:22:45 +08:00
samuele3hu 6b9c7d4ade issue #2404:modify a function name to isSwallowsTouches() 2013-07-26 15:21:19 +08:00
samuele3hu fae8e253c0 issue #2404:Modify tab to spaces 2013-07-26 15:06:35 +08:00
samuele3hu b6256be1ad issue #2404:del a deprecated func 2013-07-26 15:01:31 +08:00
minggo f55d73194e issue 2430:use enum class for Control enum values 2013-07-26 14:37:26 +08:00
samuele3hu 0f8d10f9a7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator 2013-07-26 14:36:50 +08:00
samuele3hu 273bdc8fbd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator 2013-07-26 14:35:40 +08:00
James Chen ea3858fdf2 Merge pull request #3267 from CocosRobot/updategeneratedsubmodule_1374820049 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-25 23:30:14 -07:00
CocosRobot 97f17913a6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-26 06:27:41 +00:00
James Chen 7839f769f2 Merge pull request #3265 from dumganhar/constants_fixes 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
 2013-07-25 23:21:29 -07:00
James Chen 00c2173009 Warning fix in CocosDenshion.vcxproj 2013-07-26 14:16:26 +08:00
James Chen 6c00a51517 RELATIVE was defined on windows, un-define it. 2013-07-26 14:16:12 +08:00
James Chen 2abd61b967 Warning fix in CCRenderTexture.h. 2013-07-26 14:15:19 +08:00
James Chen 9ae7bd33e2 typedef enum Director::Projection ccDirectorProjection; can't work on Windows, since Director::Projection is already a type, no need to add enum. 2013-07-26 14:14:55 +08:00