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

2203 Commits

Author SHA1 Message Date
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
minggo 20e3a61524 Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2 
mac custom font fix v2
 2014-07-25 11:38:38 +08:00
minggo b0c922d91e Merge pull request #7188 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Add new file&directory apis into FileUtils and test cases
 2014-07-24 22:18:10 +08:00
Sergey 92ac809bfe Mac fonts tests 2014-07-24 12:27:17 +04:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
andyque 21f1624462 minor fix of RichText 2014-07-23 14:10:00 +08:00
minggo 524d9cb8af Merge pull request #7552 from andyque/fixScale9Sprite 
fix scale9Sprite addChild zorder issue
 2014-07-22 18:39:04 +08:00
andyque 1f4c289db4 fix scale9Sprite addChild zorder issue 2014-07-22 16:26:40 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
pandamicro d2c6602dea Refactor #5580: Merge createDirectories to createDirectory 2014-07-21 16:51:48 +08:00
Huabing.Xu e666ab88ed fix windows compile error 2014-07-21 14:59:47 +08:00
minggo aef1e01ce5 Merge pull request #7518 from natural-law/android-dependencies 
Android dependencies
 2014-07-18 17:57:42 +08:00
minggo 21647839b6 Merge pull request #7515 from Dhilan007/v3-320final 
fixed warn and replace 'printf' with 'log';
 2014-07-18 13:56:54 +08:00
LinWenhai c10e49201d fixed compil 2014-07-18 13:44:07 +08:00
Dhilan007 5d22bca240 fixed warn and replace 'printf' with 'log'; 2014-07-18 10:20:37 +08:00
Dale Stammen 88da5d5fdb disabled custom shader tests for WP8 2014-07-17 08:13:49 -07:00
andyque 7ff78c61ba fix richText UTF8 2014-07-17 18:36:09 +08:00
minggo 578af01ef1 Merge pull request #7499 from andyque/fixRichTextUTF8 
fix richText utf8 error
 2014-07-17 17:57:41 +08:00
andyque fc2ab110cc fix richText utf8 error 2014-07-17 17:58:40 +08:00
zhangcheng 6d0bf8e143 Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash 2014-07-17 17:25:32 +08:00
zhangcheng 24d87ad05b 1. fixes ActionManagerEx crashes. 2014-07-17 17:24:41 +08:00
minggo c482e2e14f Merge pull request #7491 from Dhilan007/v3-320final 
fixed text line wrap issue in UITextField.
 2014-07-17 16:48:41 +08:00
minggo d28fdb6752 Merge pull request #7490 from geron-cn/chukongv3 
fix bug: cpp-test  binary load test crash
 2014-07-17 16:38:45 +08:00
Dhilan007 8ac1398037 fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
geron-cn 4e9a710053 fix binary test crash bug 2014-07-17 16:16:49 +08:00
geron-cn 441f0ebca8 fix binary test crash bug 2014-07-17 16:13:12 +08:00
geron-cn 1a2caaeebf fix binary test crash bug 2014-07-17 16:09:17 +08:00
geron-cn 8212ed3822 fix binary test crash bug 2014-07-17 16:01:03 +08:00
samuele3hu e975b0d5f9 Update experimental lua bindings、related test cases and project setting 2014-07-17 14:54:34 +08:00
samuele3hu ab0fe54d32 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 14:11:15 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
minggo 2b3fbd743a Merge pull request #7478 from Dhilan007/v3-320final 
update test case of game controller[lua]
 2014-07-17 13:37:49 +08:00
minggo c6349ef246 Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix 
disable FastTileMapTest on WP8
 2014-07-17 13:35:52 +08:00
samuele3hu 5682a983bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 12:57:31 +08:00
vision c29766a4ad disable FastTileMapTest on WP8 2014-07-17 12:56:58 +08:00
samuele3hu eb8d1d70f7 Update the FastTileMapTest and VideoPlayerTest 2014-07-17 12:55:28 +08:00
Dhilan007 6429cf06fb update test case of game controller[lua] 2014-07-17 11:26:26 +08:00
minggo e58626c11c Merge pull request #7476 from Dhilan007/v3-gc0717 
Fixed bugs[Ouya controller]
 2014-07-17 11:12:31 +08:00
Dhilan007 1ff937aa48 Fixed bugs[Ouya controller]: 
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
 2014-07-17 11:09:08 +08:00
minggo 5a5b245e84 Merge pull request #7474 from andyque/fixFastTileMap 
change FastTiledMap namespace to cocos2d::experimental
 2014-07-17 10:52:40 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
minggo 4c7d777f25 Merge pull request #7471 from visiblelight/wp8_shader_update 
Wp8 shader update
 2014-07-17 10:14:54 +08:00
vision 40951d586c update 2014-07-17 10:10:33 +08:00
vision c47d844d20 update the buildin shaders on WP8. Disable the effect 3d test. 2014-07-17 10:08:49 +08:00
samuele3hu ce4f5f0e96 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 10:02:16 +08:00
minggo a653d0eb28 Merge pull request #7440 from boyu0/add_utils_atof 
Add utils::atof(), fix bug: particle not shown on android.
 2014-07-17 09:59:15 +08:00
samuele3hu d6d182cb59 Fix the action can’t be triggered in the TriggerTest 2014-07-16 23:18:10 +08:00
samuele3hu b782814b4b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-16 22:08:48 +08:00
samuele3hu 1b2d389011 Update ListViewEventType for Lua 2014-07-16 17:18:01 +08:00
zhangcheng 80de57be39 1、 fixes lua TriggerTest bug. 2014-07-16 14:50:35 +08:00
zhangbin 7e7c3a1e55 Merge branch 'v3' into android-dependencies 2014-07-16 13:49:20 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
andyque 714048059c fix loading bar switch loading method issue 2014-07-15 17:03:35 +08:00
samuele3hu 19cc5b9c4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 13:34:46 +08:00
samuele3hu 15a7ab8450 Update the TextureAsyncTest 2014-07-15 13:33:36 +08:00
andyque 52596dc97f fix Text line wrap issue 2014-07-15 11:46:53 +08:00
samuele3hu 55e77d8fd2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 11:34:57 +08:00
samuele3hu 3ab7520667 Delete SceneEditorTest from ExtensionTest and add related binary loading to CocoStudioSceneTest 2014-07-15 11:34:24 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
samuele3hu b3bfa87f51 Fix the TMXOrthoFlipRunTimeTest bugs. 2014-07-14 18:30:59 +08:00
samuele3hu f1ed090f4f Fix the OpenGLTest display bugs. 2014-07-14 18:30:02 +08:00
minggo 6d063fb97b Merge pull request #7431 from andyque/addTextFieldTTFTest 
add TextField TrueTypeFont tests
 2014-07-14 16:31:36 +08:00
minggo 7f68bdf179 Merge pull request #7434 from samuele3hu/v3_hot_fix 
Fix the crash that CocoStudioGuiTest in the Linux platform and error display than Sprite3DTest
 2014-07-14 16:26:42 +08:00
samuele3hu 4cb6c1c74f Add lua bindings for TextureCache::addImageAsync and update the related test cases 2014-07-14 16:05:48 +08:00
Dhilan007 a5317dde87 fixed using the incorrect res in test case of 'TextureMemoryAlloc'. 2014-07-14 15:50:20 +08:00
samuele3hu 5f453d0105 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-14 15:32:03 +08:00
samuele3hu ace0d05bd4 Fix the crash that CocoStudioGuiTest in the Linux platform and errors than Sprite3DTest 2014-07-14 15:28:52 +08:00
andyque 4fe3723edf add TextField TrueTypeFont tests 2014-07-14 14:29:28 +08:00
Dhilan007 8949d90212 update test case of new label[lua]. 2014-07-14 13:48:28 +08:00
zhangbin b0c465d96b Adjust the dependencies between modules on android. 2014-07-14 09:48:16 +08:00
minggo 3b59b41116 3D:Sprite3D -> Node:Sprite3D 2014-07-12 22:26:46 +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
samuele3hu 9c7999d1c2 Fix the tests-lua crash on windows platform 2014-07-11 18:13:08 +08:00
samuele3hu 3c8dc7a596 Update the cocos2d.ini config 2014-07-11 17:21:55 +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
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
samuele3hu 82070e5205 Remove glView setting form cpp to lua script 2014-07-11 15:34:56 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
andyque 74772e97c9 fix linux compile error 2014-07-11 14:17:57 +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
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 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
samuele3hu 2cbe262842 Add newline for some files 2014-07-11 12:00:43 +08:00
samuele3hu dd76ae93f6 Update controller lua binding and related test cases 2014-07-11 11:52:05 +08:00
Dhilan007 900d4b36fc Enabled nibiru\moga\ouya controller support. 2014-07-11 09:57:26 +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
minggo e876065d3e Merge pull request #7229 from samuele3hu/v3_VideoPlayer 
Add VideoPlayer Lua bindings and update bindings-generator submodule
 2014-07-10 22:04:46 +08:00
minggo 4895e6d54a Merge pull request #7362 from geron-cn/chukongv3 
Chukongv3
 2014-07-10 21:17:19 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
andyque eec40ff2a8 fix linux and android compile 2014-07-10 16:37:15 +08:00
andyque 6de47ea53a update ccs-res and add custom ImageView and custom particle widget support 2014-07-10 16:37:15 +08:00
andyque afe5e7527a update cocostudio resource path 2014-07-10 16:37:15 +08:00
andyque 8b42eb4ce9 add Cocostudio 1.3,1.4, 1.5 ui tests 2014-07-10 16:37:15 +08:00
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
andyque 937b0ab52a add cocostudio parser test template 2014-07-10 16:37:15 +08:00
minggo 831b0b332b Merge pull request #7371 from minggo/enumerateChildren-fix 
Node::enumerateChildren  just searches from itself
 2014-07-10 15:46:04 +08:00
minggo c7856b21fd Merge pull request #7366 from Dhilan007/v3-fixed-warn 
fixed warn and replace NULL with nullptr.
 2014-07-10 15:42:02 +08:00
gero 01e1508239 Merge pull request #3 from cocos2d/v3 
merge V3
 2014-07-10 11:33:59 +08:00