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

13486 Commits

Author SHA1 Message Date
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
Ricardo Quesada 4d7e56b44a fix indentation 2013-11-22 09:42:21 -08:00
Ricardo Quesada 515786a7ee adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons 
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
 2013-11-21 17:06:06 -08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
Ricardo Quesada a26b385b11 Merge branch 'develop' into constructors_are_protected 2013-11-21 10:56:03 -08:00
minggo 4582686860 Merge pull request #4347 from samuele3hu/developTableView 
[ci skip]Add doxygen comments for the CocoStudio
 2013-11-20 21:55:34 -08:00
Ricardo Quesada 41d6bb39c8 Merge branch 'develop' into constructors_are_protected 2013-11-20 11:29:07 -08:00
Ricardo Quesada e9e04d7d5e Merge pull request #4349 from ricardoquesada/pragma_mark_love 
Adds some #pragma mark love
 2013-11-20 11:28:25 -08:00
Ricardo Quesada 90f51e0dab Merge branch 'develop' into constructors_are_protected 2013-11-20 11:26:55 -08:00
Ricardo Quesada 6a8c4784a4 Adds some #pragma mark love 2013-11-20 11:26:33 -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 bffc5bb4d5 Merge pull request #4348 from boyu0/iss2771_physical 
issue #2771: physical bug fix.
 2013-11-20 00:24:07 -08:00
boyu0 1743826498 issue #2771: fix a careless mistake 2013-11-20 16:08:48 +08:00
boyu0 bde6f5d9eb issue #2771: fix crash bug 2013-11-20 15:54:09 +08:00
samuele3 07ea8647c3 Add doxygen comments for the CocoStudio 2013-11-20 15:07:34 +08:00
samuele3 3ed7a79a84 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-20 13:01:07 +08:00
James Chen f19acfc227 Merge pull request #4346 from CocosRobot/updategeneratedsubmodule_1384921493 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-19 20:25:39 -08:00
CocosRobot 54ef1d6c15 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-20 04:24:55 +00:00
James Chen 8f0063aa26 Merge pull request #4345 from dumganhar/develop 
Don't deprecate callback functions in Layer.
 2013-11-19 20:19:21 -08:00
James Chen 43e8a4912d Update tools/tolua/cocos2dx.ini, ignore onTouchXXX, onKeyXXX, onAccXXX callback functions to be bound to LUA. 2013-11-20 12:09:27 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
James Chen 59c2647bd6 Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function. 2013-11-20 11:35:04 +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
James Chen da8c34d994 Fix of unsigned / signed mismatch in UIPageView.cpp. 2013-11-20 11:20:35 +08:00
James Chen 6b579ebe5e Don't deprecate callback functions in Layer. Reason: 
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
 2013-11-20 11:19:51 +08:00
James Chen 93333ad252 Merge pull request #4340 from Dhilan007/jssubmodule 
recover controller on layer.
 2013-11-19 18:49:07 -08:00
James Chen 3c783d2e28 Merge pull request #4344 from dumganhar/develop 
Fixing warning generated by VS2012.
 2013-11-19 18:43:14 -08:00
Dhilan007 bd3789e0b5 add miss api 2013-11-20 10:40:43 +08:00
James Chen 424431690a Fixing warning generated by VS2012. 2013-11-20 10:39:30 +08:00
Dhilan007 0646e59bf3 resolve conflict 2013-11-20 10:26:00 +08:00
boyu0 c945fbd42c issue #2771: add some warning log 2013-11-20 10:25:43 +08:00
James Chen 60ed1dcd3a Merge pull request #4341 from Dhilan007/touchfix 
fix touches not working in cocosbuilder
 2013-11-19 18:20:42 -08:00
James Chen 95cda661f2 Update CHANGELOG [ci skip] 2013-11-20 10:02:54 +08:00
Ricardo Quesada 9a51d6c0ba Merge branch 'develop' into constructors_are_protected 2013-11-19 17:59:43 -08:00
Dhilan007 02c69a5c6a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio 2013-11-20 09:57:50 +08:00
James Chen f4a5dc33d0 Merge pull request #4343 from ricardoquesada/virtual_destructors 
Adds virtual destructors on Interfaces and enables 'warn on missing virtual destructors' for xcode.
 2013-11-19 17:55:16 -08:00
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