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

1179 Commits

Author SHA1 Message Date
minggo bf07077c52 Merge pull request #4361 from Dhilan007/eclipse_build_fix 
[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
 2013-11-25 19:37:03 -08:00
James Chen 3b47ab62ad Merge commit 'refs/pull/4351/head' of git://github.com/cocos2d/cocos2d-x into constructors_are_protected 2013-11-26 11:26:20 +08:00
Lajos Kamocsay 4538be2b43 FontTest was not rendering TTFs 2013-11-25 10:00:53 -05:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
signmotion 0d9cd9784b * Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float'). 2013-11-23 07:23:06 +02:00
Ricardo Quesada 72436c896a prevents bug in gcc 4.6.3 2013-11-22 13:40:32 -08:00
Ricardo Quesada 3ab1e4f3a1 ClippingNode Test works again 2013-11-22 12:15:41 -08:00
Ricardo Quesada 1c65669a9f fixes type in documentation 2013-11-22 11:27:03 -08:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
boyu0 627b9538d0 issue #2771: fix physics test CC_USE_PHYSICS definition 2013-11-21 10:48:21 +08:00
Ricardo Quesada d3c44cbb0b Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-20 11:23:03 -08:00
James Chen 8129e49b84 Removing unused 'virtual' keyword in testcpp since we're using EventDispatcher::addEventListenerXXX to register event listener. 2013-11-20 11:21:30 +08:00
Ricardo Quesada 5c74c938ee Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-19 13:13:57 -08:00
Dhilan007 2f735eed3f fix undefined reference to PhysicsDemoSlice::onTouchMoved 2013-11-19 17:10:10 +08:00
samuele3 eefaf9b81d Hot fix:Remove the MenuLayerPriorityTest test case of menu 2013-11-19 14:32:17 +08:00
Ricardo Quesada c943702bc8 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/editor-support/cocostudio/CCActionObject.cpp
	samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
 2013-11-18 11:07:15 -08:00
Liam c7932b6181 fixed ui anmation crash when stop animation 2013-11-19 00:57:22 +08:00
boyu0 8feb3a731b issue #2771: fix physics test crashes 2013-11-18 21:28:40 +08:00
boyu0 cb91fff5eb issue #2771: fix bug physics test debug: button must click twice. 2013-11-18 20:42:10 +08:00
samuele3 b281a2f06f Hot fix:repalce unsigned int/int type of params with long to solve tableview bug 2013-11-18 15:55:58 +08:00
boyu0 90f07f680f Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical 2013-11-18 11:22:20 +08:00
boyu0 af65a59e5f issue #2771: fix indent 2013-11-18 10:15:50 +08:00
boyu0 a7d884a63f issue #2771: change debug draw defines to class static const variable 2013-11-18 10:10:37 +08:00
boyu0 8c949c3441 fix bugs: delete initTest functions. 2013-11-18 03:43:32 +08:00
boyu0 8ab64c9fa8 issue #2771: fix some api name and code style 2013-11-18 03:10:13 +08:00
boyu0 0710cfa526 issue #2771: delete PhysicsSlidingJoint and PhysicsSpringJoint. add joint tests, fix bugs 2013-11-18 02:16:20 +08:00
Ricardo Quesada 7c2ed2743c Menu + MenuItem 
`Menu` and `MenuItem` have protected constructors
 2013-11-15 13:14:12 -08:00
Ricardo Quesada 417657b5a9 Merge branch 'develop' into constructors_are_protected 2013-11-15 10:11:49 -08:00
boyu0 988630c12f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-15 16:38:58 +08:00
Dhilan007 050a47c4eb issue #2854:Disable CDT Builder on Eclipse 2013-11-15 14:35:55 +08:00
Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete 
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
  fix asynchronize loading bug
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fixed #3185 support for html5.
  fixed bug of widget
  fixed bugs of widget
  fixed #3185  ComponentTest and SceneTest NULL to nullptr.
  Add deprecated functions of class TextureCache
  fix warning
  set z order after reorder
  fixed #3185 replace NULL to nullptr.
  add "override"
  fixed #3185
  Modify code criterion

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-11-15 09:44:29 +08:00
Ricardo Quesada 17a6575bd3 more protected constructors 
Adds protected constructors for:

* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
 2013-11-14 16:33:43 -08:00
Ricardo Quesada dd68eb4796 ParticleSystem uses protected constructors 2013-11-14 16:21:49 -08:00
Ricardo Quesada c52dc4ff5f Adds love to ShaderTest2 test 
Improves the code in ShaderTest2
 2013-11-14 15:44:22 -08:00
Ricardo Quesada cd0ba6850c Merge branch 'develop' into constructors_are_protected 2013-11-14 11:57:18 -08:00
chengstory 6acf422f3b fixed #3185 support for html5. 2013-11-14 17:03:45 +08:00
Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete 
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG[ci skip]
  Update AUTHORS [ci skip]
  fix bug: cccolor to jsval function has error in jsb
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  C++11: NULL -> nullptr
  [ci skip]
  Fix: UserDefault::createXMLFile with correct XML definition.
  [ci skip]
  [ci skip]
  [ci skip]
  Fix bug: rename const with under line seperator
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fix bug: Z fighting on TransitionScenePageTurn
  Fixed bugs
  Modify reader and fixed bugs
  ...

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-11-14 14:47:01 +08:00
chengstory 41975ba445 fixed #3185 ComponentTest and SceneTest NULL to nullptr. 2013-11-14 14:16:14 +08:00
chengstory 14d51f9f35 fixed #3185 2013-11-14 13:28:42 +08:00
Ricardo Quesada 0189f91480 More tests working 
[x]: Texture2D test working OK
 2013-11-13 17:47:26 -08:00
Ricardo Quesada 2ce2eaf4b3 More tests converted 2013-11-13 17:36:33 -08:00
Ricardo Quesada d590986e73 Constructors are protected 2013-11-13 15:55:36 -08:00
boyu0 fb04c9e574 issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
Ricardo Quesada be64dd97cf replaces `delete[]` with `free()` in C-based API 
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.

- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`

But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...

So, this patch does:

- Migrates the API from  `new []` / `delete[]` to  `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
 2013-11-11 18:09:47 -08:00
CaiWenzhi 4f76141c41 optimize guireader 2013-11-11 18:22:14 +08:00
CaiWenzhi 782c26bc37 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-11 17:57:43 +08:00
minggo bbb2579114 Merge pull request #4160 from dabingnn/iss3025_TextureCache 
[ci skip]Iss3025 texture cache
 2013-11-10 23:08:01 -08:00
James Chen a6c85a3906 issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
James Chen 0eb9caa3d6 Merge commit 'refs/pull/4123/head' of git://github.com/cocos2d/cocos2d-x into fix-acc 2013-11-11 10:08:28 +08:00
CaiWenzhi 1f389d3779 Rename event interface 2013-11-08 18:43:06 +08:00
boyu0 a56dedb41a issue #2771: add class PhysicsDebugDraw 2013-11-08 14:25:03 +08:00
Huabing.Xu 6f1e98df34 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
CaiWenzhi 18f411fd1e Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-08 11:36:59 +08:00
minggo 56d7da8933 Merge pull request #4130 from ricardoquesada/love_in_textfield 
[ci skip]More std::string& usage
 2013-11-07 19:14:35 -08:00
minggo 109adaf337 Merge pull request #4103 from luisparravicini/issue-2882 
[ci skip]added | operator for Control::EventType
 2013-11-07 18:59:33 -08:00
minggo d1f94e0d9d Merge pull request #4111 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-11-07 18:51:15 -08:00
minggo 167242e540 Merge pull request #4127 from Dhilan007/ANCHOR_XXX 
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
 2013-11-07 18:45:50 -08:00
Ricardo Quesada ffd4342548 Adds more strings 
and more `override`
and fixes some indetentation issues
 2013-11-07 12:42:16 -08:00
Dhilan007 916361af3f Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc. 2013-11-07 23:40:33 +08:00
Huabing.Xu bd7d62aee0 issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
CaiWenzhi cbb9c655d9 fixed bugs 2013-11-07 21:10:48 +08:00
boyu0 cee966e284 issue #2771: fix build error 2013-11-07 19:24:15 +08:00
boyu0 3e8871f2c9 issue #2771: delete some unfinished PhysicsTest and change subtitle 2013-11-07 17:53:30 +08:00
boyu0 e278ad66c8 issue #2771: change PhysicsJoint::create() to PhysicsJoint::construct() 2013-11-07 17:46:05 +08:00
boyu0 7363be0697 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-07 17:37:33 +08:00
CaiWenzhi e2249c8c3f Fixed crash 2013-11-07 17:15:52 +08:00
Jason Xu b5f83c30b6 fix indention 2013-11-07 17:08:16 +08:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
Jason Xu c9f814c016 fix Accelerometer Test with missing: Device::setAccelerometerEnabled(true); 2013-11-07 16:39:41 +08:00
boyu0 ef5440f738 issue #2771: change rayCast and rectQuery callback class to std::function 2013-11-07 16:23:50 +08:00
CaiWenzhi 7163dd4d76 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-06 18:13:51 +08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
2youyou2 fcf0b1ef5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-06 16:06:37 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
boyu0 75dd32cde9 issue #2771: fix physics test compile error 2013-11-06 14:34:27 +08:00
James Chen c364c4f083 issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +08:00
Luis Parravicini 8b1d3af720 added | operator for Control::EventType 2013-11-05 23:55:24 -03:00
boyu0 af129e25f0 issue #2771: change some coding style 2013-11-05 20:02:58 +08:00
2youyou2 16c23d0ad3 remove CC_PROPERTY and CC_SYNTHESIZE. 2013-11-05 19:53:38 +08:00
boyu0 8c62bf813f issue #2771: enhance API and add Slice demo 2013-11-05 15:54:33 +08:00
2youyou2 3eef64c3b8 1. Change NULL to null 
2. Remove CocoStudio/Armature files
 2013-11-05 15:32:13 +08:00
2youyou2 b076711b69 fix compile error 2013-11-05 13:42:27 +08:00
James Chen edb1fc7822 [cmake] Deletes .icf files. 2013-11-04 21:03:09 +08:00
James Chen 733197fa65 [cmake] copy resources works. 2013-11-04 21:03:08 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
James Chen e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
James Chen 8cdd1af982 HelloCpp CMakeLists.txt 2013-11-04 21:03:07 +08:00
minggo d1c02e6faa Merge pull request #4078 from minggo/iss3108-signed_char 
closed #3108: add -fsigned-char to make char to signed as default on Android arm architecture
 2013-11-03 22:37:37 -08:00
boyu0 00acd67ff3 issue #2771: finish OneWayPlatform demo and fix some bugs 2013-11-04 14:36:38 +08:00
minggo f6d82d21d2 closed #3108: add -fsigned-char to make char to signed as default 2013-11-04 10:48:45 +08:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical 
issue #2771: physical
 2013-11-03 18:40:14 -08:00
James Chen 8f213420eb closed #3106: Update NewEventDispatcherTest.cpp. 2013-11-02 22:05:04 +08:00
James Chen 7dc6513687 Adding more tests for EventDispatcherTest. 2013-11-02 21:47:00 +08:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
James Chen b751c41498 [Android] Updating Android.mk for JSB projects. 2013-11-01 18:27:47 +08:00
James Chen e893ae5697 Using namespace std; for AssetsManagerTest. 2013-11-01 18:27:09 +08:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00