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

28769 Commits

Author SHA1 Message Date
yinjimmy 1e32322350 revert runtime files 2015-04-17 18:26:47 +08:00
yinjimmy 5589796029 Merge branch 'v3' into lua_runtime 2015-04-17 15:27:04 +08:00
minggo 5d5fa3d618 Merge pull request #11468 from andyque/fix-v3-readme-jenkins-status 
remove wp8 jenkins status from README
 2015-04-16 18:25:42 +08:00
minggo d24247a833 [ci skip]update CHANGELOG 2015-04-16 18:21:56 +08:00
andyque 3ff18b0c3e remove wp8 jenkins status from README 2015-04-16 18:20:02 +08:00
minggo 83b9975578 [ci skip]update CHANGELOG 2015-04-16 18:17:37 +08:00
minggo 3c7d5afce2 Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix 
Fix crash when play streamed MP4 file.
 2015-04-16 18:16:28 +08:00
minggo 814cb9224b Merge pull request #11462 from andyque/disable-v2-build-trigger 
Disable v2 build trigger
 2015-04-16 18:01:26 +08:00
minggo d7c4ca6102 Merge pull request #11467 from andyque/fix-wp8-compile-error 
remove unneeded wp8 related files
 2015-04-16 18:00:14 +08:00
andyque 74e762cf94 remove unneeded wp8 related files 2015-04-16 17:45:15 +08:00
minggo bb7679979c [ci skip]update CHANGELOG 2015-04-16 16:34:41 +08:00
WenhaiLin fc75f46abb Fix crash when play streamed MP4 file. 2015-04-16 16:27:09 +08:00
minggo 408d164fea Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization 
fix side effect of ui::button clone
 2015-04-16 16:15:25 +08:00
andyque df1703375c fix wrong indentation 2015-04-16 15:51:08 +08:00
andyque 68f86adab1 disable comment job trigger for v2 branch 2015-04-16 15:28:09 +08:00
andyque fdb03f150d don't trigger for v2 build 2015-04-16 15:28:08 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
minggo 0e7c096201 Merge pull request #11455 from xiaofeng11/v3 
Fix won't load child bug
 2015-04-16 14:37:22 +08:00
minggo 7c85db9288 Merge pull request #11456 from CocosRobot/update_cocosfiles_1429166057 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-16 14:36:57 +08:00
minggo b4acf1beb8 [ci skip]update CHANGELOG 2015-04-16 14:35:10 +08:00
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
yangxiao ebcd4daf6a merge cocos 2015-04-15 16:19:07 +08:00