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

14504 Commits

Author SHA1 Message Date
James Chen 8574fb0494 Build fix for XMLHttpRequest after using std::unordered_map instead of std::map. 2013-11-25 15:11:43 +08:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
2youyou2 9cfb7b2a85 change armature version 2013-11-25 14:46:10 +08:00
minggo eba059e41e Merge pull request #4368 from CocosRobot/updategeneratedsubmodule_1385345794 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-24 18:34:58 -08:00
CocosRobot a4c2ccdf65 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-25 02:16:36 +00:00
minggo f23bfcda48 Merge pull request #4366 from Dhilan007/jssubmodule 
[ci skip]issue #3261:add miss binding
 2013-11-24 18:11:38 -08:00
boyu0 f2dabe77ec issue #2771: add some method implements with box2d in PhysicsWorld 2013-11-25 10:08:52 +08:00
Dhilan007 c09f50e3f8 issue #3261:add miss binding 2013-11-24 22:47:29 +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
Nite Luo b67ec6618f Finish converting LayerColor start working on particle system 2013-11-22 17:14:24 -08:00
Ricardo Quesada cc5a03f21a updates cocos2d version 2013-11-22 16:58:05 -08:00
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