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

19403 Commits

Author SHA1 Message Date
James Chen 3cac26ab53 Merge pull request #6573 from dumganhar/v3 
Adds submodule for CocoStudio resources (70+MB)
 2014-05-05 15:39:17 +08:00
James Chen 67b2fbf14b Updates xcode project, add ccs-res folder to Resources folder 2014-05-05 15:24:33 +08:00
James Chen 399f5cf721 Adds submodule for CocoStudio resources (70MB) 2014-05-05 15:11:35 +08:00
James Chen 097f99accd Merge pull request #6572 from CocosRobot/update_cocosfiles_1399268435 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-05 13:41:08 +08:00
CocosRobot 897b3c61ce [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-05 05:40:36 +00:00
James Chen 5627f770a1 Merge pull request #6571 from dumganhar/re-add-res 
'external' folder is a submodule now, re-added resources for cpp-tests and lua-tests except large files
 2014-05-05 13:39:11 +08:00
James Chen b5ee4036f2 Removes download-deps.py, using `git submodule update --init` to get the 
external libraries. Thanks.
 2014-05-05 13:33:20 +08:00
James Chen d82e03b048 Xcode project fix 2014-05-05 13:31:38 +08:00
James Chen e16d6fa63f Re-adds resources in cpp-tests and lua-tests, but removes some large 
files. We need to reuse some resources when doing some tests.
 2014-05-05 13:27:47 +08:00
James Chen 6c1791eae6 Updates travis-script, removed using download-deps.py now, 'external' is 
a submodule module now. please use `git submodule update --init` to
fetch it.
 2014-05-05 13:14:28 +08:00
James Chen 12d77b2f7f Adds external submodule 2014-05-05 13:14:05 +08:00
James Chen 0f36374d86 Removed external folder 2014-05-05 13:04:53 +08:00
gin0606 dd8d932c0a Upgrade build_native.py to take variable number of arguments 2014-05-05 12:48:51 +09:00
andyque 2d0de93baf issue #4861, fixed a widget bug and add VBox test 2014-05-05 11:37:40 +08:00
andyque afb65bbebd issue #4861, fix widget query method 2014-05-05 11:37:39 +08:00
andyque 503be87675 issue #4861. refactor UILayout to search widget by index 2014-05-05 11:37:39 +08:00
andyque 852191a928 issue #4861, improve the horizontal layout test 2014-05-05 11:37:39 +08:00
andyque 0dc224a123 issue #4861. fix android compile error 2014-05-05 11:37:39 +08:00
andyque a7fbd590dc issue #4861. add a horizontal focus test 2014-05-05 11:37:39 +08:00
andyque 9383900123 issue #4861. cleanup some code of UILayout and UIWidget 2014-05-05 11:37:39 +08:00
andyque 33f7a500f3 issue #4861. add android keypad support 2014-05-05 11:37:38 +08:00
andyque 47acbc24e0 issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
andyque b35ddfe5b5 issue #4861, add focus functionality into Widget class 2014-05-05 11:37:38 +08:00
andyque 1dee81a166 issue #4861, refactor setFocused into setHilighted 2014-05-05 11:37:38 +08:00
James Chen aa74717c58 Merge pull request #6569 from dumganhar/download-progress 
Updates download-deps.py, invalid content header check
 2014-05-05 02:07:24 +08:00
James Chen 6b62a39140 Updates download-deps.py, invalid content header check 2014-05-05 02:06:16 +08:00
James Chen 417b8e8e5a Merge pull request #6568 from CocosRobot/update_cocosfiles_1399225034 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-05 01:38:25 +08:00
CocosRobot e32647ec88 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-04 17:37:16 +00:00
James Chen b624fe5afb Merge pull request #6567 from dumganhar/v3 
Adds download progress for download-deps.py  and adds some missing files
 2014-05-05 01:34:56 +08:00
James Chen 530efbca7e Reverts files for winrt project 2014-05-05 01:33:22 +08:00
James Chen daf37b733a Re-adds missing luajit sources. 2014-05-05 01:31:52 +08:00
James Chen ca873a1dd1 Adds download progress for download-deps.py 2014-05-05 01:06:33 +08:00
James Chen 363b588c18 Merge pull request #6565 from dumganhar/v3 
Small bug fix in download-deps.py
 2014-05-05 00:18:32 +08:00
James Chen ac2ff7bd28 Updates .gitignore 2014-05-05 00:16:06 +08:00
James Chen 82580298b6 Don't remove .zip file, if it exists, don't download it. 2014-05-05 00:15:22 +08:00
James Chen 2527a5c63a Small bug fix in download-deps.py 2014-05-05 00:04:57 +08:00
James Chen 81ced0fc9f Merge pull request #6564 from dumganhar/v3 
Updates download-dep.py, linux, mac  and windows work ok
 2014-05-04 23:51:31 +08:00
James Chen 75231764f9 Uncomment a line in download-deps.py 2014-05-04 23:50:17 +08:00
James Chen 2c4c2e16d0 Removed pkg_resources dependence 2014-05-04 23:46:22 +08:00
James Chen d011030f52 Updates download-dep.py, linux and mac works ok 2014-05-04 23:35:59 +08:00
James Chen c29c0554e0 Update download-deps.py 2014-05-04 21:49:55 +08:00
James Chen 6bc0550c70 Merge pull request #6563 from dumganhar/v3 
Updates download-deps.py, write file with permission information while unziping.
 2014-05-04 21:24:16 +08:00
James Chen 9bd7115988 Updates download-deps.py, write file with permission information while unziping. 2014-05-04 21:17:07 +08:00
James Chen 906e782590 Merge pull request #6561 from dumganhar/v3 
Uses 'download-deps.py' to download Cocos2D-X dependence files
 2014-05-04 19:11:17 +08:00
James Chen 53488092a4 Updates before-install.sh 2014-05-04 19:09:51 +08:00
James Chen 20d3c6d538 Updates download-deps.py 2014-05-04 19:08:43 +08:00
James Chen a160412fb5 Updates download-deps.py 2014-05-04 19:05:01 +08:00
James Chen 3e80663a47 Updates download-deps.py 2014-05-04 19:02:51 +08:00
James Chen fbb9ad2f64 Removed download-deps.sh 2014-05-04 18:52:51 +08:00
James Chen 01fce5ca4f Adds download-deps.py 2014-05-04 18:51:00 +08:00