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

270 Commits

Author SHA1 Message Date
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
 2014-04-14 14:08:19 +08:00
James Chen 576d9d872c Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' 
in ConsoleTest.
 2014-04-11 20:07:54 +08:00
Huabing.Xu 7af4d558c6 remove kmMat4 in AffineTransform.cpp 2014-04-11 17:19:32 +08:00
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-11 11:18:13 +08:00
heliclei 157fce785c fix CCConsole linux crash 2014-04-10 18:31:28 +08:00
Huabing.Xu 07ac817a7c Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-10 10:52:15 +08:00
James Chen 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
James Chen 9d8d256bee issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
James Chen 43d6e1176a issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
James Chen 5b296a62e9 issue #4729: Moved deprecated classes to 'cocos/deprecated' folder 2014-04-10 00:36:41 +08:00
Huabing.Xu 504fa2aa60 remove kmMat4 interface in AffineTransform 2014-04-09 14:21:41 +08:00
shujunqiao 9391906738 modify const char* to std::string in CCConsole. 2014-04-08 18:20:06 +08:00
heliclei 4e1284bd45 closed #4533:fix console upload hang issue 2014-04-08 14:52:53 +08:00
mgcL a3a3fa0907 fix Value's memory leak 2014-04-05 18:55:55 +08:00
shujunqiao 411bb95025 add [director end] command's explain in CCConsole.cpp. 2014-03-28 13:50:06 +08:00
shujunqiao fb780f82da add [director end] command in CCConsole.cpp. 2014-03-28 13:40:24 +08:00
James Chen 21ba509a35 Merge pull request #5989 from dumganhar/iss4559-ios-64bit 
closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
 2014-03-26 15:27:57 +08:00
James Chen 691442d80d closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch) 2014-03-26 15:04:11 +08:00
minggo a374241f65 Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes 
Windows Phone 8,0 cocos2d-x 3.0  changes
 2014-03-26 13:58:46 +08:00
James Chen 7a8db8271f Merge pull request #5930 from andyque/Branch_issue4429 
closed #4429: Boolean value could not be written to specified plist file
 2014-03-26 11:46:56 +08:00
andyque b41879916c issue #4429, fixed Value to string precesion error 2014-03-24 12:03:25 +08:00
Dale Stammen 762433e8aa enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8 2014-03-22 06:12:04 -07:00
Dale Stammen a14728f184 added CC_PLATFORM_WINRT and WP8 2014-03-22 06:11:27 -07:00
Dale Stammen 347f91fcb6 Disabled console for wp8/winrt until networking code is added 2014-03-22 06:11:10 -07:00
Dale Stammen 6a4d459c77 Disabled console for wp8/winrt until networking code is added 2014-03-22 06:10:54 -07:00
andyque cf86fd619f fix lua bindings warnings 2014-03-20 16:48:12 +08:00
andyque f26ae8a019 remove unused params warnings 2014-03-20 16:34:42 +08:00
andyque e6645400a3 fix a paramers miss match 2014-03-20 14:54:09 +08:00
andyque ae3310bffb Merge branch 'develop' into fix_warnings 
Conflicts:
	cocos/base/CCConsole.cpp
	cocos/base/CCConsole.h
 2014-03-20 14:50:02 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
andyque bab53ef2bd add test for ios and mac 2014-03-19 16:47:57 +08:00
andyque cadbfbe9b1 add Bool Integer Float Double support to CCDictionary 2014-03-19 16:47:57 +08:00
heliclei fe1bc368ec refactor upload:encode file with base64, detach upload from main loop 2014-03-18 00:46:17 +08:00
heliclei 4657b28c2d refactor upload:encode file with base64, detach upload from main loop 2014-03-18 00:42:36 +08:00
chuanweizhang2013 295bf7f7f2 rename variable 2014-03-17 11:06:50 +08:00
chuanweizhang2013 9167d39959 space 2014-03-15 18:18:56 +08:00
chuanweizhang2013 0a9ec91d6c init Console variable 2014-03-15 18:13:29 +08:00
James Chen c033591e6a [win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte. 2014-03-15 01:05:04 +08:00
heliclei 600c661acb remove script support 2014-03-07 15:12:46 +08:00
heliclei 728d5f34de CCConsole: add script support 2014-03-05 00:07:30 +08:00
heliclei fe574616f3 fix console loop 2014-02-26 23:51:45 +08:00
heliclei 31a13a6262 remove unused function 2014-02-26 23:46:07 +08:00
heliclei 9d6be63171 CCConsole:support file upload via telnet console 2014-02-26 23:41:47 +08:00
heliclei 1dc6d1ad21 merge begin & end with one 'tap' command 2014-02-25 18:17:43 +08:00
heliclei 6848e6dde0 use atof instead of stof to fix compile error on android 2014-02-25 16:31:21 +08:00
heliclei 7f3aab2bfd fix touchEnd lambda 2014-02-25 15:59:43 +08:00
heliclei f1376e7caf fix help typo 2014-02-25 15:55:01 +08:00
heliclei a7d636f7bf support touch swipe directive 2014-02-25 15:52:37 +08:00
heliclei e09a72f26d add touch swipe 2014-02-25 11:47:53 +08:00