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

831 Commits

Author SHA1 Message Date
yangxiao 2309a524fd simplify AsyncTaskPool 2014-12-23 10:12:37 +08:00
mannewalis 9d885fe664 default lock macros to nothing for unsupported platforms 2014-12-22 19:49:20 -05:00
mannewalis 09f2eed4b8 default lock macros to nothing for unsupported platforms 2014-12-22 19:46:16 -05:00
mannewalis aad45d6952 fixing windows8 build 2014-12-22 19:43:40 -05:00
yangxiao 1ba826ea17 modify code style 2014-12-22 17:40:02 +08:00
minggo 20beb3b9e0 Merge pull request #9567 from joewan/v3-improve-perf 
fix serious performance problem of Animate.
 2014-12-22 14:57:26 +08:00
joewanchen 3765f87651 fix. 2014-12-21 00:49:23 +08:00
mannewalis 50bd3cf2b7 modify inline macro to work on windows 2014-12-19 10:57:19 -05:00
XiaoYang 6be4538f3d Merge pull request #181 from songchengjiang/sync_load 
fix errors on Windows
 2014-12-19 13:33:20 +07:00
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
yangxiao f4dbaa53e4 add to linux 2014-12-19 10:29:10 +08:00
yangxiao 5aad841080 add stop task 2014-12-19 10:22:02 +08:00
mannewalis 467a5e9c12 minor changes for linux build 2014-12-18 18:21:49 -05:00
mannewalis c05a6c877d adding files to cmake files 2014-12-18 18:10:13 -05:00
yangxiao f54f8a4826 remove return value of enque 2014-12-18 16:16:04 +08:00
yangxiao 6e99698c59 Merge branch 'newcode' into sync_load 2014-12-18 14:03:07 +08:00
mannewalis 6b1f994c40 turn off global new delete 2014-12-17 13:55:14 -05:00
mannewalis a6eab3c496 Merge branch 'v3' into mem_alloc_again 2014-12-17 11:59:24 -05:00
mannewalis 34a2f6f640 minor tweak 2014-12-17 11:56:19 -05:00
mannewalis fd22242fb2 added locking semantics to fixed block allocator 
pool allocator uses lockless semantics by default
 2014-12-17 11:54:06 -05:00
mannewalis a095635459 android fixes 2014-12-15 16:21:12 -08:00
mannewalis b532ce74d8 diagnostics track allocator enable 2014-12-15 16:16:35 -08:00
mannewalis c50bf94c59 removing Allocator<T> and inheriting base directly. 2014-12-15 09:34:25 -08:00
joewanchen 0cc4b58383 initialize _startPointCaptured. 2014-12-15 19:42:25 +08:00
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +08:00
mannewalis cb547413d2 fix range error on reporting all allocators 2014-12-13 11:45:08 -08:00
mannewalis 58be92b35f added more diagnostic info. 
still crashing, but only on device. Suspect a free(p) that was allocated with new.
 2014-12-13 11:42:35 -08:00
mannewalis e81e9a7f47 fixing some issues, still crashing, but want to keep changes. 2014-12-13 10:40:45 -08:00
Sergey 9a01b76fec Clang static analyzer crash fix 2014-12-13 12:40:04 +03:00
mannewalis 7b2fea798a add total count and fix remaining reporting issues 2014-12-12 17:16:44 -08:00
mannewalis 00da483e1b minor changes 2014-12-12 14:54:24 -08:00
mannewalis 595b3c1cd2 some minor tweaks comments and logging 2014-12-12 10:54:59 -08:00
mannewalis bc7757a366 adding allocator system 2014-12-12 08:57:06 -08:00
Dhilan007 8b78c181ce Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT. 2014-12-10 18:11:07 +08:00
yangxiao 5bc74e55df modify comment 2014-12-05 15:59:21 +08:00
yangxiao b665daf2f8 add comment 2014-12-05 15:55:01 +08:00
yangxiao 60e1b54b1a fix ~ThreadTasks() bug 2014-12-05 15:25:56 +08:00
yangxiao c99185b755 add async load test 2014-12-05 15:01:30 +08:00
yangxiao bc57e47ddb add async task callback dipatcher, call it in the main thread 2014-12-04 18:31:10 +08:00
yangxiao f17df4b0bc add createAsync 2014-12-03 17:40:27 +08:00
Ricardo Quesada bfb79b6a9e CCRANDOM_() uses std::rand() because it can be seeded with std::srand() 
plus other minor fixes in perf tests
 2014-11-26 20:07:42 -08:00
Ricardo Quesada 96e089be76 Sprite Performance Test automation works OK 2014-11-26 16:55:39 -08:00
Ricardo Quesada 1361f2c619 Director users a low-pass filter to display the FPS 
FPS is more stable. Uses a 5% low-pass filter
 2014-11-26 13:31:44 -08:00
yangxiao 35020c7c71 async task pool 2014-11-26 11:28:14 +08:00
James Chen cebfed108c issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode. 2014-11-26 10:41:14 +08:00
Vladimir Timofeev a689fc4c7e sync with upstream 
Conflicts:
	CMakeLists.txt
 2014-11-20 12:19:00 +03:00
Eric Zhong 36e44dbaf9 set default priority to avoid warning 
when call 'scheduleUpdate' and 'unscheuleUpdate' several times in one frame, it will get warning "warning: you CANNOT change update priority in scheduled function"
 2014-11-18 22:05:56 +08:00
Vladimir Timofeev 1e8aeb7fd2 Minizip 
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
 2014-11-16 22:41:37 +03:00
Ricardo Quesada dcc4c46d5b Using std::swap instead of CC_SWAP 
CC_SWAP is deprecated. Use `std::swap` instead.
 2014-11-16 09:29:05 -08:00
Vladimir Timofeev 27ef26270c Unify TinyXML2 usage. 
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
 2014-11-15 14:43:50 +03:00
minggo f753368246 Merge pull request #9017 from cpascal/fix_error_refleakdetection 
Fixed compile error with CC_REF_LEAK_DETECTION
 2014-11-13 18:56:46 +08:00
minggo 133d51cad1 Merge pull request #9026 from cpascal/fix_error_scriptbinding_off 
Fixed compile error with CC_ENABLE_SCRIPT_BINDING=0
 2014-11-13 18:53:40 +08:00
Mircea Rila a643f05330 add touch callback types 2014-11-11 18:00:34 +02:00
cpascal 3dcce59e84 Fix error with CC_ENABLE_SCRIPT_BINDING=0 
There are too much compile error if I set EE_ENABLE_SCRIPT_BINDING=0.

CCEventTouch and CCTouch related things...
This is temporary fix... Many source/header files must be patched for
the right way..
 2014-11-06 07:20:41 +09:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
cpascal c1f85bac0e Fixed compile error with CC_REF_LEAK_DETECTION 2014-11-05 16:23:25 +09:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
Miguel Ferreira ad8ffa5de1 Fixed winrt DLL link errors when using extern consts 2014-10-29 10:47:02 +00:00
Dale Stammen 00f9e888d2 enable console for winrt 2014-10-23 07:01:04 -07:00
SunLightJuly 0cb8a3922b fixed bug of definition of utils:: getCascadeBoundingBox() 2014-10-21 11:07:11 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
Anton Sokolchenko fc35cc2efe CMake fix for Mac Os X. 
You can open project with CLion and see that everything works.
 2014-10-15 00:19:29 +03:00
Dale Stammen f54b408744 added check for WP8_SHADER_COMPILER 2014-10-14 14:14:38 -07:00
Dale Stammen c8e4fe1fbf enabled console for WinRT 2014-10-14 14:14:12 -07:00
Dhilan007 d3733c4a45 fixed compile error 2014-10-11 16:05:34 +08:00
martell 0d26b33eaa mingw64: mirgrate to upstream minizip 2014-10-11 04:39:42 +01:00
Ricardo Quesada e03fb86990 one more fix, oops 2014-10-10 18:28:05 -07:00
Ricardo Quesada 3cd2163558 more win fixes 2014-10-10 18:21:15 -07:00
Ricardo Quesada ee3086ff8d compiler fixes for windows 2014-10-10 17:41:11 -07:00
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +08:00
XiaoYang b77559fe5d Merge pull request #136 from songchengjiang/new_v3 
Fixed CosOuterAngle error
 2014-10-09 18:31:24 +08:00
yangxiao 222bf570f2 Merge branch 'newcode' into v3 2014-10-09 17:01:35 +08:00
songchengjiang 34efbf189a Fixed getCosOuterAngle errors 2014-10-09 16:16:02 +08:00
songchengjiang 88012cf86b Merge branch 'v3_new' into v3 
Conflicts:
	tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
 2014-10-09 15:49:50 +08:00
yangxiao c087f31e94 modify return type of getDirection and getDirectionInWorld 2014-10-09 10:12:52 +08:00
SunLightJuly 763b54e5cb added LuaStack::loadChunksFromZIP() 2014-10-08 17:30:14 +08:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
martell 028d15921e fix warning because of extra comma's 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:19:57 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada cc3df75d1f works on win32 
std::iterators weren't used correctly
 2014-10-02 15:46:47 -07:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
andyque aea729ef01 fix cmakelists.txt of linux platform 2014-10-09 12:01:22 +08:00
minggo 99064b091f Merge pull request #8164 from super626/v3 
move logic about camera from Director to scene
 2014-09-26 23:29:58 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
minggo bd56a71b1b CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION 2014-09-26 10:44:29 +08:00
yangxiao 6626655308 move render logic from Director to scene 2014-09-26 09:36:43 +08:00
yangxiao eab0951c2d reset 2014-09-25 16:07:57 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
yangxiao c4d25d318f light config 2014-09-19 11:11:23 +08:00
SunLightJuly f9fbb1b789 call getCascadeBoundingBox() properly 2014-09-18 15:40:28 +08:00
SunLightJuly 855d8d7a72 moved getCascadeBoundingBox() to utils 2014-09-18 15:27:11 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
Ricardo Quesada 525fecc4ce even more cmake fixes 2014-09-11 17:36:49 -07:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08: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 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
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
yangxiao 88ec0392a0 remove unused method 2014-09-04 17:15:28 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
yangxiao 39e33cbf71 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:12:24 +08:00
yangxiao de3921c101 fix render stats bug 2014-09-02 11:12:15 +08:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +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
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-29 10:58:04 +08:00
songchengjiang 96e6595e95 Added getInverseViewMatrix 2014-08-29 10:42:02 +08:00
lite3 2b6bdac05d Merge branch 'v3' into customguireader 2014-08-28 15:13:10 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
minggo c935a39090 Merge pull request #7879 from dabingnn/v3_fixLabelStatus 
fix LabelStatus string error when labelStatus is recreated
 2014-08-26 14:51:08 +08:00
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
minggo e1b29a8ef6 Merge pull request #7329 from Dhilan007/v3-gc-refactor 
issue #4689:Fixed lose disconnected event and incorrect device name/id.
 2014-07-07 18:45:23 +08:00
Dhilan007 bbf0fead91 update API annotation. 2014-07-07 18:25:53 +08:00
Dhilan007 d1034fdaae 1.fixed lose disconnected event. 
2.fixed incorrect device name and device id;
 2014-07-07 17:47:07 +08:00
minggo cd77690032 Merge pull request #7326 from Dhilan007/v3-gc-refactor 
issue #4689: support external key.
 2014-07-07 17:04:27 +08:00
Dhilan007 ddfe82ae08 Replace log with CCLOG 2014-07-07 15:04:29 +08:00
Dhilan007 68bd717ea7 issue #4689: support external key. 2014-07-07 12:06:24 +08:00
minggo 2d504dcc9b Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig 
Remove redundant comment in ccConfig.h
 2014-07-06 21:09:39 +08:00
mannewalis f238593bfb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x: (78 commits)
  fix ui::Helper::seekWigetByName can not find pages in pageview
  [AUTO][ci skip]: updating cocos2dx_files.json
  add const for getter. fixed redefinition of 'registerListeners'
  Update CCController-android.cpp
  fixed missing function
  issue #4689: Refactoring game controller API[ios]
  Add resources
  version1.2
  Remove useless codes
  Refactoring game controller API
  should not include android cpp files in win/wp project
  Remove useless codes
  Remove useless codes
  Add Lua bindings for utils and CaptureScreen test case
  revert Android.mk
  issue #4689: Refactor controller API.
  add setXXTEAKeyAndSign
  fix indent problems
  initialize member variable
  fix windows compile and running error
  ...
 2014-07-05 12:26:44 -07:00
Dhilan007 2b3de76819 add const for getter. 
fixed redefinition of 'registerListeners'
 2014-07-04 23:07:48 +08:00
Dhilan007 e6c4bb454b Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactorClass 2014-07-04 22:53:33 +08:00
LinWenhai 46435952f8 Update CCController-android.cpp 2014-07-04 21:31:10 +08:00
Dhilan007 eee26b5029 fixed missing function 2014-07-04 21:29:30 +08:00
LinWenhai 2ca5c01902 issue #4689: Refactoring game controller API[ios] 2014-07-04 21:24:32 +08:00
Dhilan007 6d48cd9523 Refactoring game controller API 2014-07-04 17:01:41 +08:00
Dhilan007 552a9251c4 issue #4689: Refactor controller API. 2014-07-04 15:22:53 +08:00
mannewalis 92e08265cd changes needed for swift bindings to work 2014-07-03 08:42:06 -07:00
Dhilan007 c5dc7b9cd0 fixed can't get valid value from trigger button. 2014-07-02 14:19:10 +08:00
minggo aff1e3e1d2 fix compiling error 2014-07-01 22:26:15 +08:00
minggo 6654bf1129 Merge pull request #7265 from visiblelight/beta_test 
Fix the crash when capturing screen on WP8
 2014-07-01 16:19:45 +08:00
dimkaafan a7a2490aee bug on began touch - prevpoint 2014-07-01 11:35:04 +04:00
Dhilan007 584e90c097 Rotate the frame buffer for WP8 during the snapshot 2014-07-01 14:48:43 +08:00
田矢 慎太朗 39040540fc Remove redundant comment in ccConfig.h 2014-07-01 15:12:29 +09:00
pandamicro abfbc4bffb Fixed #5632: Indicate the correct button in mouse move event 2014-07-01 13:01:04 +08:00
minggo 3b13855374 fix compiling error on iOS 2014-06-30 17:20:13 +08:00
Dhilan007 2a9e10be2c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630 2014-06-30 13:41:55 +08:00
Dhilan007 ef5da0649a issue #4895:Add test case[ios] 2014-06-30 12:53:26 +08:00
Dhilan007 5ed581758e issue #4895:Get events from controller to engine[android] 2014-06-30 03:20:22 +08:00
Dhilan007 3c614d5670 issue #4895:Get events from controller to engine[ios] 2014-06-30 00:31:45 +08:00
Dhilan007 7cd7b9e054 issue #4892:Implement logical codes of game controller 2014-06-30 00:28:21 +08:00
Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
 2014-06-29 20:23:43 +08:00
Huabing.Xu b232896f85 roll back fps compute logic 
fix crash bug
 2014-06-27 13:41:06 +08:00