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

28954 Commits

Author SHA1 Message Date
CocosRobot 870eb7519b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-16 06:34:18 +00:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8 
V3 remove WP8 project files
 2015-04-16 14:32:11 +08:00
xiaofeng11 54dd0651ff Merge pull request #18 from pipu/Serialize_attribute_children 
Modify that serialize attribute "Children".
 2015-04-16 14:04:56 +08:00
pipu d1dcf3f620 Modify that serialize attribute "Children". 2015-04-16 13:58:01 +08:00
minggo d9d379bcc1 Merge pull request #11454 from CocosRobot/update_lua_bindings_1429150658 
[AUTO]: updating luabinding automatically
 2015-04-16 13:57:31 +08:00
CocosRobot f1bd23aa32 [AUTO]: updating luabinding automatically 2015-04-16 02:19:38 +00:00
minggo 29de9d397f Merge pull request #11445 from andyque/improve-the-arguments 
make scrollview time arguments more meaningful
 2015-04-16 10:14:11 +08:00
minggo 1803822465 Merge pull request #11446 from super626/v3 
Fix PU clone bug
 2015-04-16 10:13:37 +08:00
minggo d04e05e943 [ci skip]update CHANGELOG 2015-04-16 10:12:12 +08:00
minggo c7e41e1045 Merge pull request #11451 from WenhaiLin/v3-jni-string 
Fixed JNI illegal start byte error
 2015-04-16 10:00:22 +08:00
minggo 458aa0028b Merge pull request #11450 from jianglong0156/v3 
uiWebView constructor add CC_CONSTRUCTOR_ACCESS
 2015-04-16 09:58:23 +08:00
minggo 2b82c0c837 Merge pull request #11442 from xiaofeng11/v3 
Fix action timeline bug
 2015-04-16 09:34:45 +08:00
Dale Stammen d71655717b Update README.md 2015-04-15 10:23:49 -07:00
Dale Stammen 731d7faf07 remove wp8 from cpp templates 2015-04-15 10:01:41 -07:00
Dale Stammen b1c9c34c19 added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:19:38 -07:00
Dale Stammen 01135f892f fixed typo 2015-04-15 09:19:17 -07:00
Dale Stammen 7d22e49642 only needed if _MSC_VER < 1900 2015-04-15 09:18:48 -07:00
Dale Stammen 68430ce4fa added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:18:23 -07:00
Dale Stammen 04c3cfdc01 update version to v3-deps-41 2015-04-15 08:35:38 -07:00
Dale Stammen 081b9ccac2 updated freetype include path 2015-04-15 08:20:03 -07:00
Dale Stammen c9eb2790be updated chipmunk and freetype libs 2015-04-15 08:08:18 -07:00
Dale Stammen eb07142427 removed WP8 jenkins slave script 2015-04-15 07:18:13 -07:00
Dale Stammen 911f8f6f8a removed WP8 UIEditBox project files 2015-04-15 07:16:39 -07:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
Wenhai Lin 2dd88e8be5 Fixed JNI illegal start byte error 2015-04-15 18:20:52 +08:00
jianglong0156 8f8599a49b uiWebView constructor add CC_CONSTRUCTOR_ACCESS 2015-04-15 17:54:09 +08:00
yangxiao 4236d973c0 reset submodule and modify changelog 2015-04-15 16:53:05 +08:00
yangxiao 6b50bc430a Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-04-15 16:44:40 +08:00
andyque 96f8842ee1 make scrollview time arguments more meaningful 2015-04-15 16:37:11 +08:00
XiaoFeng dc0feb2771 Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3 2015-04-15 16:29:34 +08:00
XiaoFeng 9bba472c78 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-15 16:26:54 +08:00
yangxiao ebcd4daf6a merge cocos 2015-04-15 16:19:07 +08:00
xiaofeng11 a8fcaf4f4f Merge pull request #17 from geron-cn/xiaov3 
fix actiontimeline step over frame when (noloop play && timespeed>1)
 2015-04-15 13:41:49 +08:00
geron-cn 7b376fd384 fix action timeline step over frame when no (loop play && timespeed>1) 2015-04-15 13:32:04 +08:00
XiaoYang 56276458b6 Merge pull request #306 from songchengjiang/v3 
enable users to clone PUParticleSystem3D
 2015-04-15 13:24:54 +08:00
songchengjiang f8f18cc026 enable users to clone PUParticleSystem3D 2015-04-15 12:44:03 +08:00
minggo d54ddbd010 Merge pull request #11440 from WenhaiLin/v3-TextFieldTTFDefaultTest 
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
 2015-04-14 22:36:32 +08:00
minggo 440d70f44b Merge pull request #11438 from andyque/removeUnusedFocusTest 
remove listview focus test
 2015-04-14 18:26:32 +08:00
minggo bf7a9bf1b2 [ci skip]update AUTHORS 2015-04-14 18:13:32 +08:00
minggo 7060af7fa7 [ci skip]update CHANGELOG 2015-04-14 18:11:09 +08:00
minggo 60ef01b870 Merge pull request #11394 from giginet/intersects-circle 
Implement Rect::intersectsCircle
 2015-04-14 18:10:16 +08:00
WenhaiLin 5f4fd20b06 TextFieldTTFDefaultTest: Fixed can't take input from the keyboard. 2015-04-14 18:04:35 +08:00
minggo b10b9f20a7 Merge pull request #11437 from CocosRobot/update_cocosfiles_1429005136 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-14 17:55:55 +08:00
minggo 52c5b4dd6e Merge pull request #11436 from CocosRobot/update_lua_bindings_1429002458 
[AUTO]: updating luabinding automatically
 2015-04-14 17:54:27 +08:00
CocosRobot b7065407fc [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-14 09:52:18 +00:00
minggo 561123d4cc [ci skip]update CHANGELOG 2015-04-14 17:49:17 +08:00
andyque 3c3d76fd9e remove listview focus test 2015-04-14 17:48:43 +08:00
minggo f4aea9fa13 Merge pull request #11433 from andyque/update-external-versoin-v3 
update external to v39
 2015-04-14 17:48:33 +08:00
CocosRobot 66fcba02b1 [AUTO]: updating luabinding automatically 2015-04-14 09:10:16 +00:00
minggo caf308f061 Merge pull request #11431 from CocosRobot/update_lua_bindings_1429000943 
[AUTO]: updating luabinding automatically
 2015-04-14 17:03:10 +08:00