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

14097 Commits

Author SHA1 Message Date
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
Ricardo Quesada a75d9d976f Merge pull request #4547 from ricardoquesada/node_fixes 
Node fixes with the iterator (thanks James)
 2013-12-18 18:36:25 -08:00
Ricardo Quesada d138925aa0 Merge branch 'develop' into node_fixes 2013-12-18 18:33:56 -08:00
Ricardo Quesada b9a64725ab iterator in Sprite fixes 
And replaces some std::for_each() with for() to prevent another object in the stack.
 2013-12-18 18:33:04 -08:00
minggo 9fc28e6c7d Merge pull request #4534 from boyu0/edit_hungarian_notation 
Edit hungarian notation
 2013-12-18 18:10:17 -08:00
Ricardo Quesada 5d1fa0da12 Merge pull request #4544 from ricardoquesada/get_node_transform_fixes 
getNodeToParentTransform fixes
 2013-12-18 18:01:33 -08:00
Ricardo Quesada 89701f5006 getNodeToParentTransform fixes 
Code is cleaner.
`Armature` calls parent to reduce code.

[]: Skew is still not working properly
 2013-12-18 18:00:55 -08:00
boyu0 c6cc77e75b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-19 09:45:21 +08:00
Ricardo Quesada cfaa0387b0 Merge pull request #4543 from ricardoquesada/node_cleanup 
Node cleanup
 2013-12-18 16:57:58 -08:00
Ricardo Quesada 8390e7eadb Node cleanup 
Uses "normal" interation without the lambda to prevent another object in the stack.

removed unused code.
 2013-12-18 16:56:59 -08:00
Ricardo Quesada a617cdc2ae Merge pull request #4542 from CocosRobot/updategeneratedsubmodule_1387404655 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 15:58:46 -08:00
CocosRobot 228b4ebf75 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 22:11:07 +00:00
Ricardo Quesada ee864b039e Merge pull request #4541 from ricardoquesada/sprite_test_love 
Improves SpriteTest
 2013-12-18 13:53:40 -08:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest 
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
 2013-12-18 13:52:10 -08:00
Ricardo Quesada a175e5a13c Merge pull request #4539 from CocosRobot/updategeneratedsubmodule_1387397647 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 12:18:22 -08:00
CocosRobot d0779b5352 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 20:14:20 +00:00
Ricardo Quesada 8d1f5afeef Merge pull request #4538 from ricardoquesada/linux_and_android_fixes 
Android and Linux fixes
 2013-12-18 12:08:38 -08:00
Ricardo Quesada b36d77b1c2 Android and Linux fixes 2013-12-18 12:07:51 -08:00
Ricardo Quesada 4155a743c4 Merge pull request #4537 from ricardoquesada/more_renderer_fixes 
More renderer fixes
 2013-12-18 12:01:06 -08:00
Ricardo Quesada d1b555614e removes `using namespace std` from header file 
... in order to prevent possible collisions.

`using namespace XXX` MUST never be used in header files.
 2013-12-18 11:45:30 -08:00
Ricardo Quesada 903844c7bd Removes unneeded files 
New functionality is merged into the 'official' classes
 2013-12-18 11:44:45 -08:00
boyu0 d0b039ceda fix compile errors. 2013-12-18 22:44:03 +08:00
boyu0 71be55a9aa revert AccelerometerSimulation.m 2013-12-18 19:02:49 +08:00
boyu0 50544a04a7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:53:44 +08:00
boyu0 f16384a105 fix more code with hungarian notation 2013-12-18 18:51:36 +08:00
boyu0 d16c67096a revert submodules 2013-12-18 18:33:39 +08:00
boyu0 082c3d274a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:05:30 +08:00
James Chen bc34ee7f02 Merge pull request #4533 from CocosRobot/updategeneratedsubmodule_1387360632 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 01:59:11 -08:00
CocosRobot 000958bf82 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 09:57:15 +00:00
James Chen 9c0d39c6f9 Merge pull request #4531 from dumganhar/extension-warning-fix 
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
 2013-12-18 01:48:14 -08:00
boyu0 e07c4ffec1 Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
James Chen 589b71eecf Merge pull request #4530 from samuele3hu/developConversion 
issue #3402:Add the new label lua binding and the releated test cases
 2013-12-18 01:16:47 -08:00
James Chen ddc1328e6b Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better. 2013-12-18 17:01:57 +08:00
James Chen 7719c692b8 More warning fixes. 2013-12-18 16:03:07 +08:00
James Chen 581ba49399 Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-18 15:41:57 +08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
James Chen 7ea455d440 Merge pull request #4528 from CocosRobot/updategeneratedsubmodule_1387349526 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-17 22:59:48 -08:00
samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-18 14:58:35 +08:00
CocosRobot 8f1e94471e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 06:52:09 +00:00
James Chen 7a5074652c Merge pull request #4526 from samuele3hu/LuaConversion 
Add  support for unsigned short
 2013-12-17 22:43:42 -08:00
James Chen 4c7d63bb28 Merge pull request #4527 from Dhilan007/new_renderer 
update vs project for new renderer and fix compiling fail on vs.
 2013-12-17 22:41:29 -08:00
Dhilan007 2d9b7ee4fc update vs project for new renderer and fix compiling fail on vs. 2013-12-18 14:36:49 +08:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
samuele3hu 4d4b96ba30 issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
Ricardo Quesada ad66f7ac41 Merge pull request #4525 from ricardoquesada/renderer_files_with_cc 
Renderer files with cc
 2013-12-17 19:17:50 -08:00
Ricardo Quesada 24f89ac45c Revert... android platform is 10 2013-12-17 19:07:28 -08:00
Ricardo Quesada 156f69c528 Renderer is subclass of Object again... needed for Android. 
ouch
 2013-12-17 19:06:22 -08:00
Ricardo Quesada 5c9b8db0cb Updates project files file Linux and Android 2013-12-17 18:47:46 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
James Chen b9625cbdfc Merge pull request #4521 from dumganhar/develop 
[scripting] Ignores Director::getRenderer for bindings.
 2013-12-17 18:17:23 -08:00