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

1377 Commits

Author SHA1 Message Date
songchengjiang 7c1e8e1a08 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 
Conflicts:
	tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
 2015-03-04 14:12:34 +08:00
songchengjiang 1b0fc162b0 fix bugs 2015-03-04 13:19:42 +08:00
yangxiao e466b5d231 fix warning 2015-03-04 10:24:07 +08:00
yangxiao a92a8ac924 particle to transparent queue 2015-03-04 10:10:33 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
XiaoYang 8092437463 Merge pull request #245 from songchengjiang/particle_merge 
add test demo
 2015-03-03 17:46:47 +08:00
yangxiao 18a3a23a2e adjust code style 2015-03-03 15:57:03 +08:00
yangxiao db5c098ca8 adjust 2015-03-03 15:13:47 +08:00
songchengjiang 9bdcdec60a add test demo 
use particleSystemScaleVelocity
 2015-03-03 15:10:42 +08:00
yangxiao 6023777133 reset modify 2015-03-03 14:12:12 +08:00
songchengjiang e650ef2b4d check sprite == nullptr 
remove unneeded namespace
 2015-03-03 11:52:55 +08:00
songchengjiang 6b046c5236 add log to Render 2015-03-03 11:42:15 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
songchengjiang def8da1612 remove unneeded code 2015-03-03 10:33:28 +08:00
songchengjiang 6a3e810bc2 code optimization 2015-03-03 10:15:49 +08:00
songchengjiang a3ae37ac7a optimization 2015-03-02 17:47:26 +08:00
songchengjiang a9eb4dc7f9 support read material files on linux 
modify the name of getAliveParticleCnt function
 2015-03-02 16:28:38 +08:00
songchengjiang 79d892bffc add std::nothrow 
modify Copyright
 2015-03-02 16:05:26 +08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
yangxiao c216984b6f clear the particle pool when start 2015-02-26 13:57:18 +08:00
yangxiao 22d8917100 add Particle Universe copy right 2015-02-25 18:05:41 +08:00
yangxiao a50efe998f fix compile 2015-02-16 11:57:07 +08:00
yangxiao bdd7da89a1 add header 2015-02-16 11:26:06 +08:00
yangxiao 6c73e22a32 variable name error 2015-02-16 11:18:54 +08:00
yangxiao 5c8fbcedab load all materials linux routine 2015-02-16 10:03:58 +08:00
yangxiao f71b432d1d fix render release bug 2015-02-15 16:52:20 +08:00
yangxiao d34a9f68f2 check ParticleModelRender to avoid crash 2015-02-15 16:39:58 +08:00
yangxiao 5547d85add missing file 2015-02-15 11:41:14 +08:00
yangxiao f9f532ef65 missing file 2015-02-15 11:16:46 +08:00
yangxiao 33a0cc310a wrong filename 2015-02-15 11:01:11 +08:00
yangxiao 6172302a9b ref path add extensions 2015-02-13 16:57:00 +08:00
yangxiao 0f27e0c31a add to ext.h 2015-02-13 16:16:30 +08:00
yangxiao 954fd52493 rename folder and fix warning 2015-02-12 17:54:27 +08:00
yangxiao 2bae6b5351 check created vertex and index buffer 2015-02-12 17:15:48 +08:00
yangxiao 026ce1a288 modify according to minggo 2015-02-12 16:51:02 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
yangxiao c114d5d496 add particle to linux project 2015-02-12 11:00:48 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
pandamicro 897416eb4e cocos2d/cocos2d-js#1313: Remove dangerous code in AssetsManagerEx::setStoragePath 2015-01-30 11:12:35 +08:00
pandamicro 5e8baa4f39 Fix AssetsManagerEx small issues 2015-01-23 12:10:32 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
andyque 412e76a626 add fixme 2015-01-04 15:16:22 +08:00
andyque 7328c2eea0 fix linux compile error 2015-01-04 15:16:22 +08:00
andyque 60ec08eef4 upgrade libcurl for iOS 2014-12-31 10:18:44 +08:00
pandamicro 5755cc69e9 Fix a small compilation issue 2014-12-30 10:11:30 +08:00
pandamicro ffd7c30c87 Polish restart implementation 2014-12-30 10:09:56 +08:00
pandamicro 1e32d0fb80 Added getSearchPaths API in Manifest 2014-12-28 11:55:31 +08:00
minggo 6db7cfb68b Merge pull request #9039 from pandamicro/v3_origin 
#9061: Polish AssetsManagerEx, bug fixes and feature added
 2014-11-27 22:01:03 +08:00
pandamicro ef76724f19 #9061: Add check for instantiation 2014-11-26 14:39:56 +08:00
Vladimir Timofeev b0a6cf1182 Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS 2014-11-18 17:48:54 +03: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
Vladimir Timofeev eb0159b2b7 Unify usage of chipmunk library 
* cmake/Modules/FindChipmunk.cmake now can find prebuilt chipmunk libs
* follow USE_CHIPMUNK variable (although at the moment cocos can't build without chipmunk)
* come cleanups and formatting
 2014-11-15 13:17:23 +03:00
pandamicro f4e61f5620 Issue #9061: Add std::nothrow 2014-11-14 10:44:18 +08:00
martell d8be5a8af4 fix includes so that minizip builds correctly on Mingw-w64 2014-11-13 23:27:04 +00:00
pandamicro bf45accf8e Revert "Issue #9061: Made Manifest::getAssets public for assets process after update finished" 
This reverts commit 8652864242.
 2014-11-13 10:53:38 +08:00
pandamicro 68e5132107 Issue #9061: Fix issue about compare logic 2014-11-10 19:23:41 +08:00
pandamicro 8652864242 Issue #9061: Made Manifest::getAssets public for assets process after update finished 2014-11-10 16:52:20 +08:00
pandamicro e167f0889b Issue #9061: Fix no success notification for empty download queue issue 2014-11-10 16:51:41 +08:00
pandamicro ead867559c Issue #9061: Fix local manifest more recent than cached manifest issue 2014-11-10 16:51:08 +08:00
pandamicro aca5930711 Fixed #9038: parseVersion shouldn't set Manifest loaded flag 2014-11-06 23:08:34 +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
yangxiao cfb6a7846f Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-17 18:08:55 +08:00
yangxiao 66dd0807eb add isVisibleByVisitingCamera check when visit 2014-10-17 18:07:45 +08:00
Dhilan007 ccbc668427 Improve Android.mk 2014-10-17 10:13:33 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
Dale Stammen d8d94d214b added missing file methods for winrt/wp8 2014-10-14 17:49:25 -07:00
Dale Stammen a91ae61071 added check for WinRT and WP8 2014-10-14 16:46:23 -07:00
Dale Stammen cca5d90cbe added winrt and wp8 platforms. Cleaned up platform checks 2014-10-14 16:45:43 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
pandamicro 4e9e40363f Feature #4977: Fix an issue about checkUpdate function 2014-10-09 19:55:11 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01: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 b911c240c9 added support for static and shared builds with extensions 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:19 +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
minggo efa1c86fc5 Merge pull request #8103 from cpascal/fix_no_physics 
Fixed compile error when I turned off physics definitions.
 2014-09-25 09:56:45 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
cpascal fe07589141 Fixed my mistakes - preprocessor. 2014-09-22 14:25:47 +09:00
cpascal 07f5568ae8 Using CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION instead of CC_USE_PHYSICS 2014-09-22 14:19:08 +09:00
cpascal c527d7476b Fixed compile error when I turned off physics definitions. 
Fixed the following compile error.
cocos2d\extensions\physics-nodes\ccphysicssprite.cpp(305): error C4716:
'cocos2d::extension::PhysicsSprite::getRotation' : must return a value
and more..

Conditions:
CC_USE_PHYSICS = 0
CC_ENABLE_CHIPMUNK_INTEGRATION = 0
CC_ENABLE_BOX2D_INTEGRATION = 0
 2014-09-19 01:35:01 +09:00
DENPEN 0cfb8c6469 fix ScrollView bug 
I Fixed a bug that scroll view hidden picks up the touch events.
 2014-09-05 20:49:15 +09:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
andyque 7493c7bf3e fxi compile warning 2014-09-03 14:47:04 +08:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
andyque a0c28e49ac remove exteion edtibox 2014-09-02 16:14:07 +08:00
andyque ffee7b27d4 fix linux and android compile error 2014-09-01 17:43:40 +08:00
andyque 85ce801fdd remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +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
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 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
minggo d3ce2acff6 Merge pull request #7892 from Dhilan007/v3-androidmk 
Adjust android.mk for cocos2d and related module
 2014-08-28 10:16:39 +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
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
Dhilan007 9135236bb0 Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk 2014-08-27 21:15:57 +08:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu a5a706aa05 Remove the useless win32 project 2014-08-27 10:20:15 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
andyque 2d8bec2ba9 remove Extension EditBox 2014-08-20 16:20:57 +08:00
minggo 38fb58cf29 Merge pull request #7792 from minggo/fix-warning 
fix warnings
 2014-08-15 13:33:08 +08:00
minggo db17084b6d fix warnings 2014-08-15 12:06:16 +08:00
minggo 3f2fccb999 Merge pull request #7771 from samuele3hu/v3_3_module 
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
 2014-08-14 18:33:53 +08:00
yangxiao d8eb1b26ef format code 2014-08-14 14:15:16 +08:00
yangxiao 561945d6cd format code 2014-08-14 14:14:25 +08:00
yangxiao 42e7e3bbe8 format code 2014-08-14 14:11:00 +08:00
yangxiao 1942a27a5c Merge branch 'newcode' into v3_merge 2014-08-14 13:55:57 +08:00
yangxiao 032ba062a9 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
yangxiao 4629d257e1 rename checkCameraMask to isVisibleByVisitingCamera 2014-08-14 09:58:11 +08:00
samuele3hu 032f5ea781 Adjust lua_debugger.h/c to lua runtime template and adjust related project configure 2014-08-14 00:06:28 +08:00
yangxiao 76329f9e53 add camera mask check to visit 2014-08-13 12:06:51 +08:00
胖梁 c673955d5d uncompress false means zip wrong, download again 2014-08-12 20:13:52 +08:00
胖梁 0b93cc40d7 when http code 301,302, can follow rediect 2014-08-12 20:12:23 +08:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
minggo 1bad9ddbc2 Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr 
V3 wp8glviewhookpr
 2014-08-05 13:51:15 +08:00
minggo 38e4ad0fbd Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview 
Update : added function for setting min/max scale
 2014-08-05 11:52:22 +08:00
takaken1994 1b74bc279a Fix : remove unused params from header file 2014-08-04 23:20:47 +09:00
takaken1994 6f26a7b983 Fix : remove verbose function 2014-08-04 23:20:13 +09:00
takaken1994 7c0919042f Fix : small bug 2014-08-04 23:17:09 +09:00
huangshiwu 9a3f231771 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +08:00
minggo 358d637e75 Merge pull request #7645 from andyque/testPR7549 
fix EditBox began/end events not work issue
 2014-08-04 15:36:07 +08:00
huangshiwu efcb8b9962 wp8 glview hook solution 1 2014-08-04 14:17:14 +08:00
takaken1994 9692dfdc67 Update : added function for setting min/max scale 
Fix to remove unused params.
 2014-08-03 21:25:55 +09:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
andyque 6dee943352 fix mac EditBox callback issue 2014-08-01 14:56:47 +08:00
andyque 630c41e4a3 Merge branch 'patch-1' of https://github.com/yongkangchen/cocos2d-x into testPR7549 2014-08-01 13:37:27 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
Huabing.Xu eacf003eed change libExtensions for windows 2014-07-29 10:07:46 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
Huabing.Xu 2795c10627 rename box2d->libbox2d 2014-07-28 12:05:58 +08:00
Huabing.Xu 7f5782c207 chang module name for windows project file 2014-07-28 09:20:02 +08:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
minggo 98943b4517 Merge pull request #7548 from yongkangchen/v3 
fix Label::setTextColor did not have any effect.
 2014-07-25 11:18:10 +08:00
minggo b9d8e84b4d Merge pull request #7581 from andyque/fixEditBoxCompile 
fix mac compile error
 2014-07-24 21:59:31 +08:00
andyque e9ab6bb5cd fix EidtBox mac 32bit compile error 2014-07-24 17:56:28 +08:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
Huabing.Xu 918da16639 Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError 2014-07-24 10:09:59 +08:00
Huabing.Xu 61ff03ab45 windows cpp-tests works now 2014-07-23 18:34:49 +08:00
Mazyad Alabduljaleel f19acbb6db [FIX]: make sure parent is visible before handling touch 2014-07-23 03:42:29 +04:00
minggo 524d9cb8af Merge pull request #7552 from andyque/fixScale9Sprite 
fix scale9Sprite addChild zorder issue
 2014-07-22 18:39:04 +08:00