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
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
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
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