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

13698 Commits

Author SHA1 Message Date
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces 
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
 2013-11-19 16:57:23 -08:00
Ricardo Quesada 27b09a2b3b Merge branch 'develop' into constructors_are_protected 2013-11-19 13:54:34 -08:00
Ricardo Quesada 340544c42d Merge pull request #4342 from ricardoquesada/warnings_in_label 
Fixes warnings in CCLabel
 2013-11-19 13:53:49 -08:00
Ricardo Quesada 582afe3b61 Fixes warnings in CCLabel 
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
 2013-11-19 13:51:40 -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 948410c7b5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio 2013-11-19 19:33:26 +08:00
Dhilan007 23f36e0406 fix touches not working in cocosbuilder 2013-11-19 19:24:04 +08:00
boyu0 aec514e3a2 issue #2771: fix collision bug cause by dynamic/static cast. 2013-11-19 18:30:12 +08:00
minggo f2a720ebb0 Merge pull request #4338 from CocosRobot/updategeneratedsubmodule_1384854025 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-19 01:44:26 -08:00
CocosRobot d8ec58831a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 09:40:27 +00:00
minggo 11d43e4652 Merge pull request #4335 from Dhilan007/jssubmodule 
[ci skip]recover controller on layer.
 2013-11-19 01:35:58 -08:00
Dhilan007 2f735eed3f fix undefined reference to PhysicsDemoSlice::onTouchMoved 2013-11-19 17:10:10 +08:00
Dhilan007 dc42645afe Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio 2013-11-19 16:49:28 +08:00
Dhilan007 3929e6070d fix error form overrides a 'final' function 2013-11-19 16:27:09 +08:00
Dhilan007 c307d83b35 add miss Deprecated api 2013-11-19 16:06:27 +08:00
Dhilan007 1a65af9d1a fix warn 2013-11-19 15:54:54 +08:00
Dhilan007 f0ab3f9ca1 fix some error in layer controller code 2013-11-19 15:41:22 +08:00
minggo 463fc2e5fa Merge pull request #4336 from samuele3hu/developTableView 
[ci skip]Hot fix:Remove the MenuLayerPriorityTest test case of menu
 2013-11-18 22:57:10 -08:00
samuele3 eefaf9b81d Hot fix:Remove the MenuLayerPriorityTest test case of menu 2013-11-19 14:32:17 +08:00
Dhilan007 0586c4d275 recover controller on layer. 2013-11-19 13:56:30 +08:00
minggo 594450e3f7 Merge pull request #4330 from CocosRobot/updategeneratedsubmodule_1384833055 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 19:52:09 -08:00
CocosRobot 0855ff0841 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 03:50:57 +00:00
minggo 2848e0dc3e Merge pull request #4328 from 2youyouo2/develop 
[ci skip]update armature
 2013-11-18 19:46:29 -08:00
2youyou2 d5478f1ca2 fix if last frame has tween effect, armature may display wrong 2013-11-19 11:44:17 +08:00
minggo bd00e6fabb Merge pull request #4326 from dabingnn/develop_hotFix 
[ci skip]Develop hot fix
 2013-11-18 19:33:07 -08:00
Huabing.Xu 1fc928df41 HotFix: use static cast for format conversion 2013-11-19 11:32:12 +08:00
yinkaile f308f2f95a fix CCArmature display wrong on mac version 2013-11-19 11:22:40 +08:00
Huabing.Xu 49f34c5339 HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture 2013-11-19 11:19:12 +08:00
Huabing.Xu fff851a8aa HotFix: change tab to space 2013-11-19 11:17:02 +08:00
Huabing.Xu 458b9b53da HotFix: fix CCB particle alpha blend 2013-11-19 11:16:14 +08:00
minggo 1e8a3fc92f Merge pull request #4322 from dabingnn/develop_hotFix 
[ci skip]HotFix: fix bug spine alpha blend error
 2013-11-18 18:54:16 -08:00
minggo fb2c2ec7f2 Merge pull request #4323 from Dhilan007/jssubmodule 
[ci skip]fix miss bind setGrid\getGrid for JS.
 2013-11-18 18:53:51 -08:00
minggo 8e7cce8cea Merge pull request #4324 from CocosRobot/updategeneratedsubmodule_1384828843 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 18:53:06 -08:00
Huabing.Xu 69b38f6e40 HotFix: change tab to space 2013-11-19 10:42:37 +08:00
CocosRobot 186b6fd98b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 02:40:44 +00:00
minggo 78f2e0982e Merge pull request #4319 from liamcindy/develop 
[ci skip]fixed ui anmation crash when stop animation for develop branch
 2013-11-18 18:34:16 -08:00
Dhilan007 ce0a6d5b57 fix miss bind setGrid\getGrid for JS. 2013-11-19 10:33:11 +08:00
minggo 8fd0806716 [ci skip] 2013-11-19 10:28:08 +08:00
minggo 7dc252ef11 Merge pull request #4318 from dumganhar/iss3224-httpclient-crash 
[ci skip][Critical BUG FIX] closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes.
 2013-11-18 18:27:03 -08:00
Huabing.Xu d9681150fc HotFix: fix bug spine alpha blend error 2013-11-19 10:15:12 +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
James Chen 91a57c614d closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes. 2013-11-19 00:19:57 +08:00
minggo b4671f4002 Merge pull request #4316 from samuele3hu/developTableView 
[ci skip]Hot fix:Repair js template copy resource error
 2013-11-18 07:19:24 -08:00
samuele3 0dadddfb3d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 23:14:08 +08:00
minggo 1ed8cfee7c Merge pull request #4297 from liamcindy/develop 
[ci skip]Shielded unusefull log for develop branch
 2013-11-18 07:10:40 -08:00
minggo 27f35ac3e3 Merge pull request #4312 from samuele3hu/developTableView 
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
 2013-11-18 07:09:57 -08:00
samuele3 9bc3a10aa7 Hot fix:Repair js template copy resource error 2013-11-18 23:08:37 +08:00
minggo 47b30d26d7 Merge pull request #4315 from Dhilan007/jssubmodule 
[ci skip]updating js shared submodule reference
 2013-11-18 06:54:49 -08:00
minggo 0e2ea2971d Merge pull request #4313 from minggo/develop 
[ci skip]fix compiling error of js template
 2013-11-18 06:33:23 -08:00