Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
 		2016-05-25 19:19:27 +08:00
..
2d Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
3d Use const references whenever possible 2016-05-17 13:17:56 +09:00
audio Fix gcc warnings and type mismatch issues in AudioEngine for Linux 2016-05-20 01:39:40 +09:00
base Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
deprecated Merge pull request #14485 from cpascal/fix_libexport 2016-04-20 11:26:25 +08:00
editor-support Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2016-05-25 19:19:27 +08:00
math Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
navmesh Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
network Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2016-05-25 19:19:27 +08:00
physics fix: update damping in physics 2016-05-24 10:53:23 -03:00
physics3d Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
platform Refactor CCFileUtils-apple to remove code duplication (#15645) 2016-05-23 18:26:19 +08:00
renderer Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
scripting Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2016-05-25 19:19:27 +08:00
storage Merge pull request #15617 from pandamicro/v3 2016-05-17 13:43:41 +08:00
ui Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
Android.mk remove unsupport flags 2016-04-26 14:08:23 +08:00
CMakeLists.txt Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
cc_dummy.c Squashed commit of the following: 2016-03-02 16:51:54 -08:00
cocos2d.cpp update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
cocos2d.h merge v3.11 back to v3 2016-05-04 16:02:23 +08:00