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

23576 Commits

Author SHA1 Message Date
yangxiao a6337a3c56 remove sequence3d 2014-09-09 13:20:33 +08:00
yangxiao b88c462c8f remove Sequence3D 2014-09-09 11:34:17 +08:00
minggo 905c429ff5 remove unneeded code 2014-09-09 10:58:07 +08:00
minggo 31c508ef6d deprecated Node::_setZOrder() 2014-09-09 10:55:27 +08:00
CocosRobot a2dcb71a24 [AUTO]: updating luabinding automatically 2014-09-09 02:53:20 +00:00
minggo 6b99ce6ec0 Merge pull request #7939 from minggo/remove-_setLocalZOrder 
remove Node::_setLocalZOrder()
 2014-09-09 10:49:09 +08:00
minggo 3771438ae0 Merge pull request #7965 from oleg-akatsuki/patch-2 
Move constructor from private to public
 2014-09-09 10:42:02 +08:00
yangxiao a295159a3a Merge branch 'newcode' into transition 2014-09-09 10:37:08 +08:00
oleg-akatsuki 511ee30b6e Move constructor from private to public 
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.

Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
 2014-09-09 11:34:48 +09:00
minggo c69707bce4 Merge pull request #7964 from CocosRobot/update_lua_bindings_1410229858 
[AUTO]: updating luabinding automatically
 2014-09-09 10:33:38 +08:00
CocosRobot af6b6bb7b9 [AUTO]: updating luabinding automatically 2014-09-09 02:32:49 +00:00
minggo fd7bb349bb [ci skip] 2014-09-09 10:29:59 +08:00
minggo f2788c234f [ci skip] 2014-09-09 10:29:32 +08:00
minggo 8c595e9d24 Merge pull request #7962 from jagd/v3 
introduce substeps for an accurate simulation of physics
 2014-09-09 10:27:59 +08:00
Chuanren Wu 0b58ff7fce introduce substeps for accurate physics 2014-09-08 00:14:40 +02:00
andyque d6b96d1e46 add chipmunk to wp project 2014-09-06 13:28:00 +08:00
Ricardo Quesada 56a412dc34 Merge pull request #7959 from ricardoquesada/xcshared_data_for_missing_projects 
Adds missing xcshared data for missing projects
 2014-09-05 14:32:54 -07:00
Ricardo Quesada 33a4cd396d Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07:00
andyque 59dc56bfcb remove chipmunk dependency 2014-09-05 21:59:30 +08:00
minggo 78d4e9797c Merge pull request #7955 from dabingnn/v3_reverse_VBOSIZE 
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
 2014-09-05 18:22:46 +08:00
Huabing.Xu 73b201b702 roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5 2014-09-05 16:01:17 +08:00
andyque 2a8601ee1f Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib 2014-09-05 15:43:59 +08:00
huangshiwu 01358f0b62 fix wp8 compile error and modify default resource path 2014-09-05 15:43:08 +08:00
samuele3hu f100dac9b8 Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create 2014-09-05 15:43:07 +08:00
andyque 08c7f32627 add chipmunk static library for win32 2014-09-05 15:38:12 +08:00
minggo 1bf6c79329 Merge pull request #7953 from samuele3hu/v3_check_newnon 
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
 2014-09-05 11:37:57 +08:00
minggo 0fc1baee65 Merge pull request #7954 from huangshiwu/v3_wp8fix_pr 
fix wp8 compile error and modify default resource path
 2014-09-05 11:36:32 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
samuele3hu 750bc4783d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_newnon 2014-09-05 09:40:28 +08:00
samuele3hu 6209530e66 Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create 2014-09-05 09:39:43 +08:00
minggo a2ee559244 [ci skip] 2014-09-04 22:38:26 +08:00
minggo 9aefbeaed5 [ci skip] 2014-09-04 22:37:15 +08:00
minggo 5e505fbc12 Merge pull request #7951 from samuele3hu/v3_check_newnon 
getAllTouches() in GLViewProtocol
 2014-09-04 22:35:15 +08:00
samuele3hu 8c2ab3a4e7 Add manual lua bindings for GLView::getAllTouches 2014-09-04 22:12:59 +08:00
samuele3hu 61d1b67116 Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon 2014-09-04 18:17:05 +08:00
minggo 060dfd94f3 Merge pull request #7948 from super626/v3 
Bugs on creating user custom mesh
 2014-09-04 17:39:40 +08:00
yangxiao 08a1405bdc fix bug on custom mesh 2014-09-04 14:26:23 +08:00
minggo d26446c73f [ci skip] 2014-09-04 14:02:20 +08:00
minggo 137ce4d3da Merge pull request #7946 from CocosRobot/update_cocosfiles_1409810442 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-04 14:01:19 +08:00
CocosRobot 6bd05770e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 06:00:43 +00:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00
minggo 659ba68199 Merge pull request #7942 from andyque/deleteRedundantCode 
remove dead code
 2014-09-04 13:45:12 +08:00
minggo 0021b39e37 Merge pull request #7945 from CocosRobot/update_cocosfiles_1409809341 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-04 13:44:04 +08:00
minggo cbe357bbca Merge pull request #7943 from Dhilan007/v3 
fix compile error on android.
 2014-09-04 13:43:39 +08:00
CocosRobot 4b21972d8b [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 05:42:22 +00:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +08:00
minggo a416eb7298 [ci skip] 2014-09-04 13:40:40 +08:00
minggo 9cd21f19c9 [ci skip] 2014-09-04 13:39:17 +08:00
minggo 7b1be80eb8 Merge pull request #7192 from kezhuw/bugfix_http_client 
bugfix: condition variable sleep on unrelated mutex
 2014-09-04 13:34:33 +08:00
yangxiao 7ec104ab06 Merge branch 'newcode' into v3 2014-09-04 13:23:09 +08:00