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

14293 Commits

Author SHA1 Message Date
Ricardo Quesada 447a34655a RenderTexture contructor ctor is public again 2013-11-22 16:14:05 -08:00
Nite Luo 60ada5dee3 Fonts are now using NewSprite to render 2013-11-22 16:09:11 -08:00
Ricardo Quesada 9b52af010d Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN 
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
 2013-11-22 16:09:05 -08:00
Ricardo Quesada 3f1983214f Effects have protected contructors 
and disallowed copy + assign
 2013-11-22 15:07:58 -08:00
Nite Luo b41d81f810 Add actions to NewSpriteBatchNode test 2013-11-22 15:05:18 -08: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
Nite Luo b02af0cbfe Clean up renderer code 2013-11-22 10:24:52 -08:00
Ricardo Quesada 4d7e56b44a fix indentation 2013-11-22 09:42:21 -08:00
Jason Xu 7c5784005c Fix: on android, Device::setAccelerometerInterval will causes dead loop 2013-11-23 00:07:15 +08:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
samuele3 3a69ee301b issue #3228: Resolve TestLua and HelloLua test samples compile error on the Xcode 4.6.2 when choose Mac platform 2013-11-22 14:06:48 +08:00
samuele3 eb3f5eb629 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-22 11:52:32 +08:00
samuele3 192deb7952 issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case 2013-11-22 11:51:07 +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
Nite Luo 43941bcbe0 Only init render after GLview has been initialized 2013-11-21 16:36:19 -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
Nite Luo 96d2910a99 Merge branch 'develop' into newRenderer 2013-11-21 10:19:32 -08:00
boyu0 8e14cdb8d2 issue #2771: add assert to joint 2013-11-21 14:39:37 +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
Nite Luo db52698b26 Fix the crash on ios 7 2013-11-20 20:39:32 -08:00
boyu0 627b9538d0 issue #2771: fix physics test CC_USE_PHYSICS definition 2013-11-21 10:48:21 +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
Nite Luo f438e83104 Merge branch 'develop' into newRenderer 2013-11-20 11:14:28 -08:00
Nite Luo 0e51504ee6 Use stack to manage current RenderGroup 2013-11-20 11:05:01 -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