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

844 Commits

Author SHA1 Message Date
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
minggo e81efb24c9 issue #2905: android samples run ok 2013-10-23 16:49:50 +08:00
minggo 4952df576b Merge pull request #3996 from boyu0/iss2771_physical 
issue #2771: physical
 2013-10-22 20:45:55 -07:00
boyu0 17422c3123 issue #2771: fix some compile error in win32 2013-10-23 11:08:21 +08:00
boyu0 51801d9218 issue #2771: fix some compile error in android and win32 2013-10-23 10:11:08 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
boyu0 24561860f0 issue #2771: add ray cast test 2013-10-22 18:00:24 +08:00
minggo d07fbb8903 Merge pull request #3974 from boyu0/iss2771_physical 
issue 2771: physical
 2013-10-21 22:44:22 -07:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
boyu0 6e2c4801f8 Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 16:05:29 +08:00
boyu0 6aef4476d9 issue #2771: edit some mistake when merge 2013-10-18 15:55:47 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
Dhilan007 8fb0327597 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 14:57:33 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
Dhilan007 6f39f903e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:23:19 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
Dhilan007 546bc3aa32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:33:10 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
boyu0 89448135ad issue #2771: implement some joint definition. 2013-10-17 10:57:48 +08:00
Dhilan007 d82c2ca060 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 09:39:48 +08:00
Ricardo Quesada 3cbeabc777 Icons for test projects 2013-10-16 11:55:14 -07:00
Dhilan007 c6344875de Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:30:51 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
Dhilan007 3d1f734326 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 15:44:43 +08:00
James Chen 8e80f1d46a issue #2905: Reverting TestCpp/Android.mk 2013-10-16 11:22:58 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
Dhilan007 5116e91c4b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905 2013-10-16 11:00:22 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
boyu0 d1fead368d issue #2771: migrate the PhysicsBody definition 2013-10-15 16:55:08 +08:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
boyu0 5c7603e0ce issue #2771: change angular damping to moment. (these two have different meaning, change to the correct one) 2013-10-14 13:56:08 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
minggo 0130aae044 Merge pull request #3916 from boyu0/iss2771_physical 
[ci skip]issue 2771: physical
 2013-10-10 19:50:19 -07:00
boyu0 acf1d72213 issue #2771: delete #define RAND_MAX in PhysicsTest.cpp(already defined in stdlib.h) 2013-10-11 10:24:55 +08:00
minggo e90e975e3d Merge pull request #3911 from minggo/iss2905-adjust_folder 
[ci skip]SimpleAudioEngine -> audio
 2013-10-10 18:27:25 -07:00
boyu0 775a81ae19 issue #2771: Let the sprites added to SpriteBatchNode support physics. 2013-10-10 18:31:43 +08:00
minggo 6e62be5443 issue #2905: modify makefile to include correct header files 2013-10-10 17:39:53 +08:00
Dhilan007 5ea5c394e7 fix compile fail on vs2012. 2013-10-10 17:17:10 +08:00
minggo 866906fd58 issue #2905:modify project settings to include correct audio path 2013-10-10 15:40:06 +08:00
boyu0 381f904cd4 issue #2771: add PhysicsMaterial 2013-10-09 17:53:12 +08:00
boyu0 4747e37acf issue #2771: let PhysicsShape::create doesn't need to pass the PhysicsBody 2013-10-09 13:41:19 +08:00
boyu0 35259588a3 issue #2771: fix some bugs in PhysicsShape 2013-09-30 21:48:25 +08:00
boyu0 9c16a45f33 issue #2771: separate the PhysicsBody and the PhysicsShape. 2013-09-30 20:43:19 +08:00
samuelhu 01ee83364e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformace 2013-09-30 16:23:37 +08:00
samuelhu 6aa18423e6 issue #2792 : Performance Test: Sprite drawing 2013-09-30 16:22:55 +08:00
boyu0 18a4b18368 issue #2771: move _physicsBody from sprite to node 2013-09-30 13:02:17 +08:00