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

14281 Commits

Author SHA1 Message Date
yinkaile c02272ade3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-19 15:44:05 +08:00
yinkaile 140bd2ecad fixed armature position not right 2013-12-19 15:43:32 +08:00
Ricardo Quesada c38ad6db38 Merge pull request #4554 from ricardoquesada/const_in_test 
Adds const in ShaderTest2.h
 2013-12-18 21:16:17 -08:00
Ricardo Quesada 2d2a6b205d Adds const in ShaderTest2.h 
Adds const in ShaderTest2.h
 2013-12-18 21:15:47 -08:00
Ricardo Quesada 1ed37df37f Merge pull request #4553 from ricardoquesada/skew_fixes 
Skew works again!
 2013-12-18 21:11:47 -08:00
Ricardo Quesada 1d3cc7a24c Skew works again! 2013-12-18 21:11:06 -08:00
James Chen c10e32002c Merge pull request #4552 from CocosRobot/updategeneratedsubmodule_1387426744 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 20:48:36 -08:00
CocosRobot ac24dec620 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 04:19:07 +00:00
James Chen 113fa9924e Merge pull request #4550 from dumganhar/merge-pr-4532 
Merge pr 4532
 2013-12-18 20:12:18 -08:00
James Chen 3c4ad03a8f Merge pull request #4551 from CocosRobot/updategeneratedsubmodule_1387425519 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 20:12:03 -08:00
CocosRobot 403315e315 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 03:58:41 +00:00
James Chen f8b7d70d92 Reverts submodule. 2013-12-19 11:53:56 +08:00
James Chen 4fbd179174 Merge pull request #4549 from dumganhar/binding-generator-update 
Updates submodule of bindings-generator.
 2013-12-18 19:52:24 -08:00
James Chen c14754b720 Updates submodule of bindings-generator. 2013-12-19 11:50:45 +08:00
James Chen d31c1457b1 Merge pull request #4546 from Dhilan007/update_vsProject 
update vs project for removes unneeded files
 2013-12-18 19:30:21 -08:00
Ricardo Quesada 8f8e904fb9 Merge pull request #4548 from ricardoquesada/perf_tests 
Adds `std::for_each` test in invocation
 2013-12-18 19:29:02 -08:00
Ricardo Quesada c044a91f6e Adds `std::for_each` test in invocation 
and removes CArray and CMacro tests
 2013-12-18 19:28:09 -08:00
James Chen 6c705971b0 Reverts bindings-generator. 2013-12-19 11:22:45 +08:00
James Chen 75b5edb66c Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test 2013-12-19 11:16:03 +08:00
yinkaile a6a432d2a2 fixed not render 2013-12-19 10:42:06 +08: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
Dhilan007 ffa6ad3cb2 update vs project for removes unneeded files 2013-12-19 10:24:50 +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
byeonggee.seo e673bd80bb new spine runtime applied 2013-12-19 10:50:37 +09: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
yinkaile 93eaf44e9c Merge branch 'develop' into Array 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-19 09:42: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
yinkaile 324732b867 change play arguments 2013-12-18 23:29:54 +08:00
yinkaile 7be834ea37 change play arguments 2013-12-18 22:57:18 +08:00
boyu0 d0b039ceda fix compile errors. 2013-12-18 22:44:03 +08:00
yinkaile 57c33e0604 fixed compile error 2013-12-18 22:36:10 +08:00
yinkaile d3a575e8cc change for iterator and callfunc 2013-12-18 22:07:33 +08:00
yinkaile 026811ca59 Merge branch 'develop' into Array 
Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
 2013-12-18 22:03:16 +08:00
boyu0 71be55a9aa revert AccelerometerSimulation.m 2013-12-18 19:02:49 +08:00