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

13698 Commits

Author SHA1 Message Date
Ricardo Quesada 2f1dffe46b Adds performFunctionInCocos2dThread 
... in Scheduler
 2013-11-26 16:58:14 -08:00
Ricardo Quesada 4a59cc6297 Merge pull request #4387 from ricardoquesada/build_type_conf 
Reports wether the build is DEBUG or RELEASE
 2013-11-26 14:37:33 -08:00
Ricardo Quesada b7f7b0dae4 Reports wether the build is DEBUG or RELEASE 
Reports wether the build is DEBUG or RELEASE in Configuration
 2013-11-26 14:36:31 -08:00
James Chen f6a1f5cc95 issue #3279: A warning fix for 64bit platform. 2013-11-26 21:54:48 +08:00
James Chen ecc7783685 closed #3279: XMLHttpRequest receives wrong binary array. 2013-11-26 20:31:44 +08:00
James Chen 770b806216 Merge pull request #4380 from minggo/remove-unneeded-codes 
remove unneeded codes
 2013-11-26 03:04:04 -08:00
boyu0 8346fe4b4d issue #2771: edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX 2013-11-26 18:22:52 +08:00
minggo fcf43823b4 remove unneeded codes 2013-11-26 17:53:34 +08:00
minggo ba101809de [ci skip] 2013-11-26 17:49:50 +08:00
minggo 6c7cb0bf23 Merge pull request #4359 from Dhilan007/androdi_build 
[ci skip]add proceed java compilation and generate apk.
 2013-11-26 01:47:14 -08:00
James Chen 888fd73702 Update AUTHORS 2013-11-26 17:44:24 +08:00
James Chen 23de9bf8cd Merge pull request #4378 from hulefei/dev_addGuiNamespace 
add gui namespace before SEL_TouchEvent
 2013-11-26 01:43:36 -08:00
boyu0 0100c05a93 issue #2771: fix compile errors 2013-11-26 17:29:09 +08:00
hanson d650c0a6a1 add gui namespace before SEL_TouchEvent 2013-11-26 17:03:01 +08:00
James Chen 1a34ce2a9b Merge pull request #4376 from CocosRobot/updategeneratedsubmodule_1385454978 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-26 00:45:25 -08:00
CocosRobot 17c4631f45 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-26 08:36:22 +00:00
James Chen 999b7ccd07 Merge pull request #4375 from dumganhar/constructors_are_protected 
issue #3258: Merge PR #4351: Constructors are protected
 2013-11-26 00:30:06 -08:00
James Chen a04c45f0d9 issue #3258: Renames ControlSwitchSprite::createWithMaskSprite to ControlSwitchSprite::create. 2013-11-26 16:19:12 +08:00
James Chen 63702188be issue #3258: Compilation error fix for linux port. 2013-11-26 15:56:43 +08:00
James Chen 03005173b1 issue #3258: Updates bindings-generator. 2013-11-26 15:45:09 +08:00
James Chen ebcdf2f87d issue #3258: Bug fix of MenuItemToggle binding. 2013-11-26 15:44:49 +08:00
James Chen b55e8f17c7 issue #3258: MenuItemFont has empty argument create function now. 2013-11-26 15:44:21 +08:00
James Chen 6f67447b5e issue #3258: Updates cocos2dx.ini. Adding some classes to ‘classes_need_extend’ section. 2013-11-26 15:43:39 +08:00
boyu0 99d904363a issue #2771: delete all the box2d implementation in physics parts. 2013-11-26 13:47:42 +08:00
Dhilan007 881d43fe3b add proceed java compilation and generate apk. 2013-11-26 11:58:01 +08:00
boyu0 df1fca3279 issue #2771: refactor some functions and delete PHYSICS_INFINITY macro. 2013-11-26 11:38:55 +08:00
minggo bf07077c52 Merge pull request #4361 from Dhilan007/eclipse_build_fix 
[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
 2013-11-25 19:37:03 -08:00
James Chen 3b47ab62ad Merge commit 'refs/pull/4351/head' of git://github.com/cocos2d/cocos2d-x into constructors_are_protected 2013-11-26 11:26:20 +08:00
James Chen efa37ffdf6 Merge pull request #4374 from dumganhar/iss3274-js-override 
closed #3274: [JSB] Can't override cc.Node.setPosition in JSB. Removes JSPROP_READONLY and adds JSPROP_ENUMERATE for some methods
 2013-11-25 19:08:34 -08:00
James Chen 5fbf164142 closed #3274: Can't override cc.Node.setPosition in JSB. 2013-11-26 10:14:56 +08:00
James Chen 9f6d2db8ed Update AUTHORS [ci skip] 2013-11-26 09:56:14 +08:00
James Chen 10e983707e Merge pull request #4373 from lajos/dev_macfonttest 
closed #3275: Adding FontTest for Mac
 2013-11-25 17:50:53 -08:00
Ricardo Quesada a198fb51df JS Bindings Menu 
doesn't initialize the menu twice.
 2013-11-25 16:24:33 -08:00
Ricardo Quesada b6f6e72c94 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCActionInstant.h
 2013-11-25 13:59:24 -08:00
Lajos Kamocsay 4538be2b43 FontTest was not rendering TTFs 2013-11-25 10:00:53 -05:00
boyu0 09ba28d522 issue #2771: refactor PhysicsWorld and PhysicsWorldInfo 2013-11-25 17:57:06 +08:00
signmotion 25cc4101a7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-25 10:23:50 +02:00
James Chen 9ebc4e3722 Merge pull request #4358 from samuele3hu/developTableView 
issue #3228:CallFuncND + auto remove lua test case have no effect
 2013-11-25 00:18:30 -08:00
signmotion 5f74496d7a - Reverted modification. See below. 
> @@ -301,7 +301,8 @@ void UIListView::removeLastItem()
>
>  UIWidget* UIListView::getItem(unsigned int index)
>  {
> -    if ((int)index < 0 || index >= _items->count())
> +    // @todo Signed/unsigned mishmash. Index is must be unsigned int always. Yes?
> +    if ( ((int)index < 0) || ((int)index >= _items->count()) )

May be we should change the type of parameter.
So could you please revert the modification of this file?
 2013-11-25 10:00:09 +02:00
James Chen 27b766f691 Merge pull request #4372 from dumganhar/iss3273-evalString-crash 
closed #3273: ScriptingCore::evalString crashes
 2013-11-24 23:55:26 -08:00
boyu0 805312b3d3 fix box2d compile error in ndk 2013-11-25 15:55:01 +08:00
James Chen b9fa8566f2 closed #3273: ScriptingCore::evalString crashes 2013-11-25 15:52:59 +08:00
James Chen fec15b6fe2 Merge pull request #4371 from dumganhar/develop 
Build fix for XMLHttpRequest after using std::unordered_map instead of std::map.
 2013-11-24 23:43:21 -08:00
James Chen 8574fb0494 Build fix for XMLHttpRequest after using std::unordered_map instead of std::map. 2013-11-25 15:11:43 +08:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
minggo eba059e41e Merge pull request #4368 from CocosRobot/updategeneratedsubmodule_1385345794 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-24 18:34:58 -08:00
CocosRobot a4c2ccdf65 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-25 02:16:36 +00:00
minggo f23bfcda48 Merge pull request #4366 from Dhilan007/jssubmodule 
[ci skip]issue #3261:add miss binding
 2013-11-24 18:11:38 -08:00
boyu0 f2dabe77ec issue #2771: add some method implements with box2d in PhysicsWorld 2013-11-25 10:08:52 +08:00
Dhilan007 c09f50e3f8 issue #3261:add miss binding 2013-11-24 22:47:29 +08:00