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

1073 Commits

Author SHA1 Message Date
CaiWenzhi 18f411fd1e Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-08 11:36:59 +08:00
minggo 56d7da8933 Merge pull request #4130 from ricardoquesada/love_in_textfield 
[ci skip]More std::string& usage
 2013-11-07 19:14:35 -08:00
minggo 109adaf337 Merge pull request #4103 from luisparravicini/issue-2882 
[ci skip]added | operator for Control::EventType
 2013-11-07 18:59:33 -08:00
minggo d1f94e0d9d Merge pull request #4111 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-11-07 18:51:15 -08:00
minggo 167242e540 Merge pull request #4127 from Dhilan007/ANCHOR_XXX 
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
 2013-11-07 18:45:50 -08:00
Ricardo Quesada ffd4342548 Adds more strings 
and more `override`
and fixes some indetentation issues
 2013-11-07 12:42:16 -08:00
Dhilan007 916361af3f Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc. 2013-11-07 23:40:33 +08:00
CaiWenzhi cbb9c655d9 fixed bugs 2013-11-07 21:10:48 +08:00
boyu0 cee966e284 issue #2771: fix build error 2013-11-07 19:24:15 +08:00
boyu0 3e8871f2c9 issue #2771: delete some unfinished PhysicsTest and change subtitle 2013-11-07 17:53:30 +08:00
boyu0 e278ad66c8 issue #2771: change PhysicsJoint::create() to PhysicsJoint::construct() 2013-11-07 17:46:05 +08:00
boyu0 7363be0697 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-07 17:37:33 +08:00
CaiWenzhi e2249c8c3f Fixed crash 2013-11-07 17:15:52 +08:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
boyu0 ef5440f738 issue #2771: change rayCast and rectQuery callback class to std::function 2013-11-07 16:23:50 +08:00
CaiWenzhi 7163dd4d76 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-06 18:13:51 +08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
2youyou2 fcf0b1ef5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-06 16:06:37 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
boyu0 75dd32cde9 issue #2771: fix physics test compile error 2013-11-06 14:34:27 +08:00
James Chen c364c4f083 issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +08:00
Luis Parravicini 8b1d3af720 added | operator for Control::EventType 2013-11-05 23:55:24 -03:00
boyu0 af129e25f0 issue #2771: change some coding style 2013-11-05 20:02:58 +08:00
2youyou2 16c23d0ad3 remove CC_PROPERTY and CC_SYNTHESIZE. 2013-11-05 19:53:38 +08:00
boyu0 8c62bf813f issue #2771: enhance API and add Slice demo 2013-11-05 15:54:33 +08:00
2youyou2 3eef64c3b8 1. Change NULL to null 
2. Remove CocoStudio/Armature files
 2013-11-05 15:32:13 +08:00
2youyou2 b076711b69 fix compile error 2013-11-05 13:42:27 +08:00
James Chen edb1fc7822 [cmake] Deletes .icf files. 2013-11-04 21:03:09 +08:00
James Chen 733197fa65 [cmake] copy resources works. 2013-11-04 21:03:08 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
James Chen e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
James Chen 8cdd1af982 HelloCpp CMakeLists.txt 2013-11-04 21:03:07 +08:00
minggo d1c02e6faa Merge pull request #4078 from minggo/iss3108-signed_char 
closed #3108: add -fsigned-char to make char to signed as default on Android arm architecture
 2013-11-03 22:37:37 -08:00
boyu0 00acd67ff3 issue #2771: finish OneWayPlatform demo and fix some bugs 2013-11-04 14:36:38 +08:00
minggo f6d82d21d2 closed #3108: add -fsigned-char to make char to signed as default 2013-11-04 10:48:45 +08:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical 
issue #2771: physical
 2013-11-03 18:40:14 -08:00
James Chen 8f213420eb closed #3106: Update NewEventDispatcherTest.cpp. 2013-11-02 22:05:04 +08:00
James Chen 7dc6513687 Adding more tests for EventDispatcherTest. 2013-11-02 21:47:00 +08:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
James Chen b751c41498 [Android] Updating Android.mk for JSB projects. 2013-11-01 18:27:47 +08:00
James Chen e893ae5697 Using namespace std; for AssetsManagerTest. 2013-11-01 18:27:09 +08:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
James Chen 9fad8bfc8d Don't set debug flag in AndroidManifest.xml. 2013-11-01 17:02:35 +08:00
boyu0 2f67ceb495 issue #2771: fix some code style 2013-11-01 16:26:03 +08:00
James Chen a04d1acede Fix of compilation errros of SimpleGame. 2013-11-01 15:19:51 +08:00
boyu0 b2951b70ff issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +08:00
2youyou2 a9054ba14a 1.add method to set collider filter 2013-11-01 14:36:44 +08:00