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

2285 Commits

Author SHA1 Message Date
boyu0 a56dedb41a issue #2771: add class PhysicsDebugDraw 2013-11-08 14:25:03 +08:00
Huabing.Xu 6f1e98df34 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
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
Huabing.Xu bd7d62aee0 issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +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
Jason Xu b5f83c30b6 fix indention 2013-11-07 17:08:16 +08:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
Jason Xu c9f814c016 fix Accelerometer Test with missing: Device::setAccelerometerEnabled(true); 2013-11-07 16:39:41 +08:00
boyu0 ef5440f738 issue #2771: change rayCast and rectQuery callback class to std::function 2013-11-07 16:23:50 +08:00
samuele3 c055b1a3d6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-07 15:45:56 +08:00
minggo 4a691942f1 Merge pull request #4113 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch 
Merge 2.x version to 3.0 version
 2013-11-06 19:37:08 -08:00
minggo f05b79d140 remove unneeded files 2013-11-07 11:29:23 +08:00
samuele3 4536798842 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-07 10:18:38 +08:00
samuele3 6a1a774303 issue #2868:Config cocoStudio GUI lua binding files and add a few script files 2013-11-07 10:16:02 +08:00
CaiWenzhi cf20ae03ee Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 10:01:00 +08:00
James Chen d6d041f561 issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +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
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +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 c085412636 [CMake] TestLua and HelloLua is ok. 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
samuele3 3289ce8fe0 issue #3037:Modify vs2012 config 2013-11-04 14:50:23 +08:00
samuele3 ba6cf00d9b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-11-04 14:47:10 +08:00
samuele3 790be0decc issue #3037:Modify vs2012 config 2013-11-04 14:43:22 +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
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07: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
samuele3 463ed08ffe issue #3037:Modify AssetsManagerTest.lua 2013-11-01 17:29:09 +08:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08: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
James Chen db6bce4cf0 Merge pull request #4023 from samuele3hu/developHttp 
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
 2013-10-31 20:40:29 -07:00
samuelhu 5010779e39 issue #3049:Reset .project file in pro.android. 2013-11-01 11:36:06 +08:00
samuelhu f3ff7955a8 issue #3037:Modify platform build config 2013-11-01 11:18:02 +08:00
minggo f684dc0ff7 Merge pull request #4025 from Dhilan007/di2893 
issues #2893:perfect new label
 2013-10-31 18:46:30 -07:00
James Chen 074f688d95 Merge pull request #4030 from dumganhar/spv25 
[sp v25] Updating SpiderMonkey library to FFv25.
 2013-10-31 07:08:09 -07:00
samuelhu de4aaeda2d issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-31 22:06:34 +08:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
 2013-10-31 21:57:24 +08:00
samuelhu 5891f00967 issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-31 21:52:28 +08:00
Dhilan007 150f1aeaab issue #2893:improve new label 2013-10-31 20:17:30 +08:00
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
2youyou2 4eaaaddc34 upload resource 2013-10-31 17:29:03 +08:00
2youyou2 005d3c0121 1. fix if frame event is at the last frame, it may emit event several times 
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
 2013-10-31 17:28:14 +08:00
samuelhu 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-31 17:22:14 +08:00
Nite Luo 771844fc58 Fix android build after adding MouseEvent and MouseTest 2013-10-31 00:40:38 -07:00
samuelhu 705da20ee7 issue #2794:Add LuaObjectCBridge and related test sample 2013-10-31 15:26:38 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
Nite Luo 49a2acfbd4 Merge branch 'develop' into mousewheel_mac 2013-10-31 00:10:45 -07:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
James Chen 69b0206018 issue #2826: Updating vs project to link mozjs-25.lib 2013-10-31 11:24:43 +08:00
Dhilan007 12db6a32ab issues #2893: 
1.Texture atlas are create on demand, based on the characters used in the label.
  2.Create Quads (and not sprites) for each letter.
 2013-10-31 10:49:37 +08:00
samuelhu 53b0bfc27b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTouchEvent 2013-10-31 09:52:01 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
minggo 9e5420c954 Merge pull request #4029 from minggo/iss2905-adjust_folder 
use build/android-build to build android samples, and update readme
 2013-10-30 03:30:03 -07:00
minggo da9f7c912b use build/android-build to build android samples, and update readme 2013-10-30 18:27:56 +08:00
boyu0 e8d06496d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
boyu0 391cda44ef issue #2771: edit listener 2013-10-30 15:53:58 +08:00
yinkaile 80b97be6f4 update develop 2013-10-30 11:34:16 +08:00
samuelhu c08a09a7e0 #3049:Add LICENSE_JSON4LUA and some constant values. 2013-10-30 10:52:04 +08:00
yinkaile ef973b5737 upload resource 2013-10-30 09:54:05 +08:00
yinkaile 8fa8b9f844 update develop 2013-10-30 09:41:40 +08:00
samuelhu 471bbb8af9 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 18:21:15 +08:00
samuelhu b611177a65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-10-29 17:58:00 +08:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
boyu0 cae9a3e54f issue #2771: add physics pump demo and fix bugs 2013-10-29 17:31:35 +08:00
James Chen ca598f29eb Merge pull request #4008 from dumganhar/touchevent-refactor 
issue #3069: Refactor and Improve EventDispatcher
 2013-10-29 00:46:56 -07:00
James Chen cb7a762584 issue #3069: Updating EventDispatcherTest. 2013-10-29 14:59:05 +08:00
samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-29 11:45:19 +08:00
samuelhu a4d028e905 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
Michael Contento fe180078f0 Android: add xlargeScreens="true" to supports-screens 2013-10-28 23:12:51 +01:00
boyu0 66d1bbd89f issue #2771: edit physics effect with all bodies and fix some bugs 2013-10-28 16:17:19 +08:00
James Chen a829325240 issue #3069: Updating EventDispatcherTest. 2013-10-28 16:00:19 +08:00
boyu0 d0d8694091 issue #2771: fix some retain/release bugs 2013-10-28 11:08:41 +08:00
James Chen e6b0134080 issue #3069: Updating Custom event test. 2013-10-28 10:49:43 +08:00
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
James Chen 9bf44a6c83 issue #3069: Renaming 'removeListeners' to 'removeEventListeners'. 2013-10-25 16:34:26 +08:00
James Chen 27b71ba73c Use integer as event type and listener type. 2013-10-25 10:53:47 +08:00
James Chen b5cac51f97 PhysicsTest update. 2013-10-25 10:53:47 +08:00
James Chen 9c4bc9e8ed Update physicsTest. 2013-10-25 10:53:47 +08:00
James Chen 7854a13278 Small fix for Bug-422.cpp and MenuTest.cpp. 2013-10-25 10:53:47 +08:00
James Chen b131e8c509 Update menu test. 2013-10-25 10:53:46 +08:00
James Chen 9ed263056c Use eventDispatcher to dispatch event. Remove controller codes in Layer. 2013-10-25 10:53:46 +08:00
James Chen 1f3863e787 Event Dispatcher refactor commit. TestCpp could run. 2013-10-25 10:53:45 +08:00
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
Dhilan007 08960f1510 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893 2013-10-24 18:16:44 +08:00
Dhilan007 fd993e2fa2 issues #2905:split jsbinding module 2013-10-24 17:54:57 +08:00
James Chen 10329de46c Merge pull request #4002 from boyu0/iss2771_physical 
issue #2771 physical
 2013-10-24 02:31:40 -07:00
samuelhu a5e479d2bb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-24 11:14:20 +08:00
boyu0 a8ddca81bd issue #2771: fix some compile error in win32 2013-10-23 18:52:09 +08:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
boyu0 912a9a2887 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-23 17:41:52 +08:00
boyu0 899f720efa issue #2771: implement getShapeAtPoint and getShapesAtPoint 2013-10-23 17:28:23 +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
samuelhu 26caaa0a36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-23 09:57:21 +08:00
minggo 0169189f6a Merge pull request #3992 from Dhilan007/di2905 
issues #2905:add SimpleGame vs-project
 2013-10-22 18:41:26 -07:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
Dhilan007 3252a89791 issues #2905:add SimpleGame vs-project 2013-10-22 18:11:07 +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
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +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