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

562 Commits

Author SHA1 Message Date
Huabing.Xu ef472d6250 fix LabelStatus string error when labelStatus is recreated 2014-08-25 17:19:45 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
samuele3hu d1b4d43a0b Remove CCModuleManager.h/cpp and adjust the related project 2014-08-22 15:10:46 +08:00
minggo 21cb90bf12 Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR 
Migrate some changes from Cocos2d-JS to -x
 2014-08-21 22:38:59 +08:00
pandamicro 634847412b Reverse CC_CONSTRUCTOR_ACCESS modification 2014-08-21 19:36:28 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
pandamicro 5fb9f59633 Fix small issues 2014-08-21 15:40:53 +08:00
minggo b349ce43ae use macro to control whether to use jpeg, tiff, webp or not 2014-08-21 15:19:26 +08:00
pandamicro 909dd0d397 Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
lite3 c136e8e079 fix indent 2014-08-21 02:15:27 +08:00
lite3 679d525453 Merge branch 'v3' into customguireader 2014-08-21 01:22:07 +08:00
lite3 9f348962c7 Merge branch 'v3' into customguireader 2014-08-21 00:18:30 +08:00
minggo f3b211351b Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie 
V3 add primitivehead fie
 2014-08-20 16:04:27 +08:00
Huabing.Xu 22db2abcaf add != operator in Blendfunc 2014-08-20 14:21:13 +08:00
minggo bbf5c56e83 Merge pull request #7827 from andyque/ccRandom 
add c++11 random library support
 2014-08-20 13:35:12 +08:00
andyque 34629f1014 fix windows & win8 & wp8 compile error 2014-08-20 12:02:12 +08:00
minggo 2b709f92bb Merge pull request #7816 from xiangxw/fix_sendPrompt 
fix sendPrompt()
 2014-08-20 10:25:30 +08:00
andyque 9a3c2dc6a4 Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-20 09:56:16 +08:00
xiangxw bef6a2a7f1 fix sendPrompt() 
a extra '\0' will be sent when sizeof() is used
 2014-08-19 11:46:30 +08:00
minggo dd1bc70cde Merge pull request #7271 from newnon/v3_getPreviousLocation_fix 
bug on began touch - prevpoint
 2014-08-19 09:49:01 +08:00
teivaz db805ee2c8 * Fixed WP8 cocos library project 
* Fixed profiling macros
 2014-08-19 19:24:56 +03:00
Dmitry Bushtets 1257f642c7 - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
minggo 408472625c add CCModuleManager into CMakeLists.txt 2014-08-15 14:46:21 +08:00
minggo bf75e9996a separate jpeg, tiff and webp 2014-08-15 14:29:10 +08:00
minggo db17084b6d fix warnings 2014-08-15 12:06:16 +08:00
yangxiao 7bfd636b16 reset default camera rotation 2014-08-14 09:06:06 +08:00
yangxiao b4ec344bcf reset camera position in initDefault 2014-08-13 15:57:22 +08:00
minggo 9ae20d1bd3 Merge pull request #7740 from GavinThornton/v3 
Update CCEventTouch.h
 2014-08-13 09:39:17 +08:00
lite3 fa83d63c5d replace NULL to nullptr 
fix compile error
 2014-08-12 17:35:18 +08:00
lite3 8f59d8ac93 add GUIReader::registerTypeAndCallBack for std::function 2014-08-12 17:19:52 +08:00
gin0606 17aa2833db Fix xcode warning that cause `getEngine` inline expansion 2014-08-12 18:07:17 +09:00
GavinThornton 1d0deb0bc1 Update CCEventTouch.h 
MAX_TOUCHES=5 is less than most touch devices, iPad/Android tablets can almost all handle all 10-11 touches. Perhaps a value of 15 would be better? 

Note: There is a #define IOS_MAX_TOUCHES_COUNT 10 in CCEAGLView.mm already for this, but multitouch fails on touch 5 in "void GLViewProtocol::handleTouchesBegin" at the code:- 
            // The touches is more than MAX_TOUCHES ?
            if (unusedIndex == -1) {
                CCLOG("The touches is more than MAX_TOUCHES, unusedIndex = %d", unusedIndex);
                continue;
            }
 2014-08-12 01:02:06 -07:00
yangxiao 32645c1622 fix default camera, add listener for projection change 2014-08-12 14:42:08 +08:00
gin0606 89cf0c1e8c fix getEngine 2014-08-12 12:01:27 +09:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
minggo 29888b9d74 Merge pull request #7705 from zii/patch-1 
让replaceScene更安全
 2014-08-08 12:03:48 +08:00
yangxiao 911144b720 wrong parameter for visit 2014-08-08 11:52:40 +08:00
yangxiao 4dce59582b visiting camera 2014-08-08 11:49:59 +08:00
minggo 2f638c67fd Merge pull request #7598 from AppleJDay/master 
Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...
 2014-08-08 10:43:32 +08:00
gin0606 2ca881287f CCRANDOM macro use ccRandom 2014-08-07 21:17:41 +09:00
gin0606 5349aa7efb Add ccRandom.h 2014-08-07 21:17:36 +09:00
zii 212e059917 让replaceScene更安全 
如果可以这样的话 就不用担心用runWithScene还是replaceScene了. 可以省略getRunningScene判断.
 2014-08-07 18:34:21 +08:00
yangxiao 1e15131b2b simplify code 2014-08-07 16:24:44 +08:00
yangxiao 34f6368ff7 change function to const 2014-08-07 15:57:15 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
minggo 1bad9ddbc2 Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr 
V3 wp8glviewhookpr
 2014-08-05 13:51:15 +08:00
huangshiwu 9a3f231771 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +08:00
zii 20c43e5684 Update ccUtils.h 2014-08-04 15:21:10 +08:00
zii 7659a1623f Update ccUtils.h 2014-08-04 15:20:45 +08:00
zii e151795c43 Update ccUtils.cpp 2014-08-04 15:18:01 +08:00
zii 825209dd04 Update ccUtils.cpp 2014-08-04 11:48:23 +08:00
zii 97f06306e3 Update ccUtils.cpp 
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
 2014-08-04 11:45:50 +08:00
huangshiwu 372479d812 wp8 GLView Hook 2014-08-02 16:31:16 +08:00
AppleJDay b736202a55 replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013. 2014-08-01 17:37:30 +08:00
AppleJDay 2239fafade Merge branch 'v3' of github.com:AppleJDay/cocos2d-x 2014-08-01 17:22:43 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
AppleJDay 0bd4b608b7 Merge pull request #1 from cocos2d/v3 
Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
 2014-07-29 08:34:15 +08:00
AppleJDay bd5ca6a244 Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions 2014-07-28 10:39:35 +08:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
Sergey 9e692cd329 missing include 2014-07-22 15:49:39 +04:00
Sergey 59cbc153d4 Copyright & small fixes 2014-07-22 15:49:38 +04:00
Sergey 624b6a5af4 unused variable removed 2014-07-22 15:49:37 +04:00
Sergey 1a617ad804 pvr display fix pvr decompression on 64 bit platforms fix 2014-07-22 15:49:36 +04:00
Sergey 2acce6771f software per decompression support 2014-07-22 15:49:36 +04:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
Huabing.Xu 8afd7614d1 Merge branch 'v3' into v3_dll 2014-07-18 14:01:17 +08:00
Mazyad Alabduljaleel a4b4efff1b [FIX]: copied data should be const 2014-07-18 03:44:39 +04:00
Huabing.Xu 21b3e55339 Mac dylib version works now 2014-07-17 20:58:50 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
minggo 3b3a29ed68 Merge pull request #7477 from Dhilan007/v3-gc0717 
Fix the y-inverse Joystick bug[IOS].
 2014-07-17 15:13:57 +08:00
Huabing.Xu 3c6e87d34e Merge branch 'v3' into v3_dll 
Conflicts:
	cocos/base/ccUtils.h
 2014-07-17 14:12:10 +08:00
Dhilan007 a457db53b0 Fix the y-inverse Joystick bug[IOS]. 2014-07-17 11:14:53 +08:00
Huabing.Xu 0350186589 Merge branch 'v3' into v3_dll 2014-07-16 11:15:16 +08:00
Huabing.Xu dbd3fce0a5 windows dll version of cpp-tests works 2014-07-15 13:54:08 +08:00
Huabing.Xu 63de5f6acc add CC_DLL 2014-07-15 12:00:31 +08:00
Huabing.Xu 4b059689d3 add CC_DLL for functions 2014-07-15 11:18:05 +08:00
Huabing.Xu 9db59c0046 add CC_DLL for Event and Physics 2014-07-15 10:55:40 +08:00
Huabing.Xu cd9e42eb99 add CC_DLL for colorXXX 2014-07-15 10:04:24 +08:00
boyu0 2354c79c3f Fix compile error 2014-07-14 23:05:16 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
boyu0 7fd0ca217c Implement utils::atof() 2014-07-14 20:42:08 +08:00
Huabing.Xu 91314ed504 remove CC_DLL for template class and CC_DLL for CCValue 2014-07-14 18:40:10 +08:00
Huabing.Xu 190264c090 add CC_DLL in Event systems 2014-07-14 16:43:28 +08:00
minggo 8cdbe5a019 Merge pull request #7412 from Dhilan007/v3-320final 
fixed warning: deleting pointer to incomplete type.
 2014-07-11 18:50:25 +08:00
Dhilan007 d2e8154dc3 fixed warning: deleting pointer to incomplete type. 2014-07-11 17:45:15 +08:00
minggo ecb915fabf fix warnings 2014-07-11 17:39:56 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
Huabing.Xu 60dd7a4514 Merge branch 'v3' into v3_dll 2014-07-11 11:10:26 +08:00
Dhilan007 4e4464c9c1 Add annotation for Controller class. 2014-07-11 10:56:09 +08:00
Huabing.Xu f5cffba6c9 change pure virtual function to virtual function in action series 
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
 2014-07-11 10:19:49 +08:00
minggo e749a9a598 Merge pull request #7380 from huangshiwu/v3 
change "const static" to "static const"
 2014-07-10 18:31:09 +08:00
huangshiwu 2a65b7d98e change "const static" to "static const" 2014-07-10 16:50:25 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 
Make clear EVENT_COME_TO_FOREGROUND event.
 2014-07-09 23:03:04 +08:00
minggo eba1735d04 Merge pull request #7347 from Dhilan007/v3-memory-leak 
fixed memory leak cause by singleton.
 2014-07-08 21:13:56 +08:00
minggo c2474ea7c0 Merge pull request #7262 from pandamicro/origin_v3 
Indicate correct button and cursor position infomation in mouse move event
 2014-07-08 21:07:09 +08:00
Dhilan007 10defddc2e fixed memory leak cause by singleton. 2014-07-08 18:22:48 +08:00
Dhilan007 7d924d2b64 fixed duplicate definition. 2014-07-08 12:50:47 +08:00