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

23767 Commits

Author SHA1 Message Date
samuele3hu 8c0f8e1eb6 Reset marco limited to `#ifdef __SSE__` 2014-09-09 23:01:37 +08:00
samuele3hu 3151c54879 Update macro define limited 2014-09-09 19:08:01 +08:00
XiaoYang 803f5d4178 Merge pull request #129 from songchengjiang/new_v3 
Sprite3DHitTest use AABB testing
 2014-09-09 17:53:02 +08:00
songchengjiang 4099015421 Sprite3D set default _contentSize by AABB 2014-09-09 17:47:34 +08:00
songchengjiang 117c38f806 Sprite3DHitTest use AABB testing 2014-09-09 17:05:33 +08:00
minggo 0abe4cbbb6 Merge pull request #7974 from andyque/fixWin32CompileError 
change toolset from 12.0 to 4.0
 2014-09-09 16:41:24 +08:00
samuele3hu 40ace8f539 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_mat 2014-09-09 16:27:43 +08:00
samuele3hu 3a433b2cd6 Update bindings-generator submodule 2014-09-09 16:26:06 +08:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
andyque 6a4397a3eb change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
minggo c4fe5728ee Merge pull request #7973 from CocosRobot/update_lua_bindings_1410244922 
[AUTO]: updating luabinding automatically
 2014-09-09 15:23:39 +08:00
andyque b280a02b5d modify external version 2014-09-09 15:23:07 +08:00
CocosRobot ed8835d262 [AUTO]: updating luabinding automatically 2014-09-09 06:43:49 +00:00
minggo 1ee9cebebd Merge pull request #7925 from super626/transition 
Animation3D
 2014-09-09 14:39:15 +08:00
minggo 2ba6e73212 Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097 
[AUTO]: updating luabinding automatically
 2014-09-09 14:20:16 +08:00
minggo 162fb3ec18 Merge pull request #7967 from minggo/remove-_setLocalZOrder 
deprecated Node::_setZOrder()
 2014-09-09 14:20:00 +08:00
minggo 9373d096e8 Merge pull request #7969 from andyque/fixUI 
deprecated ui::TextField getStringValue and setText, use getString and
 2014-09-09 14:18:07 +08:00
XiaoYang 336b545f4f Merge pull request #128 from liuliang2004/transition 
Modify the environment configuration
 2014-09-09 14:05:08 +08:00
liuliang be72d5730c Modify the environment configuration 2014-09-09 14:03:27 +08:00
andyque 83e14259ad deprecated ui::TextField getStringValue and setText, use getString and 
setString instead
 2014-09-09 13:59:35 +08:00
samuele3hu cd478a3c0d Merge branch 'cocos2d-v3' of https://github.com/sunzhuoshi/cocos2d-x into v3_check_mat 2014-09-09 13:45:29 +08:00
yangxiao a6337a3c56 remove sequence3d 2014-09-09 13:20:33 +08:00
Dhilan007 f2b7bd62d5 update Xcode project for audio engine 2014-09-09 11:41:17 +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
Dhilan007 6697989174 Update test case of AudioEngine. 2014-09-09 10:48:07 +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
Dhilan007 1b96b2ac87 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 2014-09-09 10:32:56 +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
sunzhuoshi 66070868f7 Added Math SSE implementation on x86 2014-09-08 20:58: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
DENPEN 0cfb8c6469 fix ScrollView bug 
I Fixed a bug that scroll view hidden picks up the touch events.
 2014-09-05 20:49:15 +09: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