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

10184 Commits

Author SHA1 Message Date
zhangbin 26674d1e23 Merge branch 'develop' into ForUser 2013-06-25 18:17:54 +08:00
zhangbin f8a22bb134 closed #2317, Add sample project HelloUser. 2013-06-25 18:05:03 +08:00
zhangbin 1a6bfc0bf6 issue #2317, Add plugin qh360 . 2013-06-25 18:03:04 +08:00
zhangbin 5d4db95fed issue #2317, Adjust ProtocolUser for actual situation. 2013-06-25 18:00:50 +08:00
minggo 28c69b8b16 Merge pull request #2990 from minggo/ccx_filesystem 
fixed a compiling error of AssetsManager on Android
 2013-06-25 02:36:34 -07:00
minggo 6539fd52ba Merge pull request #2989 from samuele3hu/glMoudle 
issue #2276: Add OpenGL lua module
 2013-06-25 02:23:15 -07:00
minggo 98249ef8c0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem 2013-06-25 17:14:01 +08:00
minggo 86646bb820 issue #2329:fixed a compiling error of AssetsManager on Android 2013-06-25 17:09:10 +08:00
minggo 8d782133b8 Merge pull request #2983 from folecr/ccx_filesystem 
Improve Android file system read performance
 2013-06-25 02:05:37 -07:00
minggo d13597bcc3 Merge branch 'ccx_filesystem' of https://github.com/folecr/cocos2d-x into ccx_filesystem 2013-06-25 16:55:39 +08:00
samuele3hu 46bcf6ddba Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle 2013-06-25 15:22:14 +08:00
samuele3hu 3b058fe019 issue #2276: Add OpenGL lua module 2013-06-25 14:55:57 +08:00
James Chen 3074dde2e1 Update AUTHORS [ci skip] 2013-06-25 14:18:00 +08:00
James Chen 5343be0c1b Merge pull request #2986 from sbc100/travis_script_cleanup 
closed #2326: Cleanup travis build scripts.
 2013-06-24 23:17:10 -07:00
Sam Clegg 58c3faf209 Cleanup travis build scripts. 
before-install.sh and run-script.sh now both given an error if
no PLATFORM was not specified correctly.

Environment variables are now set as part of run-script.sh.  This
makes the travis output simpler and makes it possible to run
run-script.sh outside of travis.

javascript binding generation will not exit early if GH_USER
etc are not set.  This allows the travis scripts to be run in
cloned repos which were otherwise erroring out trying to go
the JS bindings commit.

When generating javascript bindgings, don't username and email
with '--global'.  It should be sufficient to set this only for
the binding repo.
 2013-06-24 22:55:15 -07:00
James Chen 425db1af6b Merge pull request #2982 from ricardoquesada/ios_project_fixes 
[iOS] TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
 2013-06-24 22:02:53 -07:00
James Chen cfcc39d924 Merge pull request #2987 from dumganhar/iss2305-std-thread 
issue #2305: Using c++11 thread instead of pthread for WebSocket.
 2013-06-24 21:54:09 -07:00
James Chen 3b9fa904ba issue #2305:use c++11 thread instead of pthread for WebSocket. 2013-06-25 12:51:44 +08:00
Ricardo Quesada 436c7e9391 removes Xcode's autogenerated library paths 2013-06-24 21:30:04 -07:00
James Chen 38d597b308 Merge pull request #2985 from ricardoquesada/mac_workspace 
issue #2325: Adds mac workspace. Not finished.
 2013-06-24 19:56:25 -07:00
Ricardo Quesada f6dfefe50f oops 
adds missing file
 2013-06-24 19:37:07 -07:00
Ricardo Quesada e1d65e149b some fixes 
removes deprecated functions from AsssetManager
AssetManager: updated project
HelloCpp: does not depent on box2d, chipmunk, etc.
 2013-06-24 18:20:07 -07:00
Ricardo Quesada ef6f67902f Adds mac workspace 
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
 2013-06-24 18:04:05 -07:00
James Chen d2ff2d8679 Merge pull request #2984 from folecr/quickfix_include_path 
Fix include path
 2013-06-24 17:49:35 -07:00
folecr ee5f319a77 Fix include path 2013-06-24 17:29:24 -07:00
Ricardo Quesada 4204e8243c TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc... 
...as dependencies, and other minor fixes
 2013-06-24 16:59:00 -07:00
folecr 295f9e0fec Do nothing in the case of forAsync 2013-06-24 16:42:56 -07:00
folecr 2e0804ae29 Remove references to zip file 2013-06-24 15:15:25 -07:00
folecr 21405531aa getFileData() 
* The async case is NYI
 * include stdlib for abort() when forAsync is true
 2013-06-24 15:14:15 -07:00
folecr 7090d8daad isFileExist() 2013-06-24 15:14:15 -07:00
folecr 0422953bbe Native Asset Manager 2013-06-24 15:14:14 -07:00
folecr e916cef32b #define LOGD 2013-06-24 15:14:14 -07:00
folecr be6633b560 Add -landroid to LOCAL_LDLIBS and LOCAL_EXPORT_LDLIBS 2013-06-24 15:14:14 -07:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen d9985d07ce Merge pull request #2981 from dumganhar/iss2325-ios-workspace 
issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
 2013-06-24 03:33:36 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
minggo c04911d0ee Merge pull request #2980 from natural-law/develop 
Rename the class ProtocolSocial to ProtocolShare.
 2013-06-24 02:37:57 -07:00
minggo cf2638b8c6 Merge pull request #2979 from minggo/iss2305-replace-pthread 
use c++11 thread instead of pthread in AssetsManager
 2013-06-24 02:36:10 -07:00
James Chen 7da2018128 issue #2325: Adding armv7s architecture. 2013-06-24 17:06:25 +08:00
zhangbin 81f0c2b2bd Merge branch 'develop' into ForUser 2013-06-24 17:02:45 +08:00
zhangbin c72cdcb88e Update the JS binding for plugin. 2013-06-24 17:00:02 +08:00
James Chen b8ce865d74 issue #2325: [iOS] Adding missing workspace file. 2013-06-24 15:45:26 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
zhangbin c20a067799 Merge branch 'develop' into ForUser 
Conflicts:
	plugin/protocols/platform/android/PluginFactory.cpp
	plugin/protocols/proj.android/jni/Android.mk
 2013-06-24 14:52:06 +08:00
zhangbin 622f1e7a4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-24 14:31:06 +08:00
zhangbin 79e2819107 Rename the class ProtocolSocial to ProtocolShare. 2013-06-24 14:30:38 +08:00
minggo f5ed772c22 issue #2305:remove unneeded comment 2013-06-24 14:11:30 +08:00
minggo 141105ac69 issue #2305:remove unneeded comment 2013-06-24 14:03:45 +08:00
minggo e5a122ea39 issue #2305:use c++11 thread instead of pthread in AssetsManager 2013-06-24 13:59:41 +08:00