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

5940 Commits

Author SHA1 Message Date
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
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
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
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
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 33a4cd396d Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07: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
yangxiao 730ab846c3 code adjustment 2014-09-05 14:59:14 +08:00
Dhilan007 1d900940ab Refactoring API: 
1.Remove Singleton Pattern
2.Make AudioProfile clear.
 2014-09-05 14:34:30 +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
Dhilan007 6b4b5ed943 Refactoring API: 
1.Remove Singleton Pattern
2.Make AudioProfile clear.
 2014-09-05 11:13:51 +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
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
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +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 88ec0392a0 remove unused method 2014-09-04 17:15:28 +08:00
yangxiao 31dc3301b3 add space line 2014-09-04 17:03:46 +08:00
yangxiao a5e1e692e8 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-04 17:00:49 +08:00
liuliang c42bef1f02 Add a bulletin board test example 2014-09-04 16:58:00 +08:00
yangxiao d114e11a0b android, linux and lua 2014-09-04 16:45:42 +08:00
yangxiao 226e60a3ee rename billboard 2014-09-04 16:26:36 +08:00
yangxiao 86d9ce381b rename billboard 2014-09-04 16:26:11 +08:00
yangxiao 08a1405bdc fix bug on custom mesh 2014-09-04 14:26:23 +08: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 cbe357bbca Merge pull request #7943 from Dhilan007/v3 
fix compile error on android.
 2014-09-04 13:43:39 +08:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +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
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
Huabing.Xu 6f03e97a6d add trianglesCommand head file to cocos2d 
remove invoking of base class constructor
 2014-09-04 11:20:43 +08:00
Dhilan007 64d926a75f fix compile error on android. 2014-09-04 11:04:50 +08:00
andyque a1edd4a819 remove dead code 2014-09-04 11:00:48 +08:00
minggo 99f3b371ed Merge pull request #7744 from lite3/customguireader 
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
 2014-09-04 10:53:00 +08:00
andyque 3451672365 restore some configs 2014-09-04 10:49:45 +08:00
minggo 83719db8d4 Merge pull request #7934 from wohaaitinciu/loc_ver 
fix: win32 cpp-tests sometimes cannot display font correctly
 2014-09-04 10:49:30 +08:00
minggo 0d777bfa95 Merge pull request #7099 from newnon/v3_edit_box_fixes 
EditBox fixes & improvements
 2014-09-04 10:34:44 +08:00
minggo 139af3faa8 Merge pull request #7938 from super626/v3 
fix bundle
 2014-09-04 10:03:15 +08:00
Sergey 14853d46f2 setPlaceholderFontSize fix 2014-09-03 23:38:44 +04:00
Sergey 89ed897f47 getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
Ricardo Quesada 047025696c Merge pull request #7680 from andyque/fixNormalizedPosition 
fix normalizedPosition bug
 2014-09-03 10:07:22 -07:00
Kezhu Wang 925fb9aa38 bugfix: condition variable sleep on unrelated mutex 2014-09-03 23:56:54 +08:00
Dhilan007 d5c023740f Implement logical codes of new audio engine on android. 2014-09-03 18:19:47 +08:00
Dhilan007 fc9a0f9be9 Implement logical codes of new audio engine on IOS. 2014-09-03 18:19:21 +08:00
yangxiao 4e65d070a1 rename BillBoard Model 2014-09-03 18:19:12 +08:00
Dhilan007 ca652cefee New audio engine API[2d] 2014-09-03 18:18:47 +08:00
XiaoYang 58f4e84b9a Merge pull request #126 from songchengjiang/billboard 
Billboard
 2014-09-03 18:12:08 +08:00
songchengjiang 114de83a0b Added View_Oriented and View_Plane_Oriented Mode 2014-09-03 18:04:48 +08:00
andyque 87af0ecdd6 add back libbox2d and libspine project to our solution 2014-09-03 17:37:34 +08:00
minggo 5cca8cc87d remove Node::_setLocalZOrder() 2014-09-03 17:26:50 +08:00
songchengjiang 68ce6449e8 repaired camera orientation 
Testing RotateBy action
 2014-09-03 17:17:57 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
XiaoYang f03c4d4790 Merge pull request #125 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 15:59:49 +08:00
liuliang c167ed17ee Set the node name 2014-09-03 15:55:11 +08:00
yangxiao 1bd09f21d0 merge cocos 2014-09-03 15:42:58 +08:00
yangxiao 5a85cb405e fix billboard face 2014-09-03 15:28:15 +08:00
samuele3hu 45f08d54cb Fix the member name error in the `vec4_to_luaval ` 2014-09-03 15:07:31 +08:00
andyque 2e27a6865f update project to vs2013 2014-09-03 14:10:38 +08:00
minggo 66943eec98 Merge pull request #7932 from minggo/remove-unneeded-files 
remove unneeded files
 2014-09-03 13:36:31 +08:00
XiaoYang 4e0c358a90 Merge pull request #124 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 13:12:33 +08:00
yangxiao adda886210 tmp work 2014-09-03 11:58:09 +08:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
liuliang 278a3441ce Set the node name 2014-09-03 11:43:42 +08:00
Jeff ed849a1863 fix: win32 cpp-tests sometimes cannot display font correctly 
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
 2014-09-03 11:34:40 +08:00
CocosRobot ffb36d577e [AUTO]: updating luabinding automatically 2014-09-03 03:29:43 +00:00
minggo eee9ac626a Merge pull request #7815 from andyque/mergeExtensionEditBox 
merge extension EditBox to ui module
 2014-09-03 11:25:10 +08:00
minggo 9351caaa58 Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer 
fix transition scene stencil buffer
 2014-09-03 10:26:28 +08:00
andyque fab9a0052b fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
yangxiao 8dff467b27 Merge branch 'newcode' into transition 2014-09-03 09:15:12 +08:00
yangxiao fed2021707 Fixme: frustum culling 2014-09-03 09:02:32 +08:00
lite3 6ff1289aed fix compile error on Xcode 2014-09-02 20:26:21 +08:00
andyque aa929fe106 add chipmunk prebuilt lib for linux 2014-09-02 03:51:41 -07:00
andyque 3743f02c7e finish ios/mac/android 2014-09-05 11:39:11 +08:00
lvlong 387f190ff1 Merge newcode into v3 2014-09-02 17:52:02 +08:00
lvlong 27f771744a static model load problem of old version . 2014-09-02 17:33:22 +08:00
yangxiao f84c6a5d27 Merge branch 'newcode' into transition 2014-09-02 17:15:05 +08:00
andyque dafbf28283 fix release mode compile error 2014-09-02 16:42:23 +08:00
andyque fadfa87afd fix vs2013 compile error 2014-09-02 16:42:04 +08:00
andyque a429959e65 fix lua compile error 2014-09-02 01:31:02 -07:00
andyque 51e160beff fix EditBox lua compile error 2014-09-02 17:37:55 +08:00
lite3 5d935c2cea fix compile error on android 2014-09-02 16:16:36 +08:00
andyque 8033b1f7bb Merge branch 'v3' into mergeExtensionEditBox 2014-09-02 00:03:16 -07:00
minggo 4749205b61 Merge pull request #7917 from super626/v3 
bundle code adjustment
 2014-09-02 14:58:53 +08:00
CocosRobot dc15287ac3 [AUTO]: updating luabinding automatically 2014-09-02 05:45:07 +00:00
songchengjiang 8a88ba6142 Tab Format 2014-09-02 11:50:09 +08:00
songchengjiang 045af3f7a3 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:24:38 +08:00
songchengjiang 18d06015c6 Added More Models 
Code optimization
 2014-09-02 11:24:19 +08:00
yangxiao de80d8c344 fix warning 2014-09-02 11:22:01 +08:00
andyque dffdef1118 fix transition scene stencil buffer 2014-09-02 11:21:11 +08:00
kaishiqi 8f11dd7f8b Update CCGLViewImpl.cpp 
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
 2014-09-02 11:13:30 +08:00
yangxiao 39e33cbf71 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:12:24 +08:00
yangxiao de3921c101 fix render stats bug 2014-09-02 11:12:15 +08:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +08:00
yangxiao d542624bfd remove from map when release 2014-09-02 10:40:29 +08:00
andyque 6dc45f86e4 fix windows compile error 2014-09-02 10:05:22 +08:00
XiaoYang 2a0743e5a5 Merge pull request #121 from liuliang2004/transition 
Configure project file
 2014-09-01 17:58:22 +08:00
yangxiao 9ce30bdabd add to linux 2014-09-01 17:52:13 +08:00
liuliang c4242b4d0b Configure project file 2014-09-01 17:45:45 +08:00
andyque ffee7b27d4 fix linux and android compile error 2014-09-01 17:43:40 +08:00
andyque 85ce801fdd remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
yangxiao 57a70b629f add sequence3d 2014-09-01 16:00:50 +08:00
yangxiao 33005bedcb add to cocos3d 2014-09-01 15:32:06 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
yangxiao 97c8764ae7 remove unused header 2014-09-01 15:21:47 +08:00
Huabing.Xu 57dd8fd4e1 remove commented code 2014-09-01 15:19:02 +08:00
yangxiao 538fe2e543 Merge branch 'newcode' into transition 2014-09-01 15:14:30 +08:00
yangxiao c24701ac79 Merge branch 'newcode' into v3 2014-09-01 15:11:27 +08:00
Huabing.Xu 6824453804 windows work for trianglesCommand 2014-09-01 15:08:09 +08:00
yangxiao b5a3bb1c03 sequence3d work 2014-09-01 15:07:06 +08:00
Ningyu 1df8d423d0 win32 can not stop looping sound effect 2014-09-01 15:03:57 +08:00
Huabing.Xu dad62ad6df Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/renderer/CCQuadCommand.h
 2014-09-01 14:27:19 +08:00
Huabing.Xu bfaef3574a android works for trianglesCommand 2014-09-01 13:57:33 +08:00
Huabing.Xu 06eb6c2425 put TrianglesCommand in a seperate file 2014-09-01 11:49:04 +08:00
minggo 840f311f5c Merge pull request #7916 from andyque/fixChipumnk 
remove chipmunk.h include in header file
 2014-09-01 11:38:12 +08:00
minggo bb85ecf0da Merge pull request #7913 from chuanweizhang2013/v3fixed 
make debug writable path the same as release
 2014-09-01 10:15:52 +08:00
yangxiao 49e6b098a6 check running scene when checkVisibility 2014-09-01 09:56:05 +08:00
songchengjiang 97f7d21f50 Format 2014-09-01 09:36:07 +08:00
yangxiao f3e017e139 normalize quat 2014-09-01 09:34:09 +08:00
songchengjiang 3f8b430b3e deleted Meshcommand 2014-09-01 09:33:08 +08:00
andyque ff321ba1dc fix chipmunk 2014-08-30 21:09:28 +08:00
lite3 6d462c5013 fix ccs.CustomGUIReader not in ccs table 2014-08-30 12:23:03 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
lite3 3872ee9b59 add CustomGUIReader for lua 2014-08-29 18:50:21 +08:00
CocosRobot cdc41711f6 [AUTO]: updating luabinding automatically 2014-08-29 10:38:25 +00:00
yangxiao a039d6b0fc animate3d transition 2014-08-29 18:25:42 +08:00
songchengjiang 4aa4287d28 test on Android 2014-08-29 17:29:15 +08:00
chuanweizhang2013 25a7f21056 make debug writable path the same as release 2014-08-29 17:27:55 +08:00
songchengjiang 34070677ad Added testing Model Number 2014-08-29 17:11:18 +08:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
minggo afaea360fd Merge pull request #7908 from dabingnn/v3_fix_bugs 
V3 fix bugs
 2014-08-29 16:45:52 +08:00
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
lite3 4a374a1a2a Merge branch 'v3' into customguireader 2014-08-29 16:36:42 +08:00