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

252 Commits

Author SHA1 Message Date
minggo d491d9e6db Merge pull request #8149 from andyque/fixIOS8EditBox 
fix ios8 EditBox orientation problem
 2014-09-25 13:47:23 +08:00
minggo 2620592d62 Merge pull request #7975 from newnon/v3_openUrl 
openUrl function for all platform but on windows RT empty function
 2014-09-25 13:41:08 +08:00
andyque 34fbca9c50 fix ios8 EditBox orientation problem 2014-09-25 11:46:42 +08:00
minggo 6a437d79b1 Merge pull request #8138 from MSOpenTech/wp8-v3.3 
WP8 v3.3 bug fixes
 2014-09-25 10:39:37 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
minggo 79446999bb Merge pull request #8116 from Dhilan007/v3-labelfix 
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
 2014-09-24 15:03:40 +08:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Dale Stammen 2226aa5c8a need to reset the accelerometer before trying to enable it again 2014-09-23 10:01:42 -07:00
Guy Kogus 6e91c65e74 Windows Phone 8 can now open URLs. 2014-09-22 17:47:38 +04:00
Guy Kogus a9a0ff35f6 Added method for converting from std::string to Platform::String. 2014-09-22 17:47:38 +04:00
Sergey 2255cf91ba openUrl function for all platform but on windows RT empty function 2014-09-22 17:47:38 +04:00
Dhilan007 ac916c3027 Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7. 2014-09-22 18:01:13 +08:00
huanghsiwu 41b4ba8307 fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp 2014-09-22 09:42:33 +08:00
minggo 6569f1a7f0 Merge pull request #8108 from huangshiwu/v3_wp8test 
fix wp8 directory control bug
 2014-09-19 16:57:02 +08:00
huanghsiwu f73f1a5379 fix wp8 directory control bug --modify 2014-09-19 16:52:11 +08:00
huanghsiwu d42cec0708 fix wp8 directory control bug 2014-09-19 15:54:18 +08:00
Steve Kanter 05f0f71cc5 Update CCDevice-ios.mm 
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
 2014-09-17 14:52:30 -04:00
Eric Zhong ae5f6e63e5 optimize decompress jpg data and fix warnings 2014-09-16 21:55:05 +08:00
Eric Zhong 8de3657f3c optimize decompress jpg data 
it may be unnecessary copy jpg bytes one by one when decompress jpg data
 2014-09-15 23:15:01 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
mailgyc 9e8b32b3c4 fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work 
isPopupNotify() doesn't work
 2014-09-15 14:06:04 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
huangshiwu f1f6373b6e fix Cocos2dShaderCompile's compile error --use chipmunk static library 2014-09-12 15:29:10 +08:00
Ricardo Quesada 525fecc4ce even more cmake fixes 2014-09-11 17:36:49 -07:00
Ricardo Quesada f5cd48f154 Android properties back to 10 2014-09-09 18:46:47 -07:00
Ricardo Quesada d5a6289a9b compiles on wp8 2014-09-09 18:22:11 -07:00
Ricardo Quesada 6b4323642a compiles on winphone8 2014-09-09 18:15:16 -07:00
Ricardo Quesada fdabaa3082 Compiles on Android 2014-09-09 17:53:08 -07:00
Ricardo Quesada 0972506bf5 compiles and runs on linux 2014-09-09 17:41:49 -07:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 73450be715 compiles and runs in Linux 2014-09-09 17:11:06 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
oleg-akatsuki 511ee30b6e Move constructor from private to public 
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.

Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
 2014-09-09 11:34:48 +09:00
minggo 0fc1baee65 Merge pull request #7954 from huangshiwu/v3_wp8fix_pr 
fix wp8 compile error and modify default resource path
 2014-09-05 11:36:32 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
samuele3hu 61d1b67116 Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon 2014-09-04 18:17:05 +08:00
minggo cbe357bbca Merge pull request #7943 from Dhilan007/v3 
fix compile error on android.
 2014-09-04 13:43:39 +08:00
Dhilan007 64d926a75f fix compile error on android. 2014-09-04 11:04:50 +08:00
minggo 83719db8d4 Merge pull request #7934 from wohaaitinciu/loc_ver 
fix: win32 cpp-tests sometimes cannot display font correctly
 2014-09-04 10:49:30 +08:00
Sergey 89ed897f47 getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
Jeff ed849a1863 fix: win32 cpp-tests sometimes cannot display font correctly 
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
 2014-09-03 11:34:40 +08:00
andyque 8033b1f7bb Merge branch 'v3' into mergeExtensionEditBox 2014-09-02 00:03:16 -07:00
kaishiqi 8f11dd7f8b Update CCGLViewImpl.cpp 
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
 2014-09-02 11:13:30 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
minggo bb85ecf0da Merge pull request #7913 from chuanweizhang2013/v3fixed 
make debug writable path the same as release
 2014-09-01 10:15:52 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00