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

15088 Commits

Author SHA1 Message Date
James Chen 5072e63f89 issue #3577: Updates project file for mac and ios. 2014-01-04 11:41:06 +08:00
James Chen a48f561ac5 issue #3577: Adds UnitTest to controller.cpp. 2014-01-04 11:41:06 +08:00
James Chen 15029e0173 issue #3577: Includes `UnitTest.h` in tests.h. 2014-01-04 11:41:05 +08:00
James Chen 4980214d0f issue #3677: Updates Makefile. 2014-01-04 11:41:05 +08:00
James Chen 0915d4b00e issue #3577: Removes unused spaces. 2014-01-04 11:41:05 +08:00
James Chen ebf6d07720 issue #3577: iterator —> const_iterator since Map::getRandomObject is a const function. 2014-01-04 11:41:05 +08:00
James Chen f76a1f0527 issue #3577: Adds UnitTest.cpp/.h. 2014-01-04 11:41:05 +08:00
James Chen f55be38ad8 Merge pull request #4853 from Dhilan007/develop_crash 
fix label not appear on the screen
 2014-01-03 19:00:06 -08:00
James Chen 84e4bc6971 Merge pull request #4854 from CocosRobot/updategeneratedsubmodule_1388804338 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 18:59:31 -08:00
CocosRobot 0ed307a583 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 02:58:59 +00:00
Dhilan007 b14999a7a7 fix label not appear on the screen 2014-01-04 10:56:14 +08:00
James Chen 32546b58f9 Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode 
Develop nutty modify framework add node
 2014-01-03 18:53:51 -08:00
James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash 
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
 2014-01-03 18:51:16 -08:00
James Chen 61af958976 closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings. 2014-01-04 10:32:04 +08:00
James Chen baeacaddfc closed #3579: Bug fix in setTouchEnabledForLayer for luabindings. 
Also fixed lua module error.
 2014-01-04 10:30:11 +08:00
James Chen 0082cf3e4d closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time. 2014-01-04 10:28:09 +08:00
Ricardo Quesada 76960ab83a Merge pull request #4851 from ricardoquesada/node_vertex_z_fix 
Node vertex Z fix
 2014-01-03 17:55:32 -08:00
Ricardo Quesada 5a0284c183 Node vertex Z fix 
Node correctly  sets the Z vertex in getNodeToParentTransform(),
and not in transform().

This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
 2014-01-03 17:54:07 -08:00
James Chen c3c2b50c7c Merge pull request #4850 from CocosRobot/updategeneratedsubmodule_1388799616 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 17:41:53 -08:00
CocosRobot 54ee3392fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 01:40:17 +00:00
minggo 964d327db9 Merge pull request #4848 from dumganhar/more-warning-fixes 
More warning fixes.
 2014-01-03 17:31:02 -08:00
minggo 93f3545154 Merge pull request #4842 from Dhilan007/develop_crash 
update js binding for studio change.
 2014-01-03 17:29:14 -08:00
James Chen 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
Ricardo Quesada 118fe45cce Merge pull request #4847 from ricardoquesada/menu_fix 
Fixes NodeToWorld
 2014-01-03 14:24:32 -08:00
Ricardo Quesada a7b33e3ec3 Fixes NodeToWorld 
Multiplication was in the incorrect order
 2014-01-03 14:21:33 -08:00
Dhilan007 e017609fc4 fix compiling error in jsb_cocos2dx_studio_manual.cpp on android. 2014-01-03 23:59:05 +08:00
Dhilan007 b6e676caa4 fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp. 2014-01-03 23:03:48 +08:00
Dhilan007 b4d392dc38 update js binding for studio change. 2014-01-03 21:33:48 +08:00
CaiWenzhi de1c228595 Merge branch 'develop' into develop_nutty_modify_framework_addNode 2014-01-03 20:38:12 +08:00
chengstory 19489130f6 Merge branch 'develop' into #3480 2014-01-03 20:35:30 +08:00
CaiWenzhi 8c5678a59e Modify wrong codes. 2014-01-03 20:35:14 +08:00
chengstory a6b70bef83 fixed #3480 loadSceneEdtiorFileTest -> LoadSceneEdtiorFileTest 2014-01-03 20:33:07 +08:00
minggo e526a5bd34 Merge pull request #4839 from dabingnn/develop_controlswitch 
fix control switch bug
 2014-01-03 04:30:17 -08:00
CaiWenzhi 785e1740e4 Add "addNode" methods 2014-01-03 20:29:16 +08:00
chengstory 20b118739e Merge branch 'develop' into #3480 2014-01-03 20:20:18 +08:00
CaiWenzhi 24a9f57b8e Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets 2014-01-03 20:05:49 +08:00
Liam 0e42c1c369 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-01-03 19:53:23 +08:00
Huabing.Xu d75d2159dd fix control switch bug 2014-01-03 19:53:14 +08:00
James Chen 17ddb010cc Merge pull request #4836 from CocosRobot/updategeneratedsubmodule_1388748771 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 03:48:10 -08:00
chengstory 7f8224b621 Merge branch 'develop' into #3480 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
 2014-01-03 19:36:22 +08:00
CocosRobot 126c315673 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 11:32:54 +00:00
chengstory 46c7338008 fixed #3480 
1.  remove unused getnode and setnode interface.
                 2.  add condition test.
                 3.  Modify ComAttribute to support for parse json file.
                 4.  Replace scenereader callback function  to C++ 11 implement.
 2014-01-03 19:30:47 +08:00
minggo 5ad3414921 Merge pull request #4834 from minggo/bug-fix 
Put "initxx" functions into protected.
 2014-01-03 03:27:55 -08:00
CaiWenzhi a7f482fbf9 Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets 2014-01-03 19:17:26 +08:00
CaiWenzhi 3ccb80085f Fixed bugs of page view 2014-01-03 19:14:17 +08:00
chuanweizhang c22cc77c66 add cocos files list configure script 2014-01-03 19:09:13 +08:00
minggo 4fc7ad6e3d Merge pull request #4791 from dabingnn/develop_clippingNodeMobile 
fix bug clippingNodetest on mobile
 2014-01-03 02:36:52 -08:00
minggo b0c23eacf5 Don't release autoreased object. 2014-01-03 18:28:43 +08:00
minggo 1d04b42947 Put "initxx" functions into protected. 2014-01-03 18:15:56 +08:00
minggo 3a486a3591 Merge pull request #4833 from minggo/bug-fix 
Fix crash of PerformanceTest:PerformanceNodeChildrenTest
 2014-01-03 02:14:24 -08:00