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

4962 Commits

Author SHA1 Message Date
minggo 9dedb072e6 Merge pull request #3528 from natural-law/ForPlugin 
Modify the method cocos_android_app_init()
 2013-09-03 22:50:40 -07:00
Ricardo Quesada ee638b9c8b removes 'private' section from SpriteBatchNode 2013-09-02 16:56:14 -07:00
Ricardo Quesada 088a11ad0d Little performance improvements in SpriteBatchNode 
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
 2013-09-02 16:44:25 -07:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
Huabing.Xu bc5ae78423 issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
minggo 54a5f1e870 Merge pull request #3516 from minggo/perf_addchild_test_fix 
Perf addchild test fix
 2013-09-01 08:12:24 -07:00
minggo 2c6665ac3b add missing head 2013-09-01 22:41:11 +08:00
Ricardo Quesada b697e2bc99 uses std::sort() by default 2013-08-31 15:37:35 -07:00
Ricardo Quesada d41fdea999 objectComparisonLess -> nodeComparisonLess 
and unified it.
No need to have 3 different copies.
The only copy is in CCNode.cpp
 2013-08-31 15:18:28 -07:00
Ricardo Quesada 1393fb356a SpriteBatchNode: follows C++ best practices 
removes hungarian notation
uses `int` instead of `unsigned int`
Add more asserts
 2013-08-31 10:38:10 -07:00
James Chen b7258abbe6 Merge pull request #3510 from samuele3hu/iss2433-lua-bindings-generator-new 
Iss2433:Add deprecated class and enums and modify some project config and test samples
 2013-08-31 03:52:41 -07:00
Ricardo Quesada 9ad1ab50fd compiles on ARM 2013-08-30 21:08:28 -07:00
Ricardo Quesada 09c0234821 Ooops, reverting optimization for C 
still valid for Neon, but the current optimization is not valid for C.

Please, apply this patch otherwise cocos2d won't work correctly
on simulator, windows, linux, mac, etc...
 2013-08-30 20:59:01 -07:00
samuele3hu 8f338cc209 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-08-30 15:21:59 +08:00
samuele3hu f56c6f7087 issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
Ricardo Quesada c599ecb260 revert back fps interval to 0.1s 
Why was it set to 2 seconds?
 2013-08-29 20:05:14 -07:00
Huabing.Xu b7d788a2f9 issue #2460: remove comment code 2013-08-29 13:48:58 +08:00
Huabing.Xu 99f88df8d2 issue #2460: optimize EGLView interface 2013-08-29 11:36:16 +08:00
Ricardo Quesada 530a0119ae `getNodeToParent()` returns a `const &` 
This gives a little performance improvement.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:31:32 -07:00
Ricardo Quesada f4101d8b25 receives a `const &` instead of `const *` 
If is more accurate since a `NULL` AffineTransform is not allowed.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:30:00 -07:00
Ricardo Quesada 57ce406bdb More reliable profiling. 
clock is the first instruction to execute on `EndTimingBlock`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:29:09 -07:00
Ricardo Quesada c4eb6c99ab kazmath: removes unneeded `memcpy` 
gains about 5% in improvement

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:28:30 -07:00
Ricardo Quesada 85ed6d620b fixes some macro names 
kActionInvalidTag -> Action::INVALID_TAG
kNodeTagInvalid -> Node::INVALID_TAG

and it is no longer a `#define` but an `int`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:43:20 -07:00
Huabing.Xu d73b8e8b23 issue #2460: glfw windows keyboard input 2013-08-28 18:31:02 +08:00
James Chen 2578d15420 issue #2747: [Best C++ practice] Deprecating Sprite::displayFrame, adding Sprite::getDisplayFrame. 2013-08-28 18:17:05 +08:00
Huabing.Xu 1e4defb14d issue #2460: glfw linux keyboard input 2013-08-28 17:17:46 +08:00
James Chen 3ad8de9f15 Minor fix of 'Color4F(const Color3B& color3B)'. r(color3B.r) --> r(color3B.r/255.0f) 2013-08-28 17:15:35 +08:00
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 Gregory ff6c5f8adf Fix comment broken in last commit. 2013-08-19 13:45:32 -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
Maciej Czerniak 86b2ce33af fixed stroke font color with channel color values other than 255 2013-08-11 11:38:38 +02:00
James Chen 2ff3655fff Merge pull request #3408 from pyrasis/tizen_2.2 
[Tizen] Update project files
 2013-08-10 07:23:13 -07:00
Lee, Jae-Hong 66593ae4bf [Tizen] Update project files 
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
 2013-08-10 23:11:31 +09:00
minggo d2b96be1e6 Merge pull request #3401 from folecr/accel 
Take orientation into account when reporting accelerometer sensor readout
 2013-08-10 05:46:42 -07:00
folecr 2ebd400a75 clean up coding style and remove explicit temporary variable 2013-08-09 11:39:52 -07:00
godyZ 9dde196140 update s3tc#8,resolve CCConfiguration conflict 2013-08-09 15:47:20 +08:00
godyZ e507bb0deb update s3tc #7 2013-08-09 15:00:26 +08:00
godyZ 9bdb8a43d7 update s3tc #6 2013-08-09 14:37:47 +08:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
Timothy Qiu 2bb119baef Documentation & Cocos2d-x C++ Style 2013-08-09 12:40:20 +08:00
James Gregory 0287f273e0 Port my variant of font-rendering over to dev branch -- adds correct alignment behavior. 2013-08-08 18:39:42 -07:00
folecr 063c730726 Take orientation into account when reporting accelerometer sensor readout 2013-08-08 14:40:26 -07:00
godyZ f648a3f907 modify linux makefile 2013-08-08 17:06:42 +08:00
minggo bf79a0560b issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
godyZ 727ae1bbc2 update s3tc #4 , code standardization 2013-08-08 14:59:46 +08:00
godyZ 46e9eed028 nothing with s3tc 2013-08-08 14:11:22 +08:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 2013-08-08 10:19:09 +08:00
minggo 552c63d0cf Merge pull request #3269 from metalbass/patch-4 
Removed if from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SA...
 2013-08-07 18:45:27 -07:00
carlo morgantini 83b2377a76 some more clean up and removed CCStringTTF 2013-08-07 16:36:04 -07:00
James Chen 87736683c0 Merge pull request #3387 from pyrasis/tizen_2.2 
[Tizen] Enable LocalStorage
 2013-08-07 03:08:38 -07:00
Lee, Jae-Hong 5a8ec8ca5e [Tizen] Enable LocalStorage 
- add sqlite3 headers and libraries.
- use sqlite3 library.
 2013-08-07 19:01:41 +09:00
Lee, Jae-Hong b42868fd69 [Tizen] Remove Tizen 2.1 headers and libraries. 2013-08-07 18:52:15 +09:00
godyZ 674fe025b0 update s3tc #3 ,standard of code 2013-08-07 16:39:05 +08:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
boyu0 684e005ce7 issue #2345: edit for linux compile error 2013-08-07 14:10:42 +08:00
boyu0 d61d3d1a24 issue #2345: fix mac crash due to libjpeg 2013-08-07 11:59:52 +08:00
boyu0 a9d26d3fdc issue #2345: edit getPixelFormatInfoMap method to return reference. 2013-08-07 11:20:41 +08:00
boyu0 ec6343a9b8 fix js and linux compile error 2013-08-07 10:34:30 +08:00
godyZ 27baf5b961 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 09:32:42 +08:00
carlo morgantini ef919aea91 more cleanup 2013-08-06 14:37:19 -07:00
carlo morgantini fbe615f292 remove classes not used anymore 2013-08-06 13:49:24 -07:00
carlo morgantini 16412fc885 more cleanup 2013-08-06 13:43:29 -07:00
boyu0 eb989db3de issue #2345: fix some coding style 2013-08-06 16:14:36 +08:00
godyZ 02419ccb00 update s3tc #3 ,android test 2013-08-06 15:33:38 +08:00
James Chen b3bfe2401a Merge pull request #3378 from pyrasis/tizen_2.2 
[Tizen] fix acceleration wrong coordinates.
 2013-08-06 00:17:25 -07:00
Lee, Jae-Hong 5cc906f798 [Tizen] fix acceleration wrong coordinates. 2013-08-06 16:10:13 +09:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
godyZ 195536097f update s3tc #2 2013-08-06 11:52:48 +08:00
boyu0 d51db25a6f issue #2345: delete the linux png libraries. 2013-08-06 11:41:03 +08:00
boyu0 94f9921d5e issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
godyZ fd7b00681f update s3tc#1 2013-08-06 11:19:45 +08:00
carlo morgantini 66c5721fc7 clean up 2013-08-05 18:03:52 -07:00
carlo morgantini c7c0b0e07a more cleanup 2013-08-05 17:49:20 -07:00
carlo morgantini eeffc76bb8 more cleanup 2013-08-05 16:52:24 -07:00
carlo morgantini a1168512f6 cleanup 2013-08-05 16:41:23 -07:00
carlo morgantini 03b1c0142b refactoring 2013-08-05 16:35:15 -07:00
carlo morgantini d1915d47cc some more refactoring and cleaning up 2013-08-05 15:56:18 -07:00
carlo morgantini b14f9f83e9 New label stuff cleanup and re factoring 2013-08-05 15:11:07 -07:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
folecr 74583d21f3 Android port needs etc headers 2013-08-05 02:05:47 -07:00
folecr 8e386cf0bc moar checking 2013-08-05 02:05:47 -07:00
folecr 952cefa036 Accelerometer 2013-08-05 02:05:47 -07:00
folecr b56df6d28c Separate log macro for logging event processing 2013-08-05 02:05:46 -07:00
folecr 5889cc2218 Shift by correct amount 2013-08-05 02:05:46 -07:00
Rohan Kuruvilla fa940ec292 Add touch input processing 2013-08-05 02:05:46 -07:00
Rohan Kuruvilla 3c20c6d9a8 Fixing bug where engine wouldn't start animating when coming into foreground 2013-08-05 02:05:46 -07:00
folecr 5737d4cd25 strip out old accelerometer implementation 2013-08-05 02:05:42 -07:00
folecr a10c9c74a1 Remove Accelerometer and TextEdit implementations. 2013-08-05 02:05:42 -07:00
folecr 4567ab96b8 Helper and LocalStorage now use NativeActivity directly 2013-08-05 02:05:42 -07:00
folecr 9cefb85bea Use getInstance() instead of various deprecated singleton access methods 2013-08-05 02:05:42 -07:00
folecr af1e450fe6 Remove spurious LOGI (use appropriate LOG_RENDER_DEBUG in its place.) 2013-08-05 02:05:42 -07:00
folecr c1e88b79ba Initialize JniHelper with the Acitivity. Load the native library that is specified in the Activity's meta-data. 2013-08-05 02:05:42 -07:00
folecr 76a684c556 Initialize Cocos2dxHelper from JNI. Call System.loadLibrary() in Java so functions implemented in native code are available from Java. 2013-08-05 02:05:42 -07:00
folecr 2951504b46 Actually obtain a reference to the Java class 2013-08-05 02:05:41 -07:00
folecr dd79d9bbc2 Use default class loader to obtain the ClassLoader for this NativeActivity 2013-08-05 02:05:41 -07:00
folecr e67698116c Cache JNIEnv 2013-08-05 02:05:41 -07:00
folecr d96f54d4e0 Separate calls to setvm reference and to set classloader 2013-08-05 02:05:41 -07:00
folecr 53b1a92773 Use an obtained class loader instead of the default 2013-08-05 02:05:41 -07:00
folecr 669427363f Clean up JNIHelper 2013-08-05 02:05:41 -07:00
folecr dc6b6ecc69 Remove unused Java files for Activity and GLSurfaceView (now in C code.) 2013-08-05 02:05:40 -07:00
folecr 921ed14a87 Use OpenGLES 2.0 2013-08-05 02:05:40 -07:00
folecr a2a999d505 JNI, Set JavaVM 2013-08-05 02:05:40 -07:00
folecr 4539600ac2 initialize cocos with asset manager interface. separate out cocos init from android view init. 2013-08-05 02:05:40 -07:00
folecr 1fb4387d0a AssetManager is a private member of FileUtilsAndroid. setter method. Remove old Java/JNI setter. 2013-08-05 02:05:40 -07:00
folecr 68b9e5d608 Move nativeactivity.cpp 2013-08-05 02:05:40 -07:00
folecr 0a9e9571cc Remove unused declaration 2013-08-05 02:05:40 -07:00
folecr e1bcbc7859 Remove references to the Java renderer 2013-08-05 02:05:39 -07:00
folecr f7d5eb198e ccx : setAnimationInterval() not implemented. 2013-08-05 02:05:39 -07:00
folecr 05daebf65e ccx : Initialize cocos. Calls cocos_android_app_init() to initialize the Cocos app. 2013-08-05 02:05:39 -07:00
folecr 7add86c751 ccx : Trace accelerometer only when tracing rendering 2013-08-05 02:05:38 -07:00
folecr 58c4037de8 ccx : Trace rendering 2013-08-05 02:05:38 -07:00
folecr 3cc62f9fa8 ccx : remove/comment filesystem access methods from Java 2013-08-05 02:05:38 -07:00
folecr d9c3089f35 ccx : Cocos2dxActivity extends NativeActivity 2013-08-05 02:05:38 -07:00
folecr 3af519a61a ccx : Remove Cocos2dxRenderer 2013-08-05 02:05:37 -07:00
folecr 6d990d0570 ccx : Call cocos rendering methods. 
* switch to .cpp for nativeactivity.
 * ccx : update log tags to say .ccp instead of .c
 2013-08-05 02:05:37 -07:00
folecr 57cd5eedef ccx : Change minimum config to RGB565. Add depth buffer and stencil buffer requirements to EGL config. 2013-08-05 02:05:37 -07:00
folecr f4d21528d5 ccx : Link libraries used by nativeactivity.c 2013-08-05 02:05:36 -07:00
folecr 6ac71f16c1 ccx : add nativeactivity 2013-08-05 02:05:36 -07:00
folecr 12f25a574d Shared Android makefile uses the platform specific code as a static library 
* Resolve conflicts with latest cocos2x/Android.mk
 * Revert changes to cocos2dx/Android.mk introduced by 9cba2c42c1
 * Update files in label_nodes
 2013-08-05 02:05:36 -07:00
folecr 588ca7e57b Android port is a static library 2013-08-05 02:04:25 -07:00
folecr 92c45d85f2 Up refresh interval to 2 secs 2013-08-05 02:04:25 -07:00
James Chen 40332299d1 Merge pull request #3368 from azmeuk/emscripten 
Multi-resolution emscripten html template.
 2013-08-05 01:10:08 -07:00
James Chen 2df0b056ce closed #2480: Fixed the crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad. 2013-08-05 15:42:01 +08:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02:00
dotsquid e92337f82d Fixed the crash caused by improper deletion of VBOs in ParticleSystemQuad. 2013-08-05 15:23:01 +08:00
James Chen c61da90441 Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 13:40:59 +08:00
James Chen ea10032b24 issue #2170: Adding missing libs for Android. 2013-08-05 11:43:43 +08:00
James Chen 9a9ffaeb4d issue #2170: A typo fix. 2013-08-05 11:33:59 +08:00
James Chen b8a7a4291f Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 11:26:34 +08:00
James Chen eaabd93051 issue #2170: Fixing compilaction errors on Emscripten. 2013-08-05 11:10:12 +08:00
James Chen a2fbf0c2b8 issue #2179: Fixing compilation errors on Linux. 2013-08-05 10:29:20 +08:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
minggo 1aadf55b59 Merge pull request #3355 from minggo/iss2434-refactor_androidmk 
closed #2434: simply Android.mk
 2013-08-03 08:33:14 -07:00
carlo morgantini 73286ad76b some more clean up (code review) 2013-08-02 16:11:20 -07:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
James Chen 0db8b2bbf3 closed #2469：LabelTest and TileMapTest crash on windows. 2013-08-02 17:31:19 +08:00
boyu0 1a878cf795 issue #2345: Merge branch '2345' into iss2345_refactor_ccimage 2013-08-02 16:19:50 +08:00
boyu0 6afa77ddc3 issue #2345: update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined. 2013-08-02 16:02:40 +08:00
James Chen c1d715b778 Adding windows support for New Label. 2013-08-02 15:01:27 +08:00
boyu0 89dd5a19ad issue #2345: move g_texturePixelFormatInfoTables into Texture2D 2013-08-02 14:10:23 +08:00
James Chen 67d710a41c Adding Android support for new label. 2013-08-02 13:46:26 +08:00
minggo 5e03b9b29d Merge pull request #3347 from timothyqiu/docfix 
More documentation fixes
 2013-08-01 18:22:43 -07:00
carlo morgantini 833a45d1af Some more clean up 2013-08-01 17:54:08 -07:00
carlo morgantini 08d8179a0e Clean up (see code review) 2013-08-01 17:49:51 -07:00
carlo morgantini 4904e0f31f Clean up (as requested by code review) 2013-08-01 17:08:57 -07:00
carlo morgantini 6cac521d1b fix some more problems with the new label stuff (as for code review) 2013-08-01 16:29:39 -07:00
carlo morgantini f30ec5f428 (not used) global variables removed form CCFontAtlas.cpp 2013-08-01 15:55:46 -07:00
carlo morgantini 2fb2916bae some more cleanup 2013-08-01 14:36:34 -07:00
carlo morgantini 972ae78295 Clean up for the new Label stuff 2013-08-01 11:02:32 -07:00
Timothy Qiu 5ad5cfed7a Yet another documentation fix. 
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
 2013-08-01 21:40:13 +08:00
Timothy Qiu 5ed8deb9a6 Fixed more documentation errors. 
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
 2013-08-01 20:55:43 +08:00