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

4817 Commits

Author SHA1 Message Date
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
boyu0 7fd0ca217c Implement utils::atof() 2014-07-14 20:42:08 +08:00
minggo 981922eb95 Merge pull request #7432 from joshuastray/transition_ctor_access 
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
 2014-07-14 16:28:18 +08:00
samuele3hu 4cb6c1c74f Add lua bindings for TextureCache::addImageAsync and update the related test cases 2014-07-14 16:05:48 +08:00
joshuastray 98b1c0bbed add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
joshuastray e14c2587b5 move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
minggo 92cfe90937 Merge pull request #7424 from kyokomi/bugfix_UITextField_ttfFont 
Fix the bug that UITextField doesn't support TTF font
 2014-07-14 13:57:54 +08:00
Dhilan007 b3017fb773 fixed crash cause by incorrect font name. 2014-07-14 10:01:29 +08:00
kyokomi 915bdae4a6 Fix the bug that UITextField doesn't support TTF font 2014-07-12 22:42:44 +09:00
minggo 7c43b59c6b Merge pull request #7422 from minggo/get-curent-language 
return correct language type
 2014-07-12 20:45:05 +08:00
minggo bf4b376ae5 return correct language type 2014-07-12 20:40:15 +08:00
minggo cfc291e49d Merge pull request #7379 from joshuastray/v3 
move JumoTo's copy constuctor and operator= to private
 2014-07-12 20:19:03 +08:00
minggo 5c26dc5db4 Merge pull request #7417 from geron-cn/chukongv3 
fix bug: crash in ui csbs
 2014-07-11 20:37:51 +08:00
geron-cn 64408a5d8f fix bug: crash in ui csbs 2014-07-11 19:02:14 +08:00
minggo 05b485cd41 Merge pull request #7407 from visiblelight/fix_wp8_errors 
Fix compile errors on WP8
 2014-07-11 18:51:23 +08:00
minggo 86e5b37f16 Merge pull request #7413 from CocosRobot/update_lua_bindings_1405071955 
[AUTO]: updating luabinding automatically
 2014-07-11 18:50:58 +08:00
minggo 8cdbe5a019 Merge pull request #7412 from Dhilan007/v3-320final 
fixed warning: deleting pointer to incomplete type.
 2014-07-11 18:50:25 +08:00
CocosRobot 87aaf7dcef [AUTO]: updating luabinding automatically 2014-07-11 09:48:20 +00:00
Dhilan007 d2e8154dc3 fixed warning: deleting pointer to incomplete type. 2014-07-11 17:45:15 +08:00
minggo 7308668e63 Merge pull request #7411 from minggo/warning-fix 
fix warnings
 2014-07-11 17:42:12 +08:00
minggo ecb915fabf fix warnings 2014-07-11 17:39:56 +08:00
samuele3hu 01c3f2a4ed Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
 2014-07-11 16:44:59 +08:00
samuele3hu d1bd21b1db Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:17:51 +08:00
samuele3hu d9291031cd Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:10:42 +08:00
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
samuele3hu 54970c109f Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 15:34:21 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo c63983345b Merge pull request #7353 from andyque/addStudio1.4 
add studio v1.3, v1.4, v1.5 tests
 2014-07-11 14:15:07 +08:00
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
minggo 41c267fdb7 Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491 
[AUTO]: updating luabinding automatically
 2014-07-11 13:52:38 +08:00
CocosRobot 563386a777 [AUTO]: updating luabinding automatically 2014-07-11 05:46:37 +00:00
minggo f205c0b704 Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build 
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
 2014-07-11 13:41:33 +08:00
minggo d1d84e0d1f Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError 
1. fixes TextReader load default font error.
 2014-07-11 13:40:16 +08:00
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 72f8ab8483 Merge pull request #7395 from samuele3hu/v3_controller 
Add Lua bindings for controller and related test case project
 2014-07-11 13:39:30 +08:00
minggo 65404066ec Merge pull request #7396 from CocosRobot/update_lua_bindings_1405051544 
[AUTO]: updating luabinding automatically
 2014-07-11 13:37:55 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
minggo 7cf8cf42d3 Merge pull request #7389 from Dhilan007/v3-gc-nibiru 
Update Nibiru SDK and remove prompt box of install driver .
 2014-07-11 13:36:19 +08:00
CocosRobot 20c4e6530d [AUTO]: updating luabinding automatically 2014-07-11 04:07:14 +00:00
minggo a0b16a29d1 Merge pull request #7394 from Dhilan007/v3-gc-annotation 
Add annotation for Controller class.
 2014-07-11 12:03:01 +08:00
samuele3hu 2cbe262842 Add newline for some files 2014-07-11 12:00:43 +08:00
samuele3hu 77a82731a5 Remove auto bindings files for controller 2014-07-11 11:57:40 +08:00
samuele3hu 9b9713073e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 2014-07-11 11:55:10 +08:00
samuele3hu dd76ae93f6 Update controller lua binding and related test cases 2014-07-11 11:52:05 +08:00
Dhilan007 4e4464c9c1 Add annotation for Controller class. 2014-07-11 10:56:09 +08:00
Jason Xu d94941243a Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed 2014-07-11 10:27:00 +08:00
yangxiao fd8541e32d rename Bone to Bone3D 2014-07-11 10:17:36 +08:00
samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/scripting/lua-bindings/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
	tools/tolua/genbindings.py
 2014-07-10 22:42:09 +08:00
Dhilan007 dfbeb0fb63 Update Nibiru SDK and remove prompt box of install driver . 2014-07-10 22:33:58 +08:00