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

4783 Commits

Author SHA1 Message Date
Huabing.Xu 4af0a418fe issue #2460: glfw mac keyboard input 2013-08-28 16:25:03 +08:00
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
 2013-08-28 13:42:22 +08:00
Huabing.Xu 29746d513a issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
minggo 48444c864c Merge pull request #3484 from ledyba/develop 
Override LayerMultiplex::init()
 2013-08-27 19:08:39 -07:00
minggo 5834fc2f37 Merge pull request #3470 from boyu0/iss2494_Point_isSegmentIntersect_bug 
closed #2494: Fix bug when two line is incident, the Point::isSegmentIntersect() may return wrong result
 2013-08-26 23:27:00 -07:00
minggo faa94fd074 Merge pull request #3482 from minggo/release_unneeded_codes 
Remove unneeded codes
 2013-08-26 23:23:41 -07:00
Ricardo Quesada 48ef1f24c3 fixes possible crash when using `SpriteFrameCache` 
the returned dictionary was double-released. ouch.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:08:56 -07:00
Ricardo Quesada 62c578667b API compliant with cocos2d-x best practices 
Uses `int` instead of `unsigned int` as described in the cocos2d-x best practices

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:07:40 -07:00
Ricardo Quesada b3b3583583 CCNode perf improvements 
AffineTransforms uses a const global variable for the `IDENTITY`
`removeObject` only seeks the index once

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:04:51 -07:00
psi 9b352d5ff4 Merge remote-tracking branch 'parent/develop' into develop 
merged from parent
 2013-08-26 21:36:38 +09:00
psi 1beea771b4 type 2013-08-26 20:42:41 +09:00
psi f0620b0e85 add overrode init method for LayerMultiplex 2013-08-26 20:38:23 +09:00
James Chen 6501c9bffd Merge pull request #3479 from pyrasis/tizen_2.2 
[Tizen] Update project files
 2013-08-26 03:23:14 -07:00
minggo 61d82924be update Android.mk to remove deleted cpp files 2013-08-26 18:01:42 +08:00
minggo ec3fa59ae3 remove unneeded files 2013-08-26 17:40:25 +08:00
boyu0 1e452bf0bc closed #2494: add isLineOverlap, isLineParallel, isSegmentOverlap method to Point. 2013-08-26 13:45:45 +08:00
minggo c186ed6a7f Merge pull request #3447 from NatWeiss/patch-5 
Fixes full paths on Android (cleaner)
 2013-08-25 18:35:57 -07:00
Ricardo Quesada b6a90b81aa Adds missing include 2013-08-25 10:50:29 -07:00
Ricardo Quesada ea8eb601af Uses std::sort() 
Uses std::sort() for inserting the nodes.

This code is not final, but preliminary results show that std::sort() is 60% faster

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-24 10:56:07 -07:00
Lee, Jae-Hong bbf9053788 [Tizen] Update project files. 
- Update file list.
- change order of link files.
 2013-08-25 02:22:50 +09:00
Ricardo Quesada 364288cf66 Adds "Sort all Children" perf test 
Adds a new perf tests: "sortAllChildren"

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-23 13:14:57 -07:00
boyu0 9a3a03d6ef closed #2494: Fix some typo 2013-08-23 14:41:49 +08:00
boyu0 3f23a4a661 closed #2494: Fix bug when two line is incident, the Point::isSegmentIntersect() may return wrong result 2013-08-23 14:37:56 +08:00
minggo bbbfc82541 Merge pull request #3463 from ricardoquesada/perf_test_invocation 
Adds 2 new performance tests
 2013-08-22 20:26:54 -07:00
minggo b746bda738 Merge pull request #3461 from dumganhar/iss2650-remove-typeinfo 
closed #2650: Remove ccTypeInfo since we could get the hash value from typeid(T).hash_code() if using c++11.
 2013-08-22 20:26:25 -07:00
Ricardo Quesada 38bfadf7f3 Adds 2 new performance tests 
Invocation with `for_each()` and using `arrayMakeObjectsPerformSelector`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-22 18:21:52 -07:00
Ricardo Quesada c4735af1ef Adds more constants to Color 
Adds more constants for Colors, in particular to `Color4B` and `Color4F`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-22 17:19:07 -07:00
James Chen ca78d2d129 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
minggo ddb4219d24 Merge pull request #3457 from boyu0/iss2434_gen_android_mk 
closed #2434: Add android_mk_generator.py to generate Android.mk
 2013-08-22 03:05:11 -07:00
James Chen f02f72d980 Merge pull request #3456 from sbc100/fix_build 
[NaCL] Add missing include of <sys/mount.h> [ci skip]
 2013-08-22 00:39:16 -07:00
Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/cocoa/CCArray.cpp
	cocos2dx/cocoa/CCArray.h
	cocos2dx/label_nodes/CCLabel.cpp
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/display/CCDisplayManager.cpp
 2013-08-21 21:27:44 -07:00
Ricardo Quesada 29d0bab0d3 fixes memory leak! 
and double-autorelease on Dicts (on mac)
 2013-08-21 21:12:32 -07:00
minggo d9da52ce86 Merge pull request #3454 from minggo/array-support-sort 
Array can be use in stl::sort() when not using vector inside
 2013-08-21 20:50:03 -07:00
boyu0 da566a3c16 issue #2434: add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files 
add PathUtils.py for python library.
 2013-08-22 11:49:34 +08:00
Sam Clegg 7bd5025064 [NaCL] Add missing include of <sys/mount.h> 
This was previously included by nacl_io.h but
upstrean changes in NaCl removed this.
 2013-08-21 20:27:34 -07:00
Ricardo Quesada a3eb0a058e Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/platform/mac/CCFileUtilsMac.mm
	extensions/CCBReader/CCBAnimationManager.cpp
	extensions/CCBReader/CCBReader.cpp
	extensions/CCBReader/CCBSequenceProperty.cpp
	extensions/GUI/CCScrollView/CCScrollView.cpp
 2013-08-21 20:27:19 -07:00
Ricardo Quesada 2e221ee6cc Array & Dictionary fixes 
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't  have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.

This patch fixes all those issues.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:12:09 -07:00
Ricardo Quesada 4104cdc20e Better destructors logs 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:08:51 -07:00
Ricardo Quesada 967eb4b08f Adds more asserts 
The instance methods cannot be used if the instance was not `init()`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:04:30 -07:00
Ricardo Quesada 4dc18029b7 Removed Iterator class 
There is no need to implement `Array::Iterator`.
It is replaced by returning `end()` and `begin()`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:03:45 -07:00
minggo 2de8963a0a fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
minggo 3476a843e2 Array can be use in stl::sort() when not using vector inside 2013-08-22 10:18:59 +08:00
James Chen 1ee7790f0e Initializing Array after it was constructed. 2013-08-22 10:15:47 +08:00
Huabing.Xu b2e167c6ea issue #2460: glfw mac version 2013-08-21 12:01:56 +08:00
Ricardo Quesada f9df7cf4e5 Uses high resolution clock for Profiling 
and adds another average time.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 16:06:34 -07:00
Ricardo Quesada f7241ea533 Default capacity of Array is 10 
plus better documentation

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 16:06:04 -07:00
Ricardo Quesada 4c99492589 Profiling: more useful information 
Prints min,max, #calls

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 14:18:06 -07:00
Ricardo Quesada d96a504f3c cocos2d in lowercase 
Cocos2d -> cocos2d

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 14:17:43 -07:00
Ricardo Quesada 4d6d2d0dfa Better default values for auto-release pool 
150 is a reasonable number for auto-release pool.
By using 150, it prevents the unneeded re-alloc of the pool.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 14:17:26 -07:00
Ricardo Quesada 5225758c5c CCArray: performance improvements 
CCArray:

- Iterator uses position for iterator. MUCH faster.
- Do not double init the array. performance improvements in memory.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 14:16:43 -07:00
NatWeiss fb3d422f0c Fixes full paths on Android (cleaner) 
If one adds a search resolutions order directory without a trailing slash, CCFileUtils::getFullPathForDirectoryAndFilename will fail on Android. For example it will return:

assets/sdBg1.png

Instead of the expected:

assets/sd/Bg1.png

This small commit fixes the function to add a slash if necessary, fixing the issue on Android.

Compared to the last pull request of this name, formatting matches the style of code around it and comments have been added.
 2013-08-20 10:22:44 -07:00
Huabing.Xu c276cdf6ee issue #2460: glfw windows version: remove some unused function 2013-08-20 15:19:48 +08:00
minggo f97f7edeb6 Merge pull request #3440 from ricardoquesada/better_array 
Better array
 2013-08-19 23:39:36 -07:00
James Chen c215a1d5a2 Merge pull request #3285 from gkosciolek/fix_for_CCNotificationCenter 
closed 2611: Fixing the bug that observers with the same target and selector but different sender are the same observer in NotificationCenter.
 2013-08-19 23:23:18 -07:00
Huabing.Xu dd538a28a7 issue #2460: glfw window version 2013-08-20 13:57:15 +08:00
minggo 0ec5d6f029 Merge pull request #3439 from folecr/android_rendering_bugfix 
Let CCDirector set all GL state in the Android port
 2013-08-19 19:08:47 -07:00
James Chen 7e3d3b3d3e Merge pull request #2950 from zcgit/develop 
a potential bug in Layer.
 2013-08-19 19:02:53 -07:00
Ricardo Quesada 6c2c5f727f small fix to make it compile with std::vector too 2013-08-19 17:33:23 -07:00
Ricardo Quesada 6c02102b17 Fixes crash when reordering 2013-08-19 17:27:31 -07:00
Ricardo Quesada 511ec1cc5d Compiles with improved CCArray 
Compiles both with std::vector or ccCArray
 2013-08-19 17:09:28 -07:00
folecr 9d8e2d991b Let CCDirector set all GL state 2013-08-19 15:58:05 -07:00
James Chen 175316f2c6 Merge pull request #3404 from timothyqiu/docfix 
Documentation fix: broken links and wrong encoding in the doc...
 2013-08-18 19:35:47 -07:00
minggo 61e8b14601 Merge pull request #3420 from boyu0/tilemap_plain_xml_format_support 
Support for loading tilemaps with plain XML layer format
 2013-08-17 01:13:41 -07:00
minggo c7f313419e Merge pull request #3431 from minggo/iss2525-add_iterator_for_array 
add iterator for Array and make Array can be used in range-based loop
 2013-08-17 00:42:42 -07:00
minggo baa9e0a1e4 issue #2525:add iterator for Array and make Array can be used in range-based loop 2013-08-16 18:23:41 +08:00
godyZ f0dbc22c16 updata: [cocos2d's code style] add space before backslash and return before else if 2013-08-16 16:10:39 +08:00
Huabing.Xu 205f6765e8 issue #2460: add glfw include and library file to Xcode 2013-08-16 15:43:25 +08:00
godyZ 28656598ef closed #2533:updating new file copyrights 2013-08-16 15:01:22 +08:00
godyZ b5af9eb4c8 closed #2533:fix some wrong indent 2013-08-16 14:36:35 +08:00
godyZ 8c0f2dfed1 issue #2533: resolve some conflicts 2013-08-16 14:27:13 +08:00
godyZ 9e07ac967f issue #2533: updating some GL macro definition 2013-08-16 14:03:30 +08:00
minggo 77f89956a3 Merge pull request #3414 from boyu0/iss2522_unpackccz 
closed #2522: Let Image::initWithImageData() support the packed data.
 2013-08-15 21:44:43 -07:00
James Chen 041b14f3ff Merge pull request #3411 from maciekczwa/master 
fixed stroke font color with channel color values other than 255
 2013-08-15 20:28:49 -07:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support 
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
 2013-08-16 11:02:44 +08:00
James Chen 9ab671fb03 Merge pull request #3425 from dumganhar/iss2488-new-label-sample 
Iss2488: Merge PR https://github.com/cocos2d/cocos2d-x/pull/3422
 2013-08-15 07:16:48 -07:00
James Chen 0b306cd510 Removing unused file: cocos2dx/platform/blackberry/CCImage.cpp. 2013-08-15 21:44:51 +08:00
James Chen 409e345522 issue #2488: Updating VS project configuration. 2013-08-15 21:40:11 +08:00
James Chen c97e2d3562 issue #2488: Fixing a warning in CCFontFreeType.cpp. 2013-08-15 21:39:03 +08:00
James Chen c29a8bb2a0 issue #2488: The declare fix: class FontLetterDefinition; --> struct FontLetterDefinition; 2013-08-15 21:38:27 +08:00
James Chen c84162505e issue #2488: Updating project configurations for new Label classes. 2013-08-15 21:01:45 +08:00
James Chen 9d226aa746 issue #2488: Removing unused 'include'. 2013-08-15 21:00:44 +08:00
James Chen 4c698a60a9 issue #2488: Adding 'override' keyword for new Label classes. 2013-08-15 21:00:06 +08:00
James Chen 5b227743ee issue #2488: Fixing typo: #include "CCFontFreeType.cpp" --> "CCFontFreeType.h". 2013-08-15 20:59:05 +08:00
James Chen 9dbd74d2a8 Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner 
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
 2013-08-15 04:19:17 -07:00
carlo morgantini afd0e88284 Clean up as for code review 2013-08-14 12:37:59 -07:00
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-08-13 11:28:54 -07:00
boyu0 f9181d3265 Merge branch 'tilemap_plain_xml_format_support' of https://github.com/simpliplant/cocos2d-x into tilemap_plain_xml_format_support and add extra control to parse the tmx file for load the xml format tiles. 2013-08-13 18:32:50 +08:00
boyu0 2c3fd7ebae issue #2522: fix some wrong indent. 2013-08-13 10:11:28 +08:00
carlo morgantini 026b3e90b8 clean up 2013-08-12 16:16:34 -07:00
carlo morgantini 35b5e30190 alignment added to new label creation 2013-08-12 15:41:29 -07:00
carlo morgantini d15d84c05f samples cleaned up 2013-08-12 15:09:28 -07:00
folecr 934ea7510f Use explicit boolean compare instead of implicit float -> boolean conversion 2013-08-12 14:21:58 -07:00
carlo morgantini 097a5c488a New Label tests plus bug fixing 2013-08-12 13:29:54 -07:00
boyu0 fc923aac93 closed #2522: Fix compile error. 2013-08-12 18:18:09 +08:00
boyu0 1f87fa37f4 closed #2522: Fix some coding style. 2013-08-12 17:05:19 +08:00
James Chen db00378ead Merge pull request #3415 from godyZ/develop 
modify the Win32 vcxproj file , resolve complier error
 2013-08-12 00:57:20 -07:00
godyZ 963eb5c191 modify the Win32 vcxproj file , resolve complier error 2013-08-12 15:54:05 +08:00
boyu0 cde4a7945c closed #2522: Let Image::initWithImageData() support the packed data. 2013-08-12 11:54:54 +08:00
James Chen dbd58b6aa7 issue #2521: Updating comments where searchs full path. 2013-08-12 11:06:51 +08:00